--- a/Cface__CDefinitionParser.st Tue Sep 04 15:07:07 2012 +0000
+++ b/Cface__CDefinitionParser.st Wed Sep 05 11:12:41 2012 +0000
@@ -14,8 +14,6 @@
scannerClass
^Cface::CDefinitionScanner
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
!CDefinitionParser class methodsFor:'generated-comments'!
@@ -207,6 +205,8 @@
cName:('6' value);
offset: '8' value asNumber;
type:'4' }
+ | ""("" ""field"" ""("" "")"" "":offset"" "")""
+ { nil }
;
@@ -250,8 +250,6 @@
;
"
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
!CDefinitionParser class methodsFor:'generated-starting states'!
@@ -264,8 +262,6 @@
startingStateForDefinitionFile
^2
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
!CDefinitionParser methodsFor:'accessing'!
@@ -282,24 +278,18 @@
^ ((CArgumentNode new)
cName:((nodes at:6) value);
type:(nodes at:4))
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForArgument2:nodes
^ ((CArgumentNode new)
cName:((nodes at:6) value);
type:(nodes at:4))
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForArgument3:nodes
^ ((CArgumentNode new)
cName:((nodes at:6) value);
type:(nodes at:4))
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForArguments1:nodes
@@ -321,74 +311,50 @@
^ (CArrayNode new)
type:(nodes at:4);
size:(nodes at:6) value
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForBuiltinType10:nodes
^ CWCharNode new
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForBuiltinType1:nodes
^ CUnsignedNode new type:(nodes at:2)
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForBuiltinType2:nodes
^ nodes at:2
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForBuiltinType3:nodes
^ CLongNode new type:(nodes at:2)
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForBuiltinType4:nodes
^ CShortNode new type:(nodes at:2)
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForBuiltinType5:nodes
^ CIntNode new
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForBuiltinType6:nodes
^ CCharNode new
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForBuiltinType7:nodes
^ CDoubleNode new
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForBuiltinType8:nodes
^ CFloatNode new
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForBuiltinType9:nodes
^ CVoidNode new
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForConst1:nodes
^ CConstNode new type:(nodes at:2)
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForDefBody1:nodes
@@ -469,32 +435,22 @@
reduceActionForDefinition1:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForDefinition2:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForDefinition3:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForDefinition4:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForDefinition5:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForDefinition6:nodes
@@ -517,8 +473,6 @@
reduceActionForDefinitionFile1:nodes
^ CDefinitionFileNode new definitions:(nodes at:1)
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForEnum1:nodes
@@ -527,8 +481,6 @@
values:(nodes at:4);
foreign:false;
typedef:false
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForEnum2:nodes
@@ -537,8 +489,6 @@
values:(nodes at:4);
foreign:true;
typedef:false
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForEnumField1:nodes
@@ -566,8 +516,6 @@
^ ((CEnumValueNode new)
cName:((nodes at:4) value);
intValue:((nodes at:6) value))
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForFunction1:nodes
@@ -575,8 +523,6 @@
cName:((nodes at:3) value);
arguments:(nodes at:5);
return:(nodes at:7)
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForFunctionArguments1:nodes
@@ -598,16 +544,12 @@
cName:((nodes at:3) value);
arguments:(nodes at:5);
return:(nodes at:7)
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForFunctionPrototypeArgument1:nodes
^ (CArgumentNode new)
cName:nil;
type:(nodes at:4)
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForFunctionPrototypeArguments1:nodes
@@ -626,8 +568,6 @@
reduceActionForGenerated1:nodes
^ (nodes at:3) value
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForGroup_____Function___Struct___Enum___Union___Typedef1:nodes
@@ -746,8 +686,6 @@
reduceActionForGroup______name_1:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForGroup______number_____name_1:nodes
@@ -902,14 +840,10 @@
reduceActionForOptional__Group______name_1:nodes
^ nil
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForOptional__Group______name_2:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForOptional__Group______type_1:nodes
@@ -962,8 +896,6 @@
reduceActionForPointer1:nodes
^ CPointerNode new type:(nodes at:3)
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForRepeat_Multiple___name_1:nodes
@@ -982,30 +914,22 @@
reduceActionForRepeat__Argument1:nodes
^ OrderedCollection new
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForRepeat__Argument2:nodes
^ (nodes at:1)
add:(nodes at:2);
yourself
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForRepeat__Definition1:nodes
^ OrderedCollection new
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForRepeat__Definition2:nodes
^ (nodes at:1)
add:(nodes at:2);
yourself
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForRepeat__EnumField1:nodes
@@ -1024,30 +948,22 @@
reduceActionForRepeat__EnumValue1:nodes
^ OrderedCollection new
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForRepeat__EnumValue2:nodes
^ (nodes at:1)
add:(nodes at:2);
yourself
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForRepeat__FunctionPrototypeArgument1:nodes
^ OrderedCollection new
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForRepeat__FunctionPrototypeArgument2:nodes
^ (nodes at:1)
add:(nodes at:2);
yourself
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForRepeat__Group_____Function___Struct___Enum___Union___Typedef1:nodes
@@ -1094,22 +1010,16 @@
reduceActionForRepeat__StructField1:nodes
^ OrderedCollection new
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForRepeat__StructField2:nodes
^ (nodes at:1)
add:(nodes at:2);
yourself
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForReturn1:nodes
^ nodes at:3
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForStruct1:nodes
@@ -1118,8 +1028,6 @@
cByteSize:(nodes at:5) value asNumber;
fields:(nodes at:6);
foreign:false
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForStruct2:nodes
@@ -1128,8 +1036,6 @@
cByteSize:(nodes at:5) value asNumber;
fields:(nodes at:6);
foreign:true
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForStructField1:nodes
@@ -1137,8 +1043,6 @@
cName:((nodes at:6) value);
offset:(nodes at:8) value asNumber;
type:(nodes at:4)
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForStructField2:nodes
@@ -1146,8 +1050,6 @@
cName:((nodes at:6) value);
offset:(nodes at:8) value asNumber;
type:(nodes at:4)
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForStructField3:nodes
@@ -1155,14 +1057,10 @@
cName:((nodes at:6) value);
offset:(nodes at:8) value asNumber;
type:(nodes at:4)
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForStructField4:nodes
- ^ (nodes at:1) local:true
-
- "Modified: / 10-02-2008 / 10:00:46 / janfrog"
+ ^ nil
!
reduceActionForStructFields1:nodes
@@ -1227,64 +1125,44 @@
reduceActionForType1:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForType2:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForType3:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForType4:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForType5:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForType6:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForType7:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForType8:nodes
^ nodes at:1
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForType9:nodes
^ CUserDefinedTypeNode new cName:(nodes at:1) value
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForTypedef1:nodes
^ (CTypedefNode new)
cName:((nodes at:3) value);
type:(nodes at:4)
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForTypedef2:nodes
@@ -1292,8 +1170,6 @@
cName:((nodes at:3) value);
type:(nodes at:4);
foreign:true
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForTypedefEnum1:nodes
@@ -1334,8 +1210,6 @@
cByteSize:(nodes at:5) value asNumber;
fields:(nodes at:6);
foreign:false
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForUnion2:nodes
@@ -1344,8 +1218,6 @@
cByteSize:(nodes at:5) value asNumber;
fields:(nodes at:6);
foreign:true
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
reduceActionForUnionFields1:nodes
@@ -1388,230 +1260,230 @@
reduceTable
^#(
-#(39 7 #reduceActionForStruct1:)
-#(39 7 #reduceActionForStruct2:)
-#(40 7 #reduceActionForUnion1:)
-#(40 7 #reduceActionForUnion2:)
-#(41 5 #reduceActionForEnum1:)
-#(41 5 #reduceActionForEnum2:)
-#(42 5 #reduceActionForTypedef1:)
-#(42 5 #reduceActionForTypedef2:)
-#(43 8 #reduceActionForFunction1:)
-#(44 3 #reduceActionForGenerated1:)
-#(45 1 #reduceActionForDefinition1:)
-#(45 1 #reduceActionForDefinition2:)
-#(45 1 #reduceActionForDefinition3:)
-#(45 1 #reduceActionForDefinition4:)
-#(45 1 #reduceActionForDefinition5:)
-#(46 1 #reduceFor:)
-#(47 0 #'reduceActionForRepeat__Argument1:')
-#(47 2 #'reduceActionForRepeat__Argument2:')
-#(48 4 #reduceActionForReturn1:)
-#(49 1 #reduceActionForType1:)
-#(49 1 #reduceActionForType2:)
-#(49 1 #reduceActionForType3:)
-#(49 1 #reduceActionForType4:)
-#(49 1 #reduceActionForType5:)
-#(49 1 #reduceActionForType6:)
-#(49 1 #reduceActionForType7:)
-#(49 1 #reduceActionForType8:)
-#(49 1 #reduceActionForType9:)
-#(50 6 #reduceActionForFunctionPrototypeArgument1:)
-#(51 0 #'reduceActionForRepeat__FunctionPrototypeArgument1:')
-#(51 2 #'reduceActionForRepeat__FunctionPrototypeArgument2:')
-#(52 8 #reduceActionForFunctionPrototype1:)
-#(53 2 #reduceActionForConst1:)
-#(54 2 #reduceActionForBuiltinType1:)
-#(54 2 #reduceActionForBuiltinType2:)
-#(54 2 #reduceActionForBuiltinType3:)
-#(54 2 #reduceActionForBuiltinType4:)
-#(54 1 #reduceActionForBuiltinType5:)
-#(54 1 #reduceActionForBuiltinType6:)
-#(54 1 #reduceActionForBuiltinType7:)
-#(54 1 #reduceActionForBuiltinType8:)
-#(54 1 #reduceActionForBuiltinType9:)
-#(54 1 #reduceActionForBuiltinType10:)
-#(55 4 #reduceActionForPointer1:)
-#(56 7 #reduceActionForArray1:)
+#(41 0 #'reduceActionForRepeat__EnumValue1:')
+#(41 2 #'reduceActionForRepeat__EnumValue2:')
+#(42 7 #reduceActionForEnumValue1:)
+#(43 0 #'reduceActionForRepeat__StructField1:')
+#(43 2 #'reduceActionForRepeat__StructField2:')
+#(44 9 #reduceActionForStructField1:)
+#(44 9 #reduceActionForStructField2:)
+#(44 9 #reduceActionForStructField3:)
+#(44 6 #reduceActionForStructField4:)
+#(45 0 #'reduceActionForOptional__Group______name_1:')
+#(45 1 #'reduceActionForOptional__Group______name_2:')
+#(46 1 #'reduceActionForGroup______name_1:')
+#(47 7 #reduceActionForArray1:)
+#(48 4 #reduceActionForPointer1:)
+#(49 2 #reduceActionForBuiltinType1:)
+#(49 2 #reduceActionForBuiltinType2:)
+#(49 2 #reduceActionForBuiltinType3:)
+#(49 2 #reduceActionForBuiltinType4:)
+#(49 1 #reduceActionForBuiltinType5:)
+#(49 1 #reduceActionForBuiltinType6:)
+#(49 1 #reduceActionForBuiltinType7:)
+#(49 1 #reduceActionForBuiltinType8:)
+#(49 1 #reduceActionForBuiltinType9:)
+#(49 1 #reduceActionForBuiltinType10:)
+#(50 2 #reduceActionForConst1:)
+#(51 8 #reduceActionForFunctionPrototype1:)
+#(52 0 #'reduceActionForRepeat__FunctionPrototypeArgument1:')
+#(52 2 #'reduceActionForRepeat__FunctionPrototypeArgument2:')
+#(53 6 #reduceActionForFunctionPrototypeArgument1:)
+#(54 1 #reduceActionForType1:)
+#(54 1 #reduceActionForType2:)
+#(54 1 #reduceActionForType3:)
+#(54 1 #reduceActionForType4:)
+#(54 1 #reduceActionForType5:)
+#(54 1 #reduceActionForType6:)
+#(54 1 #reduceActionForType7:)
+#(54 1 #reduceActionForType8:)
+#(54 1 #reduceActionForType9:)
+#(55 4 #reduceActionForReturn1:)
+#(56 0 #'reduceActionForRepeat__Argument1:')
+#(56 2 #'reduceActionForRepeat__Argument2:')
#(57 7 #reduceActionForArgument1:)
#(57 7 #reduceActionForArgument2:)
#(57 7 #reduceActionForArgument3:)
-#(58 1 #'reduceActionForGroup______name_1:')
-#(59 0 #'reduceActionForOptional__Group______name_1:')
-#(59 1 #'reduceActionForOptional__Group______name_2:')
-#(60 9 #reduceActionForStructField1:)
-#(60 9 #reduceActionForStructField2:)
-#(60 9 #reduceActionForStructField3:)
-#(61 0 #'reduceActionForRepeat__StructField1:')
-#(61 2 #'reduceActionForRepeat__StructField2:')
-#(62 7 #reduceActionForEnumValue1:)
-#(63 0 #'reduceActionForRepeat__EnumValue1:')
-#(63 2 #'reduceActionForRepeat__EnumValue2:')
-#(66 0 #'reduceActionForRepeat__Definition1:')
-#(66 2 #'reduceActionForRepeat__Definition2:')
+#(58 3 #reduceActionForGenerated1:)
+#(59 5 #reduceActionForTypedef1:)
+#(59 5 #reduceActionForTypedef2:)
+#(60 5 #reduceActionForEnum1:)
+#(60 5 #reduceActionForEnum2:)
+#(61 7 #reduceActionForUnion1:)
+#(61 7 #reduceActionForUnion2:)
+#(62 7 #reduceActionForStruct1:)
+#(62 7 #reduceActionForStruct2:)
+#(63 8 #reduceActionForFunction1:)
+#(64 1 #reduceFor:)
+#(65 0 #'reduceActionForRepeat__Definition1:')
+#(65 2 #'reduceActionForRepeat__Definition2:')
+#(66 1 #reduceActionForDefinition1:)
+#(66 1 #reduceActionForDefinition2:)
+#(66 1 #reduceActionForDefinition3:)
+#(66 1 #reduceActionForDefinition4:)
+#(66 1 #reduceActionForDefinition5:)
#(67 1 #reduceActionForDefinitionFile1:)
)
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
transitionTable
^#(
-#[1 0 242 0 13 0 242 0 64 0 13 0 66 0 17 0 67]
-#[1 0 242 0 13 0 242 0 64 0 13 0 66 0 21 0 67]
-#[1 0 25 0 13 0 29 0 39 0 33 0 40 0 37 0 41 0 41 0 42 0 45 0 43 0 49 0 45 0 250 0 64]
-#[0 0 0 0 64]
-#[0 0 0 0 64]
-#[1 0 53 0 9 0 57 0 12 0 61 0 19 0 65 0 20 0 69 0 22 0 73 0 23 0 77 0 24 0 81 0 25 0 85 0 32]
-#[0 0 50 0 13 0 64]
-#[0 0 54 0 13 0 64]
-#[0 0 58 0 13 0 64]
-#[0 0 62 0 13 0 64]
-#[0 0 46 0 13 0 64]
-#[0 0 246 0 13 0 64]
+#[1 0 226 0 31 0 226 0 40 0 13 0 65 0 17 0 67]
+#[1 0 226 0 31 0 226 0 40 0 13 0 65 0 21 0 67]
+#[1 0 25 0 31 0 254 0 40 0 29 0 59 0 33 0 60 0 37 0 61 0 41 0 62 0 45 0 63 0 49 0 66]
+#[0 0 0 0 40]
+#[0 0 0 0 40]
+#[1 0 53 0 1 0 57 0 2 0 61 0 3 0 65 0 4 0 69 0 7 0 73 0 8 0 77 0 9 0 81 0 11 0 85 0 30]
+#[0 0 250 0 31 0 40]
+#[0 0 246 0 31 0 40]
+#[0 0 242 0 31 0 40]
+#[0 0 238 0 31 0 40]
+#[0 0 234 0 31 0 40]
+#[0 0 230 0 31 0 40]
#[0 0 89 0 34]
#[0 0 93 0 34]
-#[1 0 202 0 30 0 97 0 34 0 101 0 58 0 105 0 59]
-#[1 0 202 0 13 0 202 0 15 0 97 0 34 0 101 0 58 0 109 0 59]
-#[0 0 113 0 34]
-#[1 0 202 0 13 0 202 0 15 0 97 0 34 0 101 0 58 0 117 0 59]
-#[1 0 202 0 30 0 97 0 34 0 101 0 58 0 121 0 59]
-#[1 0 202 0 30 0 97 0 34 0 101 0 58 0 125 0 59]
-#[1 0 202 0 30 0 97 0 34 0 101 0 58 0 129 0 59]
-#[1 0 133 0 1 0 137 0 3 0 141 0 4 0 145 0 5 0 149 0 6 0 153 0 13 0 157 0 16 0 161 0 26 0 165 0 27 0 169 0 28 0 173 0 29 0 177 0 31 0 181 0 34 0 185 0 39 0 189 0 40 0 193 0 41 0 197 0 49 0 201 0 52 0 205 0 53 0 209 0 54 0 213 0 55 0 217 0 56]
-#[0 0 221 0 13]
-#[0 0 198 0 13 0 15 0 30]
-#[0 0 206 0 13 0 15 0 30]
-#[0 0 225 0 30]
-#[1 0 234 0 13 0 234 0 15 0 229 0 63]
-#[1 0 133 0 1 0 137 0 3 0 141 0 4 0 145 0 5 0 149 0 6 0 153 0 13 0 157 0 16 0 161 0 26 0 165 0 27 0 169 0 28 0 173 0 29 0 177 0 31 0 181 0 34 0 185 0 39 0 189 0 40 0 193 0 41 0 233 0 49 0 201 0 52 0 205 0 53 0 209 0 54 0 213 0 55 0 217 0 56]
-#[1 0 234 0 13 0 234 0 15 0 237 0 63]
-#[0 0 241 0 30]
-#[0 0 245 0 30]
-#[0 0 249 0 30]
-#[1 0 133 0 1 0 137 0 3 0 141 0 4 0 145 0 5 0 149 0 6 0 157 0 16 0 161 0 26 0 165 0 27 0 169 0 28 0 173 0 29 0 253 0 54]
-#[1 0 133 0 1 0 137 0 3 0 141 0 4 0 145 0 5 0 149 0 6 0 157 0 16 0 161 0 26 0 165 0 27 0 169 0 28 0 173 0 29 1 1 0 54]
-#[1 0 133 0 1 0 137 0 3 0 141 0 4 0 145 0 5 0 149 0 6 0 157 0 16 0 161 0 26 0 165 0 27 0 169 0 28 0 173 0 29 1 5 0 54]
-#[0 0 154 0 15]
-#[1 0 133 0 1 0 137 0 3 0 141 0 4 0 145 0 5 0 149 0 6 0 157 0 16 0 161 0 26 0 165 0 27 0 169 0 28 0 173 0 29 1 9 0 54]
-#[1 1 13 0 2 1 17 0 8 0 61 0 19 0 65 0 20 0 73 0 23 0 77 0 24 0 81 0 25 0 85 0 32 1 21 0 33]
-#[0 0 158 0 15]
-#[0 0 162 0 15]
-#[0 0 170 0 15]
-#[0 0 166 0 15]
-#[0 0 174 0 15]
-#[1 0 133 0 1 0 137 0 3 0 141 0 4 0 145 0 5 0 149 0 6 0 153 0 13 0 157 0 16 0 161 0 26 0 165 0 27 0 169 0 28 0 173 0 29 0 177 0 31 0 181 0 34 0 185 0 39 0 189 0 40 0 193 0 41 1 25 0 49 0 201 0 52 0 205 0 53 0 209 0 54 0 213 0 55 0 217 0 56]
-#[0 0 114 0 15]
-#[0 0 102 0 15]
-#[0 0 106 0 15]
-#[0 0 110 0 15]
-#[0 1 29 0 15]
-#[0 0 98 0 15]
-#[0 0 82 0 15]
-#[0 0 86 0 15]
-#[0 0 90 0 15]
-#[0 0 94 0 15]
-#[1 0 70 0 13 0 70 0 15 1 33 0 47]
-#[0 1 37 0 35]
-#[1 1 41 0 13 1 45 0 15 1 49 0 62]
-#[0 1 53 0 15]
-#[1 1 41 0 13 1 57 0 15 1 49 0 62]
+#[1 0 42 0 29 0 42 0 31 0 97 0 34 0 101 0 45 0 105 0 46]
+#[1 0 42 0 29 0 42 0 31 0 97 0 34 0 109 0 45 0 105 0 46]
+#[1 0 42 0 10 0 97 0 34 0 113 0 45 0 105 0 46]
+#[1 0 42 0 10 0 97 0 34 0 117 0 45 0 105 0 46]
+#[1 0 42 0 10 0 97 0 34 0 121 0 45 0 105 0 46]
+#[1 0 42 0 10 0 97 0 34 0 125 0 45 0 105 0 46]
+#[0 0 129 0 34]
+#[1 0 133 0 13 0 137 0 14 0 141 0 15 0 145 0 16 0 149 0 17 0 153 0 18 0 157 0 19 0 161 0 20 0 165 0 21 0 169 0 22 0 173 0 23 0 177 0 31 0 181 0 34 0 185 0 47 0 189 0 48 0 193 0 49 0 197 0 50 0 201 0 51 0 205 0 54 0 209 0 60 0 213 0 61 0 217 0 62]
+#[1 0 133 0 13 0 137 0 14 0 141 0 15 0 145 0 16 0 149 0 17 0 153 0 18 0 157 0 19 0 161 0 20 0 165 0 21 0 169 0 22 0 173 0 23 0 177 0 31 0 181 0 34 0 185 0 47 0 189 0 48 0 193 0 49 0 197 0 50 0 201 0 51 0 221 0 54 0 209 0 60 0 213 0 61 0 217 0 62]
+#[0 0 50 0 10 0 29 0 31]
+#[1 0 6 0 29 0 6 0 31 0 225 0 41]
+#[0 0 46 0 10 0 29 0 31]
+#[1 0 6 0 29 0 6 0 31 0 229 0 41]
+#[0 0 233 0 10]
+#[0 0 237 0 10]
+#[0 0 241 0 10]
+#[0 0 245 0 10]
+#[0 0 249 0 31]
+#[1 0 133 0 13 0 137 0 14 0 141 0 15 0 145 0 16 0 149 0 17 0 153 0 18 0 157 0 19 0 161 0 20 0 165 0 21 0 169 0 22 0 173 0 23 0 177 0 31 0 181 0 34 0 185 0 47 0 189 0 48 0 193 0 49 0 197 0 50 0 201 0 51 0 253 0 54 0 209 0 60 0 213 0 61 0 217 0 62]
+#[0 0 98 0 29]
+#[0 0 94 0 29]
+#[0 0 90 0 29]
+#[0 0 86 0 29]
+#[0 0 82 0 29]
+#[0 0 78 0 29]
+#[1 0 137 0 14 0 141 0 15 0 145 0 16 0 149 0 17 0 153 0 18 0 157 0 19 0 161 0 20 0 165 0 21 0 169 0 22 0 173 0 23 1 1 0 49]
+#[1 0 137 0 14 0 141 0 15 0 145 0 16 0 149 0 17 0 153 0 18 0 157 0 19 0 161 0 20 0 165 0 21 0 169 0 22 0 173 0 23 1 5 0 49]
+#[1 0 137 0 14 0 141 0 15 0 145 0 16 0 149 0 17 0 153 0 18 0 157 0 19 0 161 0 20 0 165 0 21 0 169 0 22 0 173 0 23 1 9 0 49]
+#[1 0 137 0 14 0 141 0 15 0 145 0 16 0 149 0 17 0 153 0 18 0 157 0 19 0 161 0 20 0 165 0 21 0 169 0 22 0 173 0 23 1 13 0 49]
+#[1 0 61 0 3 0 65 0 4 0 69 0 7 0 73 0 8 0 77 0 9 0 81 0 11 1 17 0 12 1 21 0 24 1 25 0 26]
+#[0 0 154 0 29]
+#[0 0 134 0 29]
+#[0 0 130 0 29]
+#[0 0 126 0 29]
+#[0 0 122 0 29]
+#[0 0 138 0 29]
+#[0 1 29 0 29]
+#[0 0 150 0 29]
+#[0 0 146 0 29]
+#[0 0 142 0 29]
+#[0 1 33 0 29]
+#[1 1 37 0 29 1 41 0 31 1 45 0 42]
+#[1 1 49 0 29 1 41 0 31 1 45 0 42]
+#[0 1 53 0 35]
+#[0 1 57 0 35]
#[0 1 61 0 35]
#[0 1 65 0 35]
-#[0 1 69 0 35]
-#[0 0 138 0 15]
-#[0 0 146 0 15]
-#[0 0 142 0 15]
-#[0 0 150 0 15]
-#[0 1 73 0 34]
-#[0 1 77 0 13]
-#[1 0 133 0 1 0 137 0 3 0 141 0 4 0 145 0 5 0 149 0 6 0 153 0 13 0 157 0 16 0 161 0 26 0 165 0 27 0 169 0 28 0 173 0 29 0 177 0 31 0 181 0 34 0 185 0 39 0 189 0 40 0 193 0 41 1 81 0 49 0 201 0 52 0 205 0 53 0 209 0 54 0 213 0 55 0 217 0 56]
-#[0 0 134 0 15]
-#[0 0 34 0 13 0 64]
-#[1 1 85 0 13 1 89 0 15 1 93 0 57]
-#[1 0 222 0 13 0 222 0 15 1 97 0 61]
-#[0 1 101 0 17]
-#[0 0 22 0 13 0 15 0 64]
-#[0 0 238 0 13 0 15]
-#[0 0 30 0 13 0 64]
-#[0 0 26 0 13 0 15 0 64]
-#[1 0 222 0 13 0 222 0 15 1 105 0 61]
-#[1 0 222 0 13 0 222 0 15 1 109 0 61]
-#[1 0 222 0 13 0 222 0 15 1 113 0 61]
-#[0 1 117 0 13]
-#[1 0 133 0 1 0 137 0 3 0 141 0 4 0 145 0 5 0 149 0 6 0 153 0 13 0 157 0 16 0 161 0 26 0 165 0 27 0 169 0 28 0 173 0 29 0 177 0 31 0 181 0 34 0 185 0 39 0 189 0 40 0 193 0 41 1 121 0 49 0 201 0 52 0 205 0 53 0 209 0 54 0 213 0 55 0 217 0 56]
-#[0 1 125 0 15]
-#[0 1 129 0 14]
-#[1 1 133 0 13 1 137 0 48]
-#[0 0 74 0 13 0 15]
-#[1 1 141 0 13 1 145 0 15 1 149 0 60]
-#[0 1 153 0 13]
-#[1 1 141 0 13 1 157 0 15 1 149 0 60]
-#[1 1 141 0 13 1 161 0 15 1 149 0 60]
-#[1 1 141 0 13 1 165 0 15 1 149 0 60]
-#[1 0 122 0 13 0 122 0 15 1 169 0 51]
-#[0 1 173 0 15]
-#[0 0 178 0 15]
-#[0 1 177 0 13]
-#[0 1 181 0 7]
-#[0 1 185 0 15]
-#[0 1 189 0 18]
-#[0 0 18 0 13 0 15 0 64]
-#[0 0 226 0 13 0 15]
-#[0 1 193 0 34]
-#[0 0 14 0 13 0 15 0 64]
-#[0 0 10 0 13 0 15 0 64]
-#[0 0 6 0 13 0 15 0 64]
-#[1 1 197 0 13 1 201 0 15 1 205 0 50]
+#[1 0 162 0 29 0 162 0 31 1 69 0 56]
+#[0 0 102 0 29]
+#[0 0 74 0 29]
+#[0 0 70 0 29]
+#[0 0 66 0 29]
+#[0 0 62 0 29]
+#[1 0 133 0 13 0 137 0 14 0 141 0 15 0 145 0 16 0 149 0 17 0 153 0 18 0 157 0 19 0 161 0 20 0 165 0 21 0 169 0 22 0 173 0 23 0 177 0 31 0 181 0 34 0 185 0 47 0 189 0 48 0 193 0 49 0 197 0 50 0 201 0 51 1 73 0 54 0 209 0 60 0 213 0 61 0 217 0 62]
+#[0 1 77 0 34]
+#[0 1 81 0 31]
+#[0 0 190 0 31 0 40]
+#[0 0 186 0 31 0 40]
+#[0 0 198 0 29 0 31 0 40]
+#[0 1 85 0 27]
+#[0 0 10 0 29 0 31]
+#[0 0 194 0 29 0 31 0 40]
+#[1 0 18 0 29 0 18 0 31 1 89 0 43]
+#[1 0 18 0 29 0 18 0 31 1 93 0 43]
+#[1 0 18 0 29 0 18 0 31 1 97 0 43]
+#[1 0 18 0 29 0 18 0 31 1 101 0 43]
+#[1 1 105 0 29 1 109 0 31 1 113 0 57]
+#[0 1 117 0 29]
+#[0 1 121 0 31]
+#[1 0 133 0 13 0 137 0 14 0 141 0 15 0 145 0 16 0 149 0 17 0 153 0 18 0 157 0 19 0 161 0 20 0 165 0 21 0 169 0 22 0 173 0 23 0 177 0 31 0 181 0 34 0 185 0 47 0 189 0 48 0 193 0 49 0 197 0 50 0 201 0 51 1 125 0 54 0 209 0 60 0 213 0 61 0 217 0 62]
+#[0 1 129 0 31]
+#[1 1 133 0 29 1 137 0 31 1 141 0 44]
+#[1 1 145 0 29 1 137 0 31 1 141 0 44]
+#[1 1 149 0 29 1 137 0 31 1 141 0 44]
+#[1 1 153 0 29 1 137 0 31 1 141 0 44]
+#[1 1 157 0 31 1 161 0 55]
+#[0 1 165 0 28]
+#[0 0 166 0 29 0 31]
+#[0 0 58 0 29]
+#[1 0 110 0 29 0 110 0 31 1 169 0 52]
+#[0 1 173 0 29]
+#[0 1 177 0 34]
+#[0 0 206 0 29 0 31 0 40]
+#[0 1 181 0 6]
+#[0 0 22 0 29 0 31]
+#[0 0 202 0 29 0 31 0 40]
+#[0 0 214 0 29 0 31 0 40]
+#[0 0 210 0 29 0 31 0 40]
+#[0 1 185 0 25]
+#[0 1 189 0 29]
+#[0 1 193 0 31]
+#[1 1 197 0 29 1 201 0 31 1 205 0 53]
#[0 1 209 0 35]
-#[1 0 133 0 1 0 137 0 3 0 141 0 4 0 145 0 5 0 149 0 6 0 153 0 13 0 157 0 16 0 161 0 26 0 165 0 27 0 169 0 28 0 173 0 29 0 177 0 31 0 181 0 34 0 185 0 39 0 189 0 40 0 193 0 41 1 213 0 49 0 201 0 52 0 205 0 53 0 209 0 54 0 213 0 55 0 217 0 56]
-#[1 0 133 0 1 0 137 0 3 0 141 0 4 0 145 0 5 0 149 0 6 0 153 0 13 0 157 0 16 0 161 0 26 0 165 0 27 0 169 0 28 0 173 0 29 0 177 0 31 0 181 0 34 0 185 0 39 0 189 0 40 0 193 0 41 1 217 0 49 0 201 0 52 0 205 0 53 0 209 0 54 0 213 0 55 0 217 0 56]
-#[0 0 38 0 13 0 64]
-#[0 1 221 0 13]
-#[0 1 225 0 15]
-#[0 1 229 0 14]
-#[1 1 133 0 13 1 233 0 48]
-#[0 0 126 0 13 0 15]
-#[0 1 237 0 15]
-#[0 1 241 0 15]
-#[0 1 245 0 15]
-#[1 0 133 0 1 0 137 0 3 0 141 0 4 0 145 0 5 0 149 0 6 0 153 0 13 0 157 0 16 0 161 0 26 0 165 0 27 0 169 0 28 0 173 0 29 0 177 0 31 0 181 0 34 0 185 0 39 0 189 0 40 0 193 0 41 1 249 0 49 0 201 0 52 0 205 0 53 0 209 0 54 0 213 0 55 0 217 0 56]
-#[0 1 253 0 35]
-#[0 2 1 0 13]
-#[0 2 5 0 15]
-#[0 0 182 0 15]
-#[1 2 9 0 8 2 13 0 17 2 17 0 34]
-#[0 0 78 0 15]
-#[0 2 21 0 15]
-#[0 2 25 0 15]
-#[1 0 133 0 1 0 137 0 3 0 141 0 4 0 145 0 5 0 149 0 6 0 153 0 13 0 157 0 16 0 161 0 26 0 165 0 27 0 169 0 28 0 173 0 29 0 177 0 31 0 181 0 34 0 185 0 39 0 189 0 40 0 193 0 41 2 29 0 49 0 201 0 52 0 205 0 53 0 209 0 54 0 213 0 55 0 217 0 56]
-#[0 0 130 0 15]
-#[0 2 33 0 15]
-#[0 2 37 0 15]
-#[0 2 41 0 15]
-#[1 2 45 0 12 2 49 0 17 2 53 0 34]
-#[0 0 230 0 13 0 15]
-#[0 2 57 0 15]
-#[0 0 194 0 13 0 15]
-#[0 0 190 0 13 0 15]
-#[0 0 186 0 13 0 15]
-#[0 2 61 0 21]
-#[0 2 65 0 21]
-#[0 2 69 0 21]
-#[0 2 73 0 15]
-#[0 2 77 0 35]
-#[0 2 81 0 35]
-#[0 2 85 0 35]
-#[0 0 118 0 13 0 15]
-#[0 2 89 0 15]
-#[0 2 93 0 15]
-#[0 2 97 0 15]
-#[0 0 218 0 13 0 15]
-#[0 0 214 0 13 0 15]
-#[0 0 210 0 13 0 15]
+#[0 1 213 0 29]
+#[0 1 217 0 31]
+#[1 0 133 0 13 0 137 0 14 0 141 0 15 0 145 0 16 0 149 0 17 0 153 0 18 0 157 0 19 0 161 0 20 0 165 0 21 0 169 0 22 0 173 0 23 0 177 0 31 0 181 0 34 0 185 0 47 0 189 0 48 0 193 0 49 0 197 0 50 0 201 0 51 1 221 0 54 0 209 0 60 0 213 0 61 0 217 0 62]
+#[0 0 218 0 31 0 40]
+#[1 0 133 0 13 0 137 0 14 0 141 0 15 0 145 0 16 0 149 0 17 0 153 0 18 0 157 0 19 0 161 0 20 0 165 0 21 0 169 0 22 0 173 0 23 0 177 0 31 0 181 0 34 0 185 0 47 0 189 0 48 0 193 0 49 0 197 0 50 0 201 0 51 1 225 0 54 0 209 0 60 0 213 0 61 0 217 0 62]
+#[1 1 157 0 31 1 229 0 55]
+#[0 1 233 0 28]
+#[0 0 114 0 29 0 31]
+#[0 1 237 0 29]
+#[0 1 241 0 35]
+#[1 0 133 0 13 0 137 0 14 0 141 0 15 0 145 0 16 0 149 0 17 0 153 0 18 0 157 0 19 0 161 0 20 0 165 0 21 0 169 0 22 0 173 0 23 1 245 0 29 0 177 0 31 0 181 0 34 0 185 0 47 0 189 0 48 0 193 0 49 0 197 0 50 0 201 0 51 1 249 0 54 0 209 0 60 0 213 0 61 0 217 0 62]
+#[0 1 253 0 29]
+#[0 2 1 0 29]
+#[0 2 5 0 29]
+#[0 2 9 0 31]
+#[0 0 54 0 29]
+#[0 2 13 0 29]
+#[0 2 17 0 5]
+#[0 2 21 0 29]
+#[0 0 158 0 29]
+#[1 2 25 0 26 2 29 0 27 2 33 0 34]
+#[0 0 106 0 29]
+#[1 0 133 0 13 0 137 0 14 0 141 0 15 0 145 0 16 0 149 0 17 0 153 0 18 0 157 0 19 0 161 0 20 0 165 0 21 0 169 0 22 0 173 0 23 0 177 0 31 0 181 0 34 0 185 0 47 0 189 0 48 0 193 0 49 0 197 0 50 0 201 0 51 2 37 0 54 0 209 0 60 0 213 0 61 0 217 0 62]
+#[0 0 14 0 29 0 31]
+#[0 2 41 0 29]
+#[1 2 45 0 27 2 49 0 30 2 53 0 34]
+#[0 2 57 0 29]
+#[0 2 61 0 29]
+#[0 2 65 0 29]
+#[0 2 69 0 29]
+#[0 0 38 0 29 0 31]
+#[0 2 73 0 5]
+#[0 2 77 0 5]
+#[0 2 81 0 5]
+#[0 0 178 0 29 0 31]
+#[0 0 174 0 29 0 31]
+#[0 0 170 0 29 0 31]
+#[0 2 85 0 29]
+#[0 2 89 0 35]
+#[0 2 93 0 35]
+#[0 2 97 0 35]
+#[0 0 118 0 29 0 31]
+#[0 2 101 0 29]
+#[0 2 105 0 29]
+#[0 2 109 0 29]
+#[0 0 30 0 29 0 31]
+#[0 0 34 0 29 0 31]
+#[0 0 26 0 29 0 31]
)
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
!CDefinitionParser methodsFor:'private'!
--- a/Cface__CDefinitionScanner.st Tue Sep 04 15:07:07 2012 +0000
+++ b/Cface__CDefinitionScanner.st Wed Sep 05 11:12:41 2012 +0000
@@ -32,63 +32,59 @@
<comment> : \# [^\r\n]* ;
"
-
- "Modified: / 09-09-2008 / 17:05:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
!CDefinitionScanner class methodsFor:'generated-initialization'!
initializeKeywordMap
keywordMap := Dictionary new.
- #( #(34 'argument' 14)
- #(34 'array' 8)
- #(34 'char' 16)
- #(34 'const' 31)
- #(34 'double' 26)
- #(34 'enum' 20)
- #(34 'field' 18)
- #(34 'float' 28)
- #(34 'function' 12)
- #(34 'int' 5)
- #(34 'long' 3)
- #(34 'return' 7)
- #(34 'short' 6)
- #(34 'signed' 4)
- #(34 'struct' 32)
- #(34 'typedef' 22)
- #(34 'union' 24)
- #(34 'unsigned' 1)
- #(34 'value' 17)
- #(34 'void' 27)
- #(34 'wchar_t' 29)
- #(37 'argument' 14)
- #(37 'array' 8)
- #(37 'char' 16)
- #(37 'const' 31)
- #(37 'double' 26)
- #(37 'enum' 20)
- #(37 'field' 18)
- #(37 'float' 28)
- #(37 'function' 12)
- #(37 'int' 5)
- #(37 'long' 3)
- #(37 'return' 7)
- #(37 'short' 6)
- #(37 'signed' 4)
- #(37 'struct' 32)
- #(37 'typedef' 22)
- #(37 'union' 24)
- #(37 'unsigned' 1)
- #(37 'value' 17)
- #(37 'void' 27)
- #(37 'wchar_t' 29) )
+ #( #(34 'argument' 28)
+ #(34 'array' 26)
+ #(34 'char' 18)
+ #(34 'const' 13)
+ #(34 'double' 17)
+ #(34 'enum' 4)
+ #(34 'field' 6)
+ #(34 'float' 16)
+ #(34 'function' 30)
+ #(34 'int' 19)
+ #(34 'long' 21)
+ #(34 'return' 25)
+ #(34 'short' 20)
+ #(34 'signed' 22)
+ #(34 'struct' 11)
+ #(34 'typedef' 2)
+ #(34 'union' 8)
+ #(34 'unsigned' 23)
+ #(34 'value' 27)
+ #(34 'void' 15)
+ #(34 'wchar_t' 14)
+ #(37 'argument' 28)
+ #(37 'array' 26)
+ #(37 'char' 18)
+ #(37 'const' 13)
+ #(37 'double' 17)
+ #(37 'enum' 4)
+ #(37 'field' 6)
+ #(37 'float' 16)
+ #(37 'function' 30)
+ #(37 'int' 19)
+ #(37 'long' 21)
+ #(37 'return' 25)
+ #(37 'short' 20)
+ #(37 'signed' 22)
+ #(37 'struct' 11)
+ #(37 'typedef' 2)
+ #(37 'union' 8)
+ #(37 'unsigned' 23)
+ #(37 'value' 27)
+ #(37 'void' 15)
+ #(37 'wchar_t' 14) )
do:[:each |
(keywordMap at:each first ifAbsentPut:[ Dictionary new ]) at:(each at:2)
put:each last
].
^ keywordMap
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
!CDefinitionScanner methodsFor:'generated-scanner'!
@@ -109,8 +105,6 @@
^ self reportLastMatch
].
^ self reportLastMatch
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
scan2
@@ -123,7 +117,7 @@
self step.
(currentCharacter isLetter)
] whileTrue.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
ifTrue:[
[
@@ -136,7 +130,7 @@
].
^ self reportLastMatch
].
- (currentCharacter isXMLDigit)
+ (currentCharacter isNationalDigit)
] whileTrue.
((currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ]) ifTrue:[
[
@@ -148,8 +142,6 @@
^ self reportLastMatch
].
^ self reportLastMatch
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
scan3
@@ -861,17 +853,17 @@
]
])
ifTrue:[ ^ self scan1 ].
- (currentCharacter isXMLDigit) ifTrue:[
+ (currentCharacter isNationalDigit) ifTrue:[
^ self scan2
].
(currentCharacter isSeparator
- or:[ currentCharacter == (Character value:16rB) ])
+ or:[ currentCharacter == (Character codePoint:16rB) ])
ifTrue:[
[
self recordMatch:#whitespace.
self step.
(currentCharacter isSeparator
- or:[ currentCharacter == (Character value:16rB) ])
+ or:[ currentCharacter == (Character codePoint:16rB) ])
] whileTrue.
^ self reportLastMatch
].
@@ -880,10 +872,10 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
or:[
- (currentCharacter between:(Character value:16rE) and:$F)
+ (currentCharacter between:(Character codePoint:16rE) and:$F)
or:[ currentCharacter >= $H ]
]
])
@@ -893,9 +885,9 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
- or:[ currentCharacter >= (Character value:16rE) ]
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
+ or:[ currentCharacter >= (Character codePoint:16rE) ]
])
] whileTrue.
^ self reportLastMatch
@@ -905,10 +897,10 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
or:[
- (currentCharacter between:(Character value:16rE) and:$d)
+ (currentCharacter between:(Character codePoint:16rE) and:$d)
or:[ currentCharacter >= $f ]
]
])
@@ -918,9 +910,9 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
- or:[ currentCharacter >= (Character value:16rE) ]
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
+ or:[ currentCharacter >= (Character codePoint:16rE) ]
])
] whileTrue.
^ self reportLastMatch
@@ -930,10 +922,10 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
or:[
- (currentCharacter between:(Character value:16rE) and:$m)
+ (currentCharacter between:(Character codePoint:16rE) and:$m)
or:[ currentCharacter >= $o ]
]
])
@@ -943,9 +935,9 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
- or:[ currentCharacter >= (Character value:16rE) ]
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
+ or:[ currentCharacter >= (Character codePoint:16rE) ]
])
] whileTrue.
^ self reportLastMatch
@@ -955,10 +947,10 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
or:[
- (currentCharacter between:(Character value:16rE) and:$d)
+ (currentCharacter between:(Character codePoint:16rE) and:$d)
or:[ currentCharacter >= $f ]
]
])
@@ -968,9 +960,9 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
- or:[ currentCharacter >= (Character value:16rE) ]
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
+ or:[ currentCharacter >= (Character codePoint:16rE) ]
])
] whileTrue.
^ self reportLastMatch
@@ -980,10 +972,10 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
or:[
- (currentCharacter between:(Character value:16rE) and:$q)
+ (currentCharacter between:(Character codePoint:16rE) and:$q)
or:[ currentCharacter >= $s ]
]
])
@@ -993,9 +985,9 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
- or:[ currentCharacter >= (Character value:16rE) ]
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
+ or:[ currentCharacter >= (Character codePoint:16rE) ]
])
] whileTrue.
^ self reportLastMatch
@@ -1005,10 +997,10 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
or:[
- (currentCharacter between:(Character value:16rE) and:$`)
+ (currentCharacter between:(Character codePoint:16rE) and:$`)
or:[ currentCharacter >= $b ]
]
])
@@ -1018,9 +1010,9 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
- or:[ currentCharacter >= (Character value:16rE) ]
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
+ or:[ currentCharacter >= (Character codePoint:16rE) ]
])
] whileTrue.
^ self reportLastMatch
@@ -1030,10 +1022,10 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
or:[
- (currentCharacter between:(Character value:16rE) and:$s)
+ (currentCharacter between:(Character codePoint:16rE) and:$s)
or:[ currentCharacter >= $u ]
]
])
@@ -1043,9 +1035,9 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
- or:[ currentCharacter >= (Character value:16rE) ]
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
+ or:[ currentCharacter >= (Character codePoint:16rE) ]
])
] whileTrue.
^ self reportLastMatch
@@ -1055,10 +1047,10 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
or:[
- (currentCharacter between:(Character value:16rE) and:$d)
+ (currentCharacter between:(Character codePoint:16rE) and:$d)
or:[ currentCharacter >= $f ]
]
])
@@ -1068,9 +1060,9 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
- or:[ currentCharacter >= (Character value:16rE) ]
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
+ or:[ currentCharacter >= (Character codePoint:16rE) ]
])
] whileTrue.
^ self reportLastMatch
@@ -1080,10 +1072,10 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
or:[
- (currentCharacter between:(Character value:16rE) and:$c)
+ (currentCharacter between:(Character codePoint:16rE) and:$c)
or:[ currentCharacter >= $e ]
]
])
@@ -1093,21 +1085,21 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
- or:[ currentCharacter >= (Character value:16rE) ]
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
+ or:[ currentCharacter >= (Character codePoint:16rE) ]
])
] whileTrue.
^ self reportLastMatch
].
(currentCharacter == $d) ifTrue:[
- self recordMatch:#( 11 38 ).
+ self recordMatch:#( 33 38 ).
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
- or:[ currentCharacter >= (Character value:16rE) ]
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
+ or:[ currentCharacter >= (Character codePoint:16rE) ]
])
ifTrue:[
[
@@ -1115,9 +1107,9 @@
self step.
(currentCharacter <= (Character tab)
or:[
- (currentCharacter between:(Character value:16rB)
- and:(Character value:16rC))
- or:[ currentCharacter >= (Character value:16rE) ]
+ (currentCharacter between:(Character codePoint:16rB)
+ and:(Character codePoint:16rC))
+ or:[ currentCharacter >= (Character codePoint:16rE) ]
])
] whileTrue.
^ self reportLastMatch
@@ -1143,10 +1135,10 @@
^ self reportLastMatch
].
(currentCharacter == $() ifTrue:[
- ^ self recordAndReportMatch:#( 13 ).
+ ^ self recordAndReportMatch:#( 31 ).
].
(currentCharacter == $)) ifTrue:[
- ^ self recordAndReportMatch:#( 15 ).
+ ^ self recordAndReportMatch:#( 29 ).
].
(currentCharacter == $-) ifTrue:[
self recordMatch:#( 37 ).
@@ -1162,7 +1154,7 @@
] whileTrue.
^ self reportLastMatch
].
- (currentCharacter isXMLDigit) ifTrue:[
+ (currentCharacter isNationalDigit) ifTrue:[
^ self scan2
].
^ self reportLastMatch
@@ -1197,7 +1189,7 @@
(currentCharacter == $e) ifTrue:[
self step.
(currentCharacter == $t) ifTrue:[
- ^ self recordAndReportMatch:#( 21 ).
+ ^ self recordAndReportMatch:#( 5 ).
].
^ self reportLastMatch
].
@@ -1216,7 +1208,7 @@
(currentCharacter == $z) ifTrue:[
self step.
(currentCharacter == $e) ifTrue:[
- ^ self recordAndReportMatch:#( 30 ).
+ ^ self recordAndReportMatch:#( 10 ).
].
^ self reportLastMatch
].
@@ -1229,7 +1221,7 @@
(currentCharacter == $e) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1253,7 +1245,7 @@
(currentCharacter == $n) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1277,7 +1269,7 @@
(currentCharacter == $u) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1316,14 +1308,17 @@
(currentCharacter == $-) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$e)
- or:[ (currentCharacter between:$g and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$e)
+ or:[ (currentCharacter between:$g and:$z) ]
+ ]
]
]
])
@@ -1339,7 +1334,7 @@
(currentCharacter == $f) ifTrue:[
self recordMatch:#( 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$- and:$/)
or:[
@@ -1365,14 +1360,17 @@
(currentCharacter == $o) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$q)
- or:[ (currentCharacter between:$s and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$q)
+ or:[ (currentCharacter between:$s and:$z) ]
+ ]
]
]
])
@@ -1388,7 +1386,7 @@
(currentCharacter == $r) ifTrue:[
self recordMatch:#( 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$- and:$/)
or:[
@@ -1414,7 +1412,7 @@
(currentCharacter == $e) ifTrue:[
self recordMatch:#( 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$- and:$/)
or:[
@@ -1440,14 +1438,17 @@
(currentCharacter == $i) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$f)
- or:[ (currentCharacter between:$h and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$f)
+ or:[ (currentCharacter between:$h and:$z) ]
+ ]
]
]
])
@@ -1463,14 +1464,17 @@
(currentCharacter == $g) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$m)
- or:[ (currentCharacter between:$o and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$m)
+ or:[ (currentCharacter between:$o and:$z) ]
+ ]
]
]
])
@@ -1484,7 +1488,7 @@
^ self reportLastMatch
].
(currentCharacter == $n) ifTrue:[
- self recordMatch:#( 23 37 ).
+ self recordMatch:#( 3 37 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1524,7 +1528,7 @@
(currentCharacter == $f) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1551,7 +1555,7 @@
(currentCharacter == $r) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1575,7 +1579,7 @@
(currentCharacter == $o) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1612,7 +1616,7 @@
^ self reportLastMatch
].
(currentCharacter == $:) ifTrue:[
- ^ self recordAndReportMatch:#( 10 ).
+ ^ self recordAndReportMatch:#( 32 ).
].
^ self reportLastMatch
].
@@ -1623,7 +1627,7 @@
(currentCharacter == $u) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1647,7 +1651,7 @@
(currentCharacter == $n) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1671,7 +1675,7 @@
(currentCharacter == $c) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1695,7 +1699,7 @@
(currentCharacter == $t) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1719,7 +1723,7 @@
(currentCharacter == $i) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1743,7 +1747,7 @@
(currentCharacter == $o) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1782,14 +1786,17 @@
(currentCharacter == $-) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$s)
- or:[ (currentCharacter between:$u and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$s)
+ or:[ (currentCharacter between:$u and:$z) ]
+ ]
]
]
])
@@ -1805,12 +1812,15 @@
(currentCharacter == $t) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
- or:[ (currentCharacter between:$a and:$x) or:[ currentCharacter == $z ] ]
+ (currentCharacter between:$A and:$Z)
+ or:[
+ currentCharacter == $_
+ or:[ (currentCharacter between:$a and:$x) or:[ currentCharacter == $z ] ]
+ ]
]
])
ifTrue:[
@@ -1825,14 +1835,17 @@
(currentCharacter == $y) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$o)
- or:[ (currentCharacter between:$q and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$o)
+ or:[ (currentCharacter between:$q and:$z) ]
+ ]
]
]
])
@@ -1848,7 +1861,7 @@
(currentCharacter == $p) ifTrue:[
self recordMatch:#( 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$- and:$/)
or:[
@@ -1872,7 +1885,7 @@
^ self reportLastMatch
].
(currentCharacter == $e) ifTrue:[
- self recordMatch:#( 2 37 ).
+ self recordMatch:#( 24 37 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -1914,7 +1927,7 @@
(currentCharacter == $p) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1938,7 +1951,7 @@
(currentCharacter == $o) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1962,7 +1975,7 @@
(currentCharacter == $i) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -1986,7 +1999,7 @@
(currentCharacter == $n) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2010,7 +2023,7 @@
(currentCharacter == $t) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2034,7 +2047,7 @@
(currentCharacter == $e) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2073,14 +2086,17 @@
(currentCharacter == $-) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$s)
- or:[ (currentCharacter between:$u and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$s)
+ or:[ (currentCharacter between:$u and:$z) ]
+ ]
]
]
])
@@ -2096,7 +2112,7 @@
(currentCharacter == $t) ifTrue:[
self recordMatch:#( 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$- and:$/)
or:[
@@ -2120,7 +2136,7 @@
^ self reportLastMatch
].
(currentCharacter == $o) ifTrue:[
- self recordMatch:#( 33 37 ).
+ self recordMatch:#( 12 37 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2156,7 +2172,7 @@
(currentCharacter == $s) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2180,7 +2196,7 @@
(currentCharacter == $t) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2204,7 +2220,7 @@
(currentCharacter == $r) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2228,7 +2244,7 @@
(currentCharacter == $u) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2252,7 +2268,7 @@
(currentCharacter == $c) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2291,14 +2307,17 @@
(currentCharacter == $-) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$e)
- or:[ (currentCharacter between:$g and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$e)
+ or:[ (currentCharacter between:$g and:$z) ]
+ ]
]
]
])
@@ -2314,7 +2333,7 @@
(currentCharacter == $f) ifTrue:[
self recordMatch:#( 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$- and:$/)
or:[
@@ -2340,14 +2359,17 @@
(currentCharacter == $o) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$q)
- or:[ (currentCharacter between:$s and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$q)
+ or:[ (currentCharacter between:$s and:$z) ]
+ ]
]
]
])
@@ -2363,7 +2385,7 @@
(currentCharacter == $r) ifTrue:[
self recordMatch:#( 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$- and:$/)
or:[
@@ -2389,7 +2411,7 @@
(currentCharacter == $e) ifTrue:[
self recordMatch:#( 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$- and:$/)
or:[
@@ -2415,14 +2437,17 @@
(currentCharacter == $i) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$f)
- or:[ (currentCharacter between:$h and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$f)
+ or:[ (currentCharacter between:$h and:$z) ]
+ ]
]
]
])
@@ -2438,14 +2463,17 @@
(currentCharacter == $g) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$m)
- or:[ (currentCharacter between:$o and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$m)
+ or:[ (currentCharacter between:$o and:$z) ]
+ ]
]
]
])
@@ -2459,7 +2487,7 @@
^ self reportLastMatch
].
(currentCharacter == $n) ifTrue:[
- self recordMatch:#( 25 37 ).
+ self recordMatch:#( 9 37 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2503,7 +2531,7 @@
(currentCharacter == $t) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2524,7 +2552,7 @@
(currentCharacter == $y) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2548,7 +2576,7 @@
(currentCharacter == $p) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2572,7 +2600,7 @@
(currentCharacter == $e) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2596,7 +2624,7 @@
(currentCharacter == $d) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2620,7 +2648,7 @@
(currentCharacter == $e) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2659,14 +2687,17 @@
(currentCharacter == $-) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$e)
- or:[ (currentCharacter between:$g and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$e)
+ or:[ (currentCharacter between:$g and:$z) ]
+ ]
]
]
])
@@ -2682,7 +2713,7 @@
(currentCharacter == $f) ifTrue:[
self recordMatch:#( 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$- and:$/)
or:[
@@ -2708,14 +2739,17 @@
(currentCharacter == $o) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$q)
- or:[ (currentCharacter between:$s and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$q)
+ or:[ (currentCharacter between:$s and:$z) ]
+ ]
]
]
])
@@ -2731,7 +2765,7 @@
(currentCharacter == $r) ifTrue:[
self recordMatch:#( 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$- and:$/)
or:[
@@ -2757,7 +2791,7 @@
(currentCharacter == $e) ifTrue:[
self recordMatch:#( 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$- and:$/)
or:[
@@ -2783,14 +2817,17 @@
(currentCharacter == $i) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$f)
- or:[ (currentCharacter between:$h and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$f)
+ or:[ (currentCharacter between:$h and:$z) ]
+ ]
]
]
])
@@ -2806,14 +2843,17 @@
(currentCharacter == $g) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$m)
- or:[ (currentCharacter between:$o and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$m)
+ or:[ (currentCharacter between:$o and:$z) ]
+ ]
]
]
])
@@ -2827,7 +2867,7 @@
^ self reportLastMatch
].
(currentCharacter == $n) ifTrue:[
- self recordMatch:#( 9 37 ).
+ self recordMatch:#( 1 37 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -2873,7 +2913,7 @@
(currentCharacter == $u) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2897,7 +2937,7 @@
(currentCharacter == $n) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2921,7 +2961,7 @@
(currentCharacter == $i) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2945,7 +2985,7 @@
(currentCharacter == $o) ifTrue:[
self recordMatch:#( 34 37 ).
self step.
- ((currentCharacter between:$0 and:$9)
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$A and:$Z)
or:[
@@ -2984,14 +3024,17 @@
(currentCharacter == $-) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$e)
- or:[ (currentCharacter between:$g and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$e)
+ or:[ (currentCharacter between:$g and:$z) ]
+ ]
]
]
])
@@ -3007,7 +3050,7 @@
(currentCharacter == $f) ifTrue:[
self recordMatch:#( 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$- and:$/)
or:[
@@ -3033,14 +3076,17 @@
(currentCharacter == $o) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$q)
- or:[ (currentCharacter between:$s and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$q)
+ or:[ (currentCharacter between:$s and:$z) ]
+ ]
]
]
])
@@ -3056,7 +3102,7 @@
(currentCharacter == $r) ifTrue:[
self recordMatch:#( 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$- and:$/)
or:[
@@ -3082,7 +3128,7 @@
(currentCharacter == $e) ifTrue:[
self recordMatch:#( 37 ).
self step.
- (currentCharacter isXMLDigit
+ (currentCharacter isNationalDigit
or:[
(currentCharacter between:$- and:$/)
or:[
@@ -3108,14 +3154,17 @@
(currentCharacter == $i) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$f)
- or:[ (currentCharacter between:$h and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$f)
+ or:[ (currentCharacter between:$h and:$z) ]
+ ]
]
]
])
@@ -3131,14 +3180,17 @@
(currentCharacter == $g) ifTrue:[
self recordMatch:#( 37 ).
self step.
- ((currentCharacter between:$- and:$9)
+ (currentCharacter isNationalDigit
or:[
- (currentCharacter between:$A and:$Z)
+ (currentCharacter between:$- and:$/)
or:[
- currentCharacter == $_
+ (currentCharacter between:$A and:$Z)
or:[
- (currentCharacter between:$a and:$m)
- or:[ (currentCharacter between:$o and:$z) ]
+ currentCharacter == $_
+ or:[
+ (currentCharacter between:$a and:$m)
+ or:[ (currentCharacter between:$o and:$z) ]
+ ]
]
]
])
@@ -3152,7 +3204,7 @@
^ self reportLastMatch
].
(currentCharacter == $n) ifTrue:[
- self recordMatch:#( 19 37 ).
+ self recordMatch:#( 7 37 ).
self step.
(currentCharacter isLetterOrDigit
or:[ (currentCharacter between:$- and:$/) or:[ currentCharacter == $_ ] ])
@@ -3192,22 +3244,16 @@
^ self reportLastMatch
].
^ self reportLastMatch
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
!CDefinitionScanner methodsFor:'generated-tokens'!
emptySymbolTokenId
- ^64
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ ^40
!
errorTokenId
- ^65
-
- "Modified: / 09-09-2008 / 17:05:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ ^39
! !
!CDefinitionScanner class methodsFor:'documentation'!
--- a/Cface__CLongNode.st Tue Sep 04 15:07:07 2012 +0000
+++ b/Cface__CLongNode.st Wed Sep 05 11:12:41 2012 +0000
@@ -46,7 +46,7 @@
^#longLongAt:
].
- self breakPoint: #jv.
+ "/self breakPoint: #jv.
^ type stxStructFieldGetterSelector
--- a/Cface__CNode.st Tue Sep 04 15:07:07 2012 +0000
+++ b/Cface__CNode.st Wed Sep 05 11:12:41 2012 +0000
@@ -203,6 +203,10 @@
"Created: / 17-02-2008 / 21:52:38 / janfrog"
!
+isCUserDefinedTypeNode
+ ^ false
+!
+
isCVoidNode
^ false
--- a/Cface__CStructuredNode.st Tue Sep 04 15:07:07 2012 +0000
+++ b/Cface__CStructuredNode.st Wed Sep 05 11:12:41 2012 +0000
@@ -49,10 +49,11 @@
!
fields:aCollection
- fields := aCollection.
+ fields := aCollection select:[:each|each notNil].
fields do:[:f|f owner: self].
"Created: / 10-07-2008 / 08:43:26 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 05-09-2012 / 11:02:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
stxStructFieldGetterSelector
--- a/Cface__CTypedefNode.st Tue Sep 04 15:07:07 2012 +0000
+++ b/Cface__CTypedefNode.st Wed Sep 05 11:12:41 2012 +0000
@@ -3,7 +3,7 @@
"{ NameSpace: Cface }"
CTypeNode subclass:#CTypedefNode
- instanceVariableNames:'type'
+ instanceVariableNames:'type foreign'
classVariableNames:''
poolDictionaries:''
category:'Cface-C AST'
@@ -52,6 +52,18 @@
"Created: / 03-07-2008 / 22:40:25 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
+foreign
+ ^ foreign
+
+ "Created: / 04-07-2008 / 11:46:03 / Jan Vrany <vranyj1@fel.cvut.cz>"
+!
+
+foreign:something
+ foreign := something.
+
+ "Created: / 04-07-2008 / 11:46:03 / Jan Vrany <vranyj1@fel.cvut.cz>"
+!
+
type
^ type
@@ -81,6 +93,15 @@
"Modified: / 10-07-2008 / 20:05:26 / Jan Vrany <vranyj1@fel.cvut.cz>"
! !
+!CTypedefNode methodsFor:'testing'!
+
+isForeign
+
+ ^foreign ? false
+
+ "Created: / 04-07-2008 / 11:46:39 / Jan Vrany <vranyj1@fel.cvut.cz>"
+! !
+
!CTypedefNode methodsFor:'visiting'!
acceptVisitor:aVisitor
--- a/Cface__CUserDefinedTypeNode.st Tue Sep 04 15:07:07 2012 +0000
+++ b/Cface__CUserDefinedTypeNode.st Wed Sep 05 11:12:41 2012 +0000
@@ -149,6 +149,12 @@
"Created: / 19-12-2007 / 15:28:32 / haja"
! !
+!CUserDefinedTypeNode methodsFor:'testing'!
+
+isCUserDefinedTypeNode
+ ^ true
+! !
+
!CUserDefinedTypeNode methodsFor:'visiting'!
acceptVisitor:aVisitor
--- a/Cface__GeneratorCommand.st Tue Sep 04 15:07:07 2012 +0000
+++ b/Cface__GeneratorCommand.st Wed Sep 05 11:12:41 2012 +0000
@@ -58,7 +58,7 @@
"Created: / 22-02-2009 / 14:44:00 / Jan Vrany <vranyj1@fel.cvut.cz>"
!
-generateLibgit
+generateLibgit2
|svnDir libgit2DefFile|
@@ -69,13 +69,14 @@
definitions: libgit2DefFile asFilename;
mappings: Cface::Libgit2Mapping new;
unixLibraryName:'libgit2.so';
+ win32LibraryName:'git2.dll';
process
"
- Cface::GeneratorCommand generateLibgit
+ Cface::GeneratorCommand generateLibgit2
"
- "Created: / 04-09-2012 / 14:55:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Created: / 05-09-2012 / 10:55:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
generateSubversion
--- a/Cface__Libgit2Mapping.st Tue Sep 04 15:07:07 2012 +0000
+++ b/Cface__Libgit2Mapping.st Wed Sep 05 11:12:41 2012 +0000
@@ -47,6 +47,15 @@
"Modified: / 04-09-2012 / 16:01:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!Libgit2Mapping methodsFor:'mapping - categories'!
+
+smalltalkCategoryForDerivedType:cType
+
+ ^'Git-C Types'
+
+ "Created: / 05-09-2012 / 11:15:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!Libgit2Mapping class methodsFor:'documentation'!
version_SVN
--- a/Cface__Platform.st Tue Sep 04 15:07:07 2012 +0000
+++ b/Cface__Platform.st Wed Sep 05 11:12:41 2012 +0000
@@ -16,11 +16,12 @@
TheInstance ifNil:
[Smalltalk isSmalltalkX
- ifTrue:[TheInstance := SmalltalkX new]
+ ifTrue:[TheInstance := Cface::SmalltalkX new]
ifFalse:[self error:'Unsupported platform']].
^TheInstance
"Created: / 08-02-2008 / 08:17:48 / janfrog"
+ "Modified: / 05-09-2012 / 10:57:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!Platform methodsFor:'accessing'!
--- a/Cface__SmalltalkXGenerator.st Tue Sep 04 15:07:07 2012 +0000
+++ b/Cface__SmalltalkXGenerator.st Wed Sep 05 11:12:41 2012 +0000
@@ -36,22 +36,23 @@
[:s|
s
nextPutAll: 'libraryName'; cr; cr;
- tab;
+ tab4;
nextPutAll: 'OperatingSystem isUNIXlike ifTrue:[^';
nextPutAll: unixLibraryName storeString;
nextPutAll: '].';
cr; cr;
- tab;
+ tab4;
nextPutAll: 'OperatingSystem isMSWINDOWSlike ifTrue:[^';
nextPutAll: win32LibraryName storeString;
nextPutAll: '].';
cr; cr;
- tab;
+ tab4;
nextPutAll:'self error:''Library name for host OS is not known'''.
]
"Created: / 10-07-2008 / 09:04:56 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 05-09-2012 / 11:48:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
sourceForPrimitive:functionNode
@@ -62,7 +63,7 @@
s
cr;
cr;
- tab;
+ tab4;
nextPutAll:'<cdecl:';
space;
nextPutAll:functionNode return ffiTypeSymbol;
@@ -84,11 +85,12 @@
s nextPut:$>.
s
cr;
- tab.
+ tab4.
s nextPutAll:'self primitiveFailed'.
])
"Created: / 10-07-2008 / 09:00:06 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 05-09-2012 / 11:48:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
sourceForStructFieldGetter:field
@@ -97,8 +99,10 @@
s
nextPutAll:(field smalltalkName);
cr;
+ tab4; nextPutAll:'"Returns '; nextPutAll: field type printString; nextPutAll: '"';
cr;
- tab;
+ cr;
+ tab4;
nextPutAll:'^self';
space;
nextPutAll:field stxStructFieldGetterSelector;
@@ -107,6 +111,7 @@
])
"Created: / 09-09-2008 / 21:25:16 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 05-09-2012 / 11:52:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
sourceForStructFieldSetter:field
@@ -122,7 +127,7 @@
nextPutAll:'value';
cr;
cr;
- tab;
+ tab4;
nextPutAll:'self';
space;
nextPutAll:field stxStructFieldSetterSelector keywords first;
@@ -134,6 +139,7 @@
])
"Created: / 09-09-2008 / 21:26:07 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 05-09-2012 / 11:48:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
sourceForStructSize: size
@@ -142,12 +148,13 @@
[:s|
s
nextPutAll: 'structSize'; cr; cr;
- tab;
- nextPutAll: '^';
- nextPutAll: size printString
+ tab4;
+ nextPutAll: '^';
+ nextPutAll: size printString
]
"Created: / 09-09-2008 / 17:12:01 / Jan Vrany <vranyj1@fel.cvut.cz>"
+ "Modified: / 05-09-2012 / 11:48:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!SmalltalkXGenerator methodsFor:'visiting'!
--- a/Cface__TypeResolver.st Tue Sep 04 15:07:07 2012 +0000
+++ b/Cface__TypeResolver.st Wed Sep 05 11:12:41 2012 +0000
@@ -47,6 +47,21 @@
"Created: / 17-02-2008 / 17:56:42 / janfrog"
!
+visitCTypedefNode: anObject
+
+ anObject type isCUserDefinedTypeNode ifTrue:[
+ | realType |
+
+ realType := typeMap at: anObject type cName ifAbsent:[nil].
+ realType notNil ifTrue:[
+ self visit: realType.
+ anObject type: realType.
+ ].
+ ]
+
+ "Created: / 05-09-2012 / 11:37:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
visitCUserDefinedTypeNode: anObject
"/thisContext isRecursive ifTrue:[^self].
--- a/Make.proto Tue Sep 04 15:07:07 2012 +0000
+++ b/Make.proto Wed Sep 05 11:12:41 2012 +0000
@@ -187,7 +187,7 @@
$(OUTDIR)Cface__CWCharNode.$(O) Cface__CWCharNode.$(H): Cface__CWCharNode.st $(INCLUDE_TOP)/cvut/fel/cface/Cface__CBuiltinNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CTypeNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Cface__CStructNode.$(O) Cface__CStructNode.$(H): Cface__CStructNode.st $(INCLUDE_TOP)/cvut/fel/cface/Cface__CStructuredNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CDerivedTypeNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CTypeNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Cface__CUnionNode.$(O) Cface__CUnionNode.$(H): Cface__CUnionNode.st $(INCLUDE_TOP)/cvut/fel/cface/Cface__CStructuredNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CDerivedTypeNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CTypeNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)/cvut/fel/cface/Cface__CNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic3/ClassDefinitionChange.$(H) $(INCLUDE_TOP)/stx/libbasic3/ClassChange.$(H) $(INCLUDE_TOP)/stx/libbasic3/Change.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic3/ClassDefinitionChange.$(H) $(INCLUDE_TOP)/stx/libbasic3/ClassChange.$(H) $(INCLUDE_TOP)/stx/libbasic3/Change.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/bc.mak Tue Sep 04 15:07:07 2012 +0000
+++ b/bc.mak Wed Sep 05 11:12:41 2012 +0000
@@ -123,6 +123,6 @@
$(OUTDIR)Cface__CWCharNode.$(O) Cface__CWCharNode.$(H): Cface__CWCharNode.st $(INCLUDE_TOP)\cvut\fel\cface\Cface__CBuiltinNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CTypeNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Cface__CStructNode.$(O) Cface__CStructNode.$(H): Cface__CStructNode.st $(INCLUDE_TOP)\cvut\fel\cface\Cface__CStructuredNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CDerivedTypeNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CTypeNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Cface__CUnionNode.$(O) Cface__CUnionNode.$(H): Cface__CUnionNode.st $(INCLUDE_TOP)\cvut\fel\cface\Cface__CStructuredNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CDerivedTypeNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CTypeNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)\cvut\fel\cface\Cface__CNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic3\ClassDefinitionChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\ClassChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic3\ClassDefinitionChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\ClassChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/cface.rc Tue Sep 04 15:07:07 2012 +0000
+++ b/cface.rc Wed Sep 05 11:12:41 2012 +0000
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: cvut_fel_cface.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,19,19
+ FILEVERSION 6,2,23,23
PRODUCTVERSION 6,2,3,1
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "CVUT FEL\0"
VALUE "FileDescription", "Cairo graphics binding (LIB)\0"
- VALUE "FileVersion", "6.2.19.19\0"
+ VALUE "FileVersion", "6.2.23.23\0"
VALUE "InternalName", "cvut:fel/cface\0"
VALUE "LegalCopyright", "Copyright 2008 Jan Vrany\0"
VALUE "ProductName", "CairoGraphics\0"
VALUE "ProductVersion", "6.2.3.1\0"
- VALUE "ProductDate", "Tue, 04 Sep 2012 15:06:31 GMT\0"
+ VALUE "ProductDate", "Wed, 05 Sep 2012 11:12:53 GMT\0"
END
END
--- a/cvut_fel_cface.st Tue Sep 04 15:07:07 2012 +0000
+++ b/cvut_fel_cface.st Wed Sep 05 11:12:41 2012 +0000
@@ -20,8 +20,8 @@
^ #(
#'stx:goodies/smaCC' "SmaCC::SmaCCScanner - superclass of Cface::CDefinitionScanner "
- #'stx:libbasic' "Object - superclass of Cface::CDefinitionScanner "
- #'stx:libbasic3' "ClassChange - superclass of extended ClassDefinitionChange "
+ #'stx:libbasic' "Object - superclass of Cface::CDerivedTypeNode "
+ #'stx:libbasic3' "Change - superclass of extended ClassChange "
)
! !
@@ -92,6 +92,7 @@
^ #(
ClassDefinitionChange nameSpaceName:
+ Stream tab4
)
! !
--- a/extensions.st Tue Sep 04 15:07:07 2012 +0000
+++ b/extensions.st Wed Sep 05 11:12:41 2012 +0000
@@ -9,6 +9,15 @@
"Modified: / 18-07-2011 / 17:06:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!Stream methodsFor:'writing'!
+
+tab4
+
+ self next:4 put:(Character space)
+
+ "Created: / 05-09-2012 / 11:48:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!cvut_fel_cface class methodsFor:'documentation'!
extensionsVersion_SVN