frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle remaining incorrect API translations in api_conv.pl. 

The big change is treating numbers as separate "words" in the
translation, which leads to funny-looking names like xcb_char_2_b_t, but
makes more sense than the alternative in other situations and was
suggested on the mailing list.

This version still disagrees with Vincent's last proposed XSL, but I
think my output is now preferable. Hopefully Josh has been thinking
along the same lines.
This commit is contained in:
Jamey Sharp 2006-09-22 22:53:17 -07:00
parent 91568d7070
commit 4168ddc13d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/api_conv.pl
View File

@ -3,12 +3,22 @@ use strict;
BEGIN { BEGIN {
%::const = map { $_ => 1 } ( %::const = map { $_ => 1 } (
# constants in xcb.h
"XCBNone", "XCBNone",
"XCBCopyFromParent", "XCBCopyFromParent",
"XCBCurrentTime", "XCBCurrentTime",
"XCBNoSymbol", "XCBNoSymbol",
"XCBError", "XCBError",
"XCBReply", "XCBReply",
# renamed constants
"XCBButtonAny",
"XCBButton1",
"XCBButton2",
"XCBButton3",
"XCBButton4",
"XCBButton5",
"XCBHostInsert",
"XCBHostDelete",
); );
open(CONST, shift) or die "failed to open constants list: $!"; open(CONST, shift) or die "failed to open constants list: $!";
while(<CONST>) while(<CONST>)
@ -28,18 +38,21 @@ sub convert($$)
return "uint$1_t" if /^CARD(8|16|32)$/; return "uint$1_t" if /^CARD(8|16|32)$/;
return "int$1_t" if /^INT(8|16|32)$/; return "int$1_t" if /^INT(8|16|32)$/;
return "uint8_t" if $_ eq 'BOOL' or $_ eq 'BYTE'; return "uint8_t" if $_ eq 'BOOL' or $_ eq 'BYTE';
return $_ if /_/ or !/^XCB(.+)/; return $_ if /^[A-Z]*_[A-Z_]*$/ or !/^XCB(.+)/;
my $const = defined $::const{$_}; my $const = defined $::const{$_};
$_ = $1; $_ = $1;
s/^(GX|RandR|XFixes|XP|XvMC)(.)/uc($1) . "_" . $2/e;
my %abbr = ( my %abbr = (
"Iter" => "iterator", "Iter" => "iterator",
"Req" => "request", "Req" => "request",
"Rep" => "reply", "Rep" => "reply",
); );
s/[A-Z](?:[A-Z0-9]*|[a-z0-9]*)(?=[A-Z]|$)/"_" . ($abbr{$&} or lc($&))/eg; s/([0-9]+|[A-Z](?:[A-Z]*|[a-z]*))_?(?=[0-9A-Z]|$)/"_" . ($abbr{$1} or lc($1))/eg;
$_ = "_family_decnet" if $_ eq "_family_de_cnet";
return "XCB" . uc($_) if $const; return "XCB" . uc($_) if $const;
$_ .= "_t" unless $fun or /_id$/; $_ .= "_t" unless $fun or /_id$/;