--- a/Cface__CArgumentNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CArgumentNode.st	Wed May 30 19:55:53 2012 +0000
@@ -70,7 +70,7 @@
 !CArgumentNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CArgumentNode.st,v 1.1 2008/02/26 15:59:39 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CArrayNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CArrayNode.st	Wed May 30 19:55:53 2012 +0000
@@ -59,6 +59,14 @@
     type := aCTypeNode.
 ! !
 
+!CArrayNode methodsFor:'testing'!
+
+isCArrayNode
+    ^ true
+
+    "Created: / 30-05-2012 / 21:38:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !CArrayNode methodsFor:'visiting'!
 
 acceptVisitor:aVisitor 

--- a/Cface__CBuiltinNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CBuiltinNode.st	Wed May 30 19:55:53 2012 +0000
@@ -69,7 +69,7 @@
 !CBuiltinNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CBuiltinNode.st,v 1.1 2008/02/26 18:24:18 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CCharNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CCharNode.st	Wed May 30 19:55:53 2012 +0000
@@ -30,6 +30,12 @@
     "superclass Cface::CBuiltinNode says that I am responsible to implement this method"
 
     ^ self shouldImplement
+!
+
+stxStructFieldGetterSelector
+    ^ #byteAt:
+
+    "Created: / 30-05-2012 / 21:36:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !CCharNode methodsFor:'visiting'!

--- a/Cface__CConstNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CConstNode.st	Wed May 30 19:55:53 2012 +0000
@@ -136,7 +136,7 @@
 !CConstNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CConstNode.st,v 1.1 2008/02/26 15:59:11 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CDefinitionFileNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CDefinitionFileNode.st	Wed May 30 19:55:53 2012 +0000
@@ -87,7 +87,7 @@
 !CDefinitionFileNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CDefinitionFileNode.st,v 1.1 2008/02/26 15:59:54 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CDefinitionNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CDefinitionNode.st	Wed May 30 19:55:53 2012 +0000
@@ -82,7 +82,7 @@
 !CDefinitionNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CDefinitionNode.st,v 1.1 2008/02/26 18:24:44 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CDefinitionParser.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CDefinitionParser.st	Wed May 30 19:55:53 2012 +0000
@@ -1640,7 +1640,7 @@
 !CDefinitionParser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CDefinitionParser.st,v 1.1 2008/02/26 15:59:19 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CDefinitionScanner.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CDefinitionScanner.st	Wed May 30 19:55:53 2012 +0000
@@ -3213,7 +3213,7 @@
 !CDefinitionScanner class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CDefinitionScanner.st,v 1.1 2008/02/26 16:00:43 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CDerivedTypeNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CDerivedTypeNode.st	Wed May 30 19:55:53 2012 +0000
@@ -163,7 +163,7 @@
 !CDerivedTypeNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CDerivedTypeNode.st,v 1.1 2008/02/26 15:59:26 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CDoubleNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CDoubleNode.st	Wed May 30 19:55:53 2012 +0000
@@ -30,6 +30,20 @@
     "superclass Cface::CBuiltinNode says that I am responsible to implement this method"
 
     ^ self shouldImplement
+!
+
+stxStructFieldGetterSelector
+    ^ #doubleAt:
+
+    "Created: / 30-05-2012 / 21:35:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!CDoubleNode methodsFor:'testing'!
+
+isCDoubleNode
+    ^ true
+
+    "Created: / 30-05-2012 / 21:38:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !CDoubleNode methodsFor:'visiting'!

--- a/Cface__CEnumNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CEnumNode.st	Wed May 30 19:55:53 2012 +0000
@@ -132,7 +132,7 @@
 !CEnumNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CEnumNode.st,v 1.1 2008/02/26 16:00:22 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CEnumValueNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CEnumValueNode.st	Wed May 30 19:55:53 2012 +0000
@@ -80,7 +80,7 @@
 !CEnumValueNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CEnumValueNode.st,v 1.1 2008/02/26 15:57:17 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CFloatNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CFloatNode.st	Wed May 30 19:55:53 2012 +0000
@@ -30,6 +30,20 @@
     "superclass Cface::CBuiltinNode says that I am responsible to implement this method"
 
     ^ self shouldImplement
+!
+
+stxStructFieldGetterSelector
+    ^ #floatAt:
+
+    "Created: / 30-05-2012 / 21:35:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!CFloatNode methodsFor:'testing'!
+
+isCFloatNode
+    ^ true
+
+    "Created: / 30-05-2012 / 21:37:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !CFloatNode methodsFor:'visiting'!

--- a/Cface__CFunctionNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CFunctionNode.st	Wed May 30 19:55:53 2012 +0000
@@ -271,7 +271,7 @@
 !CFunctionNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CFunctionNode.st,v 1.1 2008/02/26 16:00:50 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CFunctionTypeNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CFunctionTypeNode.st	Wed May 30 19:55:53 2012 +0000
@@ -84,7 +84,7 @@
 !CFunctionTypeNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CFunctionTypeNode.st,v 1.1 2008/02/26 15:56:42 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CIntNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CIntNode.st	Wed May 30 19:55:53 2012 +0000
@@ -30,6 +30,20 @@
     "superclass Cface::CBuiltinNode says that I am responsible to implement this method"
 
     ^ self shouldImplement
+!
+
+stxStructFieldGetterSelector
+    ^ #longAt:
+
+    "Created: / 30-05-2012 / 21:36:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!CIntNode methodsFor:'testing'!
+
+isCIntNode
+    ^ true
+
+    "Created: / 30-05-2012 / 21:37:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !CIntNode methodsFor:'visiting'!

--- a/Cface__CLongNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CLongNode.st	Wed May 30 19:55:53 2012 +0000
@@ -38,6 +38,19 @@
     ^ #long
 
     "Modified: / 12-07-2011 / 16:33:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+stxStructFieldGetterSelector
+
+    type isCIntNode ifTrue:[
+        ^#longLongAt:
+    ].
+
+    self breakPoint: #jv.
+
+    ^ type stxStructFieldGetterSelector
+
+    "Created: / 30-05-2012 / 21:39:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !CLongNode methodsFor:'visiting'!

--- a/Cface__CModifierNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CModifierNode.st	Wed May 30 19:55:53 2012 +0000
@@ -41,9 +41,10 @@
 !
 
 stxStructFieldSetterSelector
-    ^ (self stxStructFieldGetterSelector , ':put:') asSymbol
+    ^ (self stxStructFieldGetterSelector , 'put:') asSymbol
 
     "Created: / 09-09-2008 / 21:33:21 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 30-05-2012 / 21:41:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 type
@@ -88,7 +89,7 @@
 !CModifierNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CModifierNode.st,v 1.1 2008/02/26 15:58:01 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CNode.st	Wed May 30 19:55:53 2012 +0000
@@ -232,7 +232,7 @@
 !CNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CNode.st,v 1.1 2008/02/26 15:58:22 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CNodeVisitor.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CNodeVisitor.st	Wed May 30 19:55:53 2012 +0000
@@ -238,7 +238,7 @@
 !CNodeVisitor class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CNodeVisitor.st,v 1.1 2008/02/26 15:57:32 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CPointerNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CPointerNode.st	Wed May 30 19:55:53 2012 +0000
@@ -63,6 +63,12 @@
     "Created: / 12-07-2011 / 16:23:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+stxStructFieldGetterSelector
+    ^ #pointerAt:
+
+    "Created: / 30-05-2012 / 21:36:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 type
     ^ type
 !

--- a/Cface__CStructFieldNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CStructFieldNode.st	Wed May 30 19:55:53 2012 +0000
@@ -89,16 +89,6 @@
     "Created: / 10-02-2008 / 19:28:11 / janfrog"
 ! !
 
-!CStructFieldNode methodsFor:'builder'!
-
-buildTypeDescriptionOn:aBuilder
-
-    aBuilder buildStructFieldNode:name for:type.
-
-    "Created: / 20-12-2007 / 12:19:13 / haja"
-    "Modified: / 10-02-2008 / 19:28:05 / janfrog"
-! !
-
 !CStructFieldNode methodsFor:'testing'!
 
 isCStructFieldNode
@@ -123,7 +113,7 @@
 !CStructFieldNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CStructFieldNode.st,v 1.1 2008/02/26 15:57:25 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CStructNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CStructNode.st	Wed May 30 19:55:53 2012 +0000
@@ -78,7 +78,7 @@
 !CStructNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CStructNode.st,v 1.1 2008/02/26 16:00:14 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CTypeNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CTypeNode.st	Wed May 30 19:55:53 2012 +0000
@@ -119,7 +119,7 @@
 !CTypeNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CTypeNode.st,v 1.1 2008/02/26 15:59:04 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CTypedefNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CTypedefNode.st	Wed May 30 19:55:53 2012 +0000
@@ -52,42 +52,6 @@
     "Created: / 03-07-2008 / 22:40:25 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 
-foreign
-    ^ foreign
-
-    "Created: / 19-11-2007 / 09:41:32 / haja"
-!
-
-foreign:something
-    foreign := something.
-
-    "Created: / 19-11-2007 / 09:41:32 / haja"
-!
-
-id
-    ^ id
-
-    "Created: / 29-10-2007 / 19:58:43 / haja"
-!
-
-id:something
-    id := something.
-
-    "Created: / 29-10-2007 / 19:58:43 / haja"
-!
-
-name
-    ^ name
-
-    "Created: / 29-10-2007 / 19:58:43 / haja"
-!
-
-name:something
-    name := something.
-
-    "Created: / 29-10-2007 / 19:58:43 / haja"
-!
-
 type
     ^ type
 
@@ -133,7 +97,7 @@
 !CTypedefNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CTypedefNode.st,v 1.1 2008/02/26 16:00:01 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CUnionNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CUnionNode.st	Wed May 30 19:55:53 2012 +0000
@@ -87,7 +87,7 @@
 !CUnionNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CUnionNode.st,v 1.1 2008/02/26 15:57:54 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CUnsignedNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CUnsignedNode.st	Wed May 30 19:55:53 2012 +0000
@@ -73,7 +73,7 @@
 !CUnsignedNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CUnsignedNode.st,v 1.1 2008/02/26 15:58:44 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CUserDefinedTypeNode.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CUserDefinedTypeNode.st	Wed May 30 19:55:53 2012 +0000
@@ -100,175 +100,6 @@
     "Created: / 12-02-2008 / 23:21:13 / janfrog"
 ! !
 
-!CUserDefinedTypeNode methodsFor:'builder'!
-
-buildCTypeOn:aBuilder
-
-    ((reference references:EnumNode) | (reference references:StructNode) | (reference references:UnionNode)) ifTrue:[
-      (reference typedef) ifFalse:[
-        (reference references:EnumNode) ifTrue:[ aBuilder nextPutString:'enum ' ].
-        (reference references:StructNode) ifTrue:[ aBuilder nextPutString:'struct ' ].
-        (reference references:UnionNode) ifTrue:[ aBuilder nextPutString:'union ' ].
-      ].
-    ].
-
-    aBuilder idNamesWith:names.
-
-    "Created: / 19-12-2007 / 18:13:30 / haja"
-!
-
-buildObjectCreationDefinedTypeFor:aVariable on:aBuilder
-
-    (reference references:EnumNode) ifTrue:[
-      ^aBuilder buildIntegerCreationFor:aVariable.
-    ].
-
-    ^aBuilder buildPointerCreationFor:aVariable.
-
-    "Created: / 19-12-2007 / 17:42:08 / haja"
-!
-
-buildObjectCreationFor:aVariable on:aBuilder
-
-    self fundamentalTypes do:[:aType| (aType = names last) ifTrue:[ ^self buildObjectCreationFundamentalTypeFor:aVariable on:aBuilder. ] ].
-
-    ^self buildObjectCreationDefinedTypeFor:aVariable on:aBuilder.
-
-    "Created: / 19-12-2007 / 16:34:44 / haja"
-    "Modified: / 19-12-2007 / 17:44:19 / haja"
-!
-
-buildObjectCreationFundamentalTypeFor:aVariable on:aBuilder
-
-      (((names last = 'int') | (names last = 'short') | (names last = 'long')) & ((names includes:'unsigned')not)) ifTrue:[
-        ^aBuilder buildIntegerCreationFor:aVariable.
-      ].
-
-      (((names last = 'int') | (names last = 'short') | (names last = 'long') | (names last = 'unsigned')) & ((names includes:'signed')not)) ifTrue:[
-        ^aBuilder buildUnsignedIntegerCreationFor:aVariable.
-      ].
-
-      (names last = 'char') ifTrue:[
-        ^aBuilder buildCharacterCreationFor:aVariable.
-      ].
-
-      (names last = 'float') ifTrue:[
-        ^aBuilder buildFloatCreationFor:aVariable.
-      ].
-      (names last = 'double') ifTrue:[
-        ^aBuilder buildDoubleCreationFor:aVariable.
-      ].
-
-    ^aBuilder buildPointerCreationFor:aVariable.
-
-    "Created: / 19-12-2007 / 17:40:14 / haja"
-!
-
-buildTypeCheckFor:aVariable on:aBuilder
-
-    self fundamentalTypes do:[:aType| (aType = names last) ifTrue:[ ^self buildTypeCheckForFundamentalType:aVariable on:aBuilder. ] ].
-
-    ^self buildTypeCheckForDefinedType:aVariable on:aBuilder.
-
-    "Created: / 19-12-2007 / 15:24:02 / haja"
-!
-
-buildTypeCheckForDefinedType:aVariable on:aBuilder
-
-    (reference references:EnumNode) ifTrue:[
-      ^aBuilder buildIntegerCheckFor:aVariable.
-    ].
-
-    ^aBuilder buildPointerCheckFor:aVariable.
-
-    "Created: / 19-12-2007 / 15:31:52 / haja"
-!
-
-buildTypeCheckForFundamentalType:aVariable on:aBuilder
-
-      ((names last = 'int') | (names last = 'short') | (names last = 'long') | (names last = 'unsigned')) ifTrue:[
-        ^aBuilder buildIntegerCheckFor:aVariable.
-      ].
-
-      (names last = 'char') ifTrue:[
-        ^aBuilder buildCharacterCheckFor:aVariable.
-      ].
-
-      (names last = 'float') ifTrue:[
-        ^aBuilder buildFloatCheckFor:aVariable.
-      ].
-      (names last = 'double') ifTrue:[
-        ^aBuilder buildDoubleCheckFor:aVariable.
-      ].
-
-    ^aBuilder buildPointerCheckFor:aVariable.
-
-    "Created: / 19-12-2007 / 15:31:42 / haja"
-!
-
-buildTypeDescriptionOn:aBuilder
-
-    (reference references:Cface::EnumNode) ifTrue:[
-        aBuilder nextPutString:'enumeration '.
-    ].
-    (reference references:Cface::StructNode) ifTrue:[
-        aBuilder nextPutString:'structure '.
-    ].
-    (reference references:Cface::UnionNode) ifTrue:[
-        aBuilder nextPutString:'union '.
-    ].
-
-    names do:[:aName| aBuilder nextPutString:aName asString,' ' ].
-
-    "Created: / 20-12-2007 / 12:11:52 / haja"
-!
-
-buildValueExtractionFor:aVariable on:aBuilder
-
-    self fundamentalTypes do:[:aType| (aType = names last) ifTrue:[ ^self buildValueExtractionForFundamentalType:aVariable on:aBuilder. ] ].
-
-    ^self buildValueExtractionForDefinedType:aVariable on:aBuilder.
-
-    "Created: / 19-12-2007 / 17:26:12 / haja"
-!
-
-buildValueExtractionForDefinedType:aVariable on:aBuilder
-
-    (reference references:EnumNode) ifTrue:[
-      ^aBuilder buildIntegerValueExtractionFor:aVariable.
-    ].
-
-    ^aBuilder buildPointerValueExtractionFor:aVariable.
-
-    "Created: / 19-12-2007 / 17:26:43 / haja"
-!
-
-buildValueExtractionForFundamentalType:aVariable on:aBuilder
-
-      (((names last = 'int') | (names last = 'short') | (names last = 'long')) & ((names includes:'unsigned')not)) ifTrue:[
-        ^aBuilder buildIntegerValueExtractionFor:aVariable.
-      ].
-
-      (((names last = 'int') | (names last = 'short') | (names last = 'long') | (names last = 'unsigned')) & ((names includes:'signed')not)) ifTrue:[
-        ^aBuilder buildUnsignedIntegerValueExtractionFor:aVariable.
-      ].
-
-      (names last = 'char') ifTrue:[
-        ^aBuilder buildCharacterValueExtractionFor:aVariable.
-      ].
-
-      (names last = 'float') ifTrue:[
-        ^aBuilder buildFloatValueExtractionFor:aVariable.
-      ].
-      (names last = 'double') ifTrue:[
-        ^aBuilder buildDoubleValueExtractionFor:aVariable.
-      ].
-
-    ^aBuilder buildPointerValueExtractionFor:aVariable.
-
-    "Created: / 19-12-2007 / 17:26:57 / haja"
-! !
-
 !CUserDefinedTypeNode methodsFor:'converting'!
 
 resolved
@@ -335,7 +166,7 @@
 !CUserDefinedTypeNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CUserDefinedTypeNode.st,v 1.1 2008/02/26 15:57:04 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__CairoMapping.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__CairoMapping.st	Wed May 30 19:55:53 2012 +0000
@@ -114,7 +114,7 @@
 !CairoMapping class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__CairoMapping.st,v 1.1 2008/02/26 15:57:39 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__Generator.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__Generator.st	Wed May 30 19:55:53 2012 +0000
@@ -265,7 +265,7 @@
 !Generator class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__Generator.st,v 1.1 2008/02/26 18:25:56 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__GeneratorCommand.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__GeneratorCommand.st	Wed May 30 19:55:53 2012 +0000
@@ -177,7 +177,7 @@
 !GeneratorCommand class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__GeneratorCommand.st,v 1.1 2008/02/26 15:58:30 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__Platform.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__Platform.st	Wed May 30 19:55:53 2012 +0000
@@ -110,7 +110,7 @@
 !Platform class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__Platform.st,v 1.1 2008/02/26 15:58:07 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__SmalltalkX.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__SmalltalkX.st	Wed May 30 19:55:53 2012 +0000
@@ -21,7 +21,7 @@
 !SmalltalkX class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__SmalltalkX.st,v 1.1 2008/02/26 18:26:11 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__SmalltalkXGenerator.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__SmalltalkXGenerator.st	Wed May 30 19:55:53 2012 +0000
@@ -153,10 +153,11 @@
 !SmalltalkXGenerator methodsFor:'visiting'!
 
 visitCEnumNode: cEnumNode
+    | cdc |
 
     cEnumNode shouldBeIgnored ifTrue:[^self].
 
-    (changeset add: ClassDefinitionChange new)
+    (changeset add: (cdc := ClassDefinitionChange new))
         superClassName: 
             SharedPool fullName;
         nameSpaceName: 
@@ -173,6 +174,8 @@
             cEnumNode smalltalkCategory;
         package:
             cEnumNode smalltalkPackage.
+    cdc source: cdc definitionStringWithoutNamespace.
+
 
     (changeset add: MethodDefinitionChange new)
         className:
@@ -211,6 +214,7 @@
 
     "Created: / 03-07-2008 / 20:10:34 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 22-02-2009 / 15:03:00 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 30-05-2012 / 21:50:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 visitCFunctionNode:functionNode
@@ -253,14 +257,14 @@
 
 visitCStructuredNode: cStructNode
 
-    | smalltalkClass |
+    | smalltalkClass cdc |
 
     cStructNode shouldBeIgnored ifTrue:[^self].
 
     smalltalkClass := Smalltalk at: cStructNode smalltalkClassNameWithNamespace ifAbsent:[nil].
     smalltalkClass 
         ifNil:
-            [(changeset add: ClassDefinitionChange new)
+            [(changeset add: (cdc := ClassDefinitionChange new))
                 superClassName: 
                     ExternalStructure fullName;
                 nameSpaceName: 
@@ -270,7 +274,8 @@
                 category:
                     cStructNode smalltalkCategory;
                 package:
-                    cStructNode smalltalkPackage]
+                    cStructNode smalltalkPackage.
+            cdc source: cdc definitionStringWithoutNamespace]    
         ifNotNil:
             [(smalltalkClass inheritsFrom: ExternalStructure)
                 ifFalse:
@@ -295,6 +300,7 @@
 
     "Created: / 10-07-2008 / 08:46:12 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 22-02-2009 / 15:05:11 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 30-05-2012 / 21:48:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 visitCTypedefNode: typedefNode
@@ -313,7 +319,7 @@
 !SmalltalkXGenerator class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__SmalltalkXGenerator.st,v 1.1 2008/02/26 18:25:12 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__TypeCollector.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__TypeCollector.st	Wed May 30 19:55:53 2012 +0000
@@ -125,7 +125,7 @@
 !TypeCollector class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__TypeCollector.st,v 1.1 2008/02/26 18:25:29 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__TypeMapper.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__TypeMapper.st	Wed May 30 19:55:53 2012 +0000
@@ -153,7 +153,7 @@
 !TypeMapper class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__TypeMapper.st,v 1.1 2008/02/26 15:58:36 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__TypeMapping.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__TypeMapping.st	Wed May 30 19:55:53 2012 +0000
@@ -282,7 +282,7 @@
 !TypeMapping class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__TypeMapping.st,v 1.1 2008/02/26 16:00:36 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Cface__TypeResolver.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/Cface__TypeResolver.st	Wed May 30 19:55:53 2012 +0000
@@ -67,7 +67,7 @@
 !TypeResolver class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /opt/data/cvs/cvut-fel/cface/Cface__TypeResolver.st,v 1.1 2008/02/26 16:00:57 vranyj1 Exp $'
+    ^ '$Id$'
 !
 
 version_SVN

--- a/Make.proto	Mon Jul 18 16:13:22 2011 +0000
+++ b/Make.proto	Wed May 30 19:55:53 2012 +0000
@@ -44,7 +44,7 @@
 LOCALDEFINES=
 
 LIBNAME=libcvut_fel_cface
-STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -H.  -varPrefix=$(LIBNAME)
+STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=.  -varPrefix=$(LIBNAME)
 
 
 # ********** OPTIONAL: MODIFY the next line ***
@@ -63,17 +63,31 @@
 
 all:: preMake classLibRule postMake
 
-pre_objs::  update-svn-revision
+pre_objs::  
+
 
 
 
-update-svn-revision:
-	if [ ! -r .svnversion -o "$(shell svnversion -n)" != "$(shell cat .svnversion)" ]; then \
-		svnversion -n > .svnversion; \
-		sed -i -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"'$(shell svnversion -n)'\"\$$\"/g" \
-			cvut_fel_cface.st; \
+# Update SVN revision in stx_libbasic3.st
+ifneq (,$(findstring .svn,$(wildcard .svn)))
+.svnversion: *.st
+	if [ -d .svn ]; then \
+		rev=$(shell svnversion -n); \
+		echo -n $$rev > .svnversion; \
+	else \
+		echo -n exported > .svnversion; \
 	fi
-.PHONY: update-svn-revision
+
+cvut_fel_cface.o: cvut_fel_cface.st .svnversion 
+	if [ -d .svn ]; then \
+		rev2="$(shell printf "%-16s" $$(cat .svnversion))"; \
+		sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"\'$$rev2\'\"\$$\"/g" $< > .cvut_fel_cface.svn.st; \
+	fi
+	$(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.cvut_fel_cface.svn $(O_RULE);
+	mv .cvut_fel_cface.svn.$(O) cvut_fel_cface.$(O) 
+endif
+
+
 
 
 # add more install actions here
@@ -93,13 +107,17 @@
 	cd $(TOP)/goodies/refactoryBrowser/helpers && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd $(TOP)/libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd $(TOP)/goodies/refactoryBrowser/changes && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd $(TOP)/goodies/refactoryBrowser/changes && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd $(TOP)/goodies/smaCC && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -108,6 +126,7 @@
 
 
 cleanjunk::
+	-rm -f *.s *.s2
 
 clean::
 	-rm -f *.o *.H

--- a/Make.spec	Mon Jul 18 16:13:22 2011 +0000
+++ b/Make.spec	Wed May 30 19:55:53 2012 +0000
@@ -18,7 +18,7 @@
 
 
 # Argument(s) to the stc compiler (stc --usage).
-#  -H.         : create header files locally
+#  -headerDir=. : create header files locally
 #                (if removed, they will be created as common
 #  -Pxxx       : defines the package
 #  -Zxxx       : a prefix for variables within the classLib

--- a/abbrev.stc	Mon Jul 18 16:13:22 2011 +0000
+++ b/abbrev.stc	Wed May 30 19:55:53 2012 +0000
@@ -1,3 +1,6 @@
+# automagically generated by the project definition
+# this file is needed for stc to be able to compile modules independently.
+# it provides information about a classes filename, category and especially namespace.
 Cface::CDefinitionParser Cface__CDefinitionParser cvut:fel/cface 'Cface-Parser' 0
 Cface::CDefinitionScanner Cface__CDefinitionScanner cvut:fel/cface 'Cface-Parser' 1
 Cface::CNode Cface__CNode cvut:fel/cface 'Cface-C AST' 0

--- a/bc.mak	Mon Jul 18 16:13:22 2011 +0000
+++ b/bc.mak	Wed May 30 19:55:53 2012 +0000
@@ -6,13 +6,19 @@
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
 #
-# This file contains make rules for the win32 platform (using borland-bcc).
+# Notice, that the name bc.mak is historical (from times, when only borland c was supported).
+# This file contains make rules for the win32 platform using either borland-bcc or visual-c.
 # It shares common definitions with the unix-make in Make.spec.
-# The nt.mak supports the following targets:
+# The bc.mak supports the following targets:
 #    bmake         - compile all st-files to a classLib (dll)
 #    bmake clean   - clean all temp files
 #    bmake clobber - clean all
 #
+# Historic Note:
+#  this used to contain only rules to make with borland 
+#    (called via bmake, by "make.exe -f bc.mak")
+#  this has changed; it is now also possible to build using microsoft visual c
+#    (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
 #
 TOP=..\..\..\stx
 INCLUDE_TOP=$(TOP)\..
@@ -31,7 +37,7 @@
 LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\smaCC -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic3
 LOCALDEFINES=
 
-STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
+STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
 LOCALLIBS=
 
 OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
@@ -48,13 +54,17 @@
 	pushd ..\..\..\stx\goodies\refactoryBrowser\helpers & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\stx\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\stx\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\stx\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\..\stx\goodies\refactoryBrowser\changes & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\stx\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\stx\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\stx\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	pushd ..\..\..\stx\goodies\refactoryBrowser\changes & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\..\stx\goodies\smaCC & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -63,6 +73,7 @@
 
 
 
+
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 $(OUTDIR)Cface__CDefinitionParser.$(O) Cface__CDefinitionParser.$(H): Cface__CDefinitionParser.st $(INCLUDE_TOP)\stx\goodies\smaCC\SmaCC__SmaCCParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Cface__CDefinitionScanner.$(O) Cface__CDefinitionScanner.$(H): Cface__CDefinitionScanner.st $(INCLUDE_TOP)\stx\goodies\smaCC\SmaCC__SmaCCScanner.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)

--- a/bmake.bat	Mon Jul 18 16:13:22 2011 +0000
+++ b/bmake.bat	Wed May 30 19:55:53 2012 +0000
@@ -3,6 +3,6 @@
 @REM type bmake, and wait...
 @REM do not edit - automatically generated from ProjectDefinition
 @REM -------
-make.exe -N -f bc.mak %1 %2
+make.exe -N -f bc.mak %*
 
 

--- a/cface.rc	Mon Jul 18 16:13:22 2011 +0000
+++ b/cface.rc	Wed May 30 19:55:53 2012 +0000
@@ -3,13 +3,15 @@
 // automagically generated from the projectDefinition: cvut_fel_cface.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,17,17
+  FILEVERSION     6,2,19,19
   PRODUCTVERSION  6,2,1,1
+#if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
   FILEFLAGS       VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
   FILEOS          VOS_NT_WINDOWS32
   FILETYPE        VFT_DLL
   FILESUBTYPE     VS_USER_DEFINED
+#endif
 
 BEGIN
   BLOCK "StringFileInfo"
@@ -18,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "CVUT FEL\0"
       VALUE "FileDescription", "Cairo graphics binding (LIB)\0"
-      VALUE "FileVersion", "6.2.17.17\0"
+      VALUE "FileVersion", "6.2.19.19\0"
       VALUE "InternalName", "cvut:fel/cface\0"
       VALUE "LegalCopyright", "Copyright 2008 Jan Vrany\0"
       VALUE "ProductName", "CairoGraphics\0"
       VALUE "ProductVersion", "6.2.1.1\0"
-      VALUE "ProductDate", "Mon, 18 Jul 2011 16:13:45 GMT\0"
+      VALUE "ProductDate", "Wed, 30 May 2012 19:57:33 GMT\0"
     END
 
   END

--- a/extensions.st	Mon Jul 18 16:13:22 2011 +0000
+++ b/extensions.st	Wed May 30 19:55:53 2012 +0000
@@ -1,6 +1,4 @@
-"{ Package: 'cvut:fel/cface' }"
-
-!
+"{ Package: 'cvut:fel/cface' }"!
 
 !ClassDefinitionChange methodsFor:'accessing'!
 
@@ -10,3 +8,9 @@
     "Created: / 22-01-2009 / 19:19:57 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 18-07-2011 / 17:06:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
+
+!cvut_fel_cface class methodsFor:'documentation'!
+
+extensionsVersion_SVN
+    ^ '$Id::                                                                                                                        $'
+! !
\ No newline at end of file

--- a/vcmake.bat	Mon Jul 18 16:13:22 2011 +0000
+++ b/vcmake.bat	Wed May 30 19:55:53 2012 +0000
@@ -3,6 +3,10 @@
 @REM type vcmake, and wait...
 @REM do not edit - automatically generated from ProjectDefinition
 @REM -------
-make.exe -N -f bc.mak -DUSEVC %1 %2
+
+@if not defined VSINSTALLDIR (
+	call "C:\Program Files\Microsoft Visual Studio 10.0"\VC\bin\vcvars32.bat
+)
+make.exe -N -f bc.mak -DUSEVC %*