Renamed CUserDefinedTypeNode to CUnresolvedTypeNode.
This is a preparation for new resolving code.
--- a/Cface__CDefinitionParser.st Mon Jul 06 22:21:35 2015 +0100
+++ b/Cface__CDefinitionParser.st Mon Jul 06 22:28:52 2015 +0100
@@ -1160,7 +1160,7 @@
!
reduceActionForType9:nodes
- ^ CUserDefinedTypeNode new cName:(nodes at:1) value
+ ^ CUnresolvedTypeNode new cName:(nodes at:1) value
!
reduceActionForTypedef1:nodes
--- a/Cface__CNodeVisitor.st Mon Jul 06 22:21:35 2015 +0100
+++ b/Cface__CNodeVisitor.st Mon Jul 06 22:28:52 2015 +0100
@@ -203,6 +203,10 @@
"Created: / 12-02-2008 / 22:14:55 / janfrog"
!
+visitCUnresolvedTypeNode:anObject
+ "Created: / 12-02-2008 / 23:00:03 / janfrog"
+!
+
visitCUnsignedNode:anObject
self visit: anObject type
@@ -210,11 +214,6 @@
"Created: / 12-02-2008 / 23:00:26 / janfrog"
!
-visitCUserDefinedTypeNode:anObject
-
- "Created: / 12-02-2008 / 23:00:03 / janfrog"
-!
-
visitCVoidNode:anObject
"Created: / 12-02-2008 / 22:14:55 / janfrog"
@@ -244,3 +243,4 @@
version_SVN
^ '$Id$'
! !
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Cface__CUnresolvedTypeNode.st Mon Jul 06 22:28:52 2015 +0100
@@ -0,0 +1,205 @@
+"{ Package: 'jv:cface' }"
+
+"{ NameSpace: Cface }"
+
+CTypeNode subclass:#CUnresolvedTypeNode
+ instanceVariableNames:'type'
+ classVariableNames:''
+ poolDictionaries:''
+ category:'Cface-C AST'
+!
+
+!CUnresolvedTypeNode class methodsFor:'documentation'!
+
+history
+
+ "Created: / 25-10-2007 / 17:44:38 / haja"
+ "Created: #name / 25-10-2007 / 17:44:44 / haja"
+ "Created: #name: / 25-10-2007 / 17:44:44 / haja"
+ "Created: #id / 25-10-2007 / 17:44:44 / haja"
+ "Created: #id: / 25-10-2007 / 17:44:44 / haja"
+ "Created: #acceptVisitor: / 02-11-2007 / 10:45:15 / haja"
+ "Created: #name:id: / 02-11-2007 / 13:50:44 / haja"
+ "Deleted: #id / 02-11-2007 / 13:50:50 / haja"
+ "Deleted: #id: / 02-11-2007 / 13:50:50 / haja"
+ "Deleted: #name / 02-11-2007 / 13:50:50 / haja"
+ "Deleted: #name: / 02-11-2007 / 13:50:50 / haja"
+ "Created: #names / 02-11-2007 / 13:51:15 / haja"
+ "Created: #reference / 02-11-2007 / 13:51:15 / haja"
+ "Created: #reference: / 02-11-2007 / 13:51:15 / haja"
+ "Created: #names: / 02-11-2007 / 13:52:13 / haja"
+ "Deleted: #name:id: / 02-11-2007 / 13:52:15 / haja"
+ "Created: #acceptNameVisitor: / 05-11-2007 / 17:34:09 / haja"
+ "Deleted: #acceptNameVisitor: / 12-11-2007 / 09:46:54 / haja"
+ "Created: #buildTypeCheckFor:on: / 19-12-2007 / 15:24:03 / haja"
+ "Created: #checkFundamentalType: / 19-12-2007 / 15:26:44 / haja"
+ "Created: #checkDefinedType: / 19-12-2007 / 15:27:03 / haja"
+ "Created: #fundamentalTypes / 19-12-2007 / 15:28:32 / haja"
+ "Created: #buildTypeCheckForFundamentalType:on: / 19-12-2007 / 15:31:42 / haja"
+ "Created: #buildTypeCheckForDefinedType:on: / 19-12-2007 / 15:31:52 / haja"
+ "Deleted: #checkDefinedType: / 19-12-2007 / 15:34:33 / haja"
+ "Deleted: #checkFundamentalType: / 19-12-2007 / 15:34:35 / haja"
+ "Created: #buildObjectCreationOn: / 19-12-2007 / 16:34:44 / haja"
+ "Created: #buildObjectCreationFundamentalTypeOn: / 19-12-2007 / 16:35:39 / haja"
+ "Created: #buildObjectCreationOnDefinedTypeOn: / 19-12-2007 / 16:36:11 / haja"
+ "Created: #buildValueExtractionFor:on: / 19-12-2007 / 17:26:12 / haja"
+ "Created: #buildValueExtractionForDefinedType:on: / 19-12-2007 / 17:26:43 / haja"
+ "Created: #buildValueExtractionForFundamentalType:on: / 19-12-2007 / 17:26:57 / haja"
+ "Created: #buildObjectCreationFor:on: / 19-12-2007 / 17:40:07 / haja"
+ "Created: #buildObjectCreationFundamentalTypeFor:on: / 19-12-2007 / 17:40:14 / haja"
+ "Created: #buildObjectCreationOnDefinedTypeFor:on: / 19-12-2007 / 17:40:23 / haja"
+ "Deleted: #buildObjectCreationOnDefinedTypeFor:on: / 19-12-2007 / 17:40:46 / haja"
+ "Created: #buildObjectCreationDefinedTypeFor:on: / 19-12-2007 / 17:42:08 / haja"
+ "Deleted: #buildObjectCreationFundamentalTypeOn: / 19-12-2007 / 17:42:14 / haja"
+ "Deleted: #buildObjectCreationOn: / 19-12-2007 / 17:42:15 / haja"
+ "Deleted: #buildObjectCreationOnDefinedTypeOn: / 19-12-2007 / 17:42:16 / haja"
+ "Created: #buildCTypeOn: / 19-12-2007 / 18:13:30 / haja"
+ "Created: #buildTypeDescriptionOn: / 20-12-2007 / 12:11:52 / haja"
+! !
+
+!CUnresolvedTypeNode class methodsFor:'instance creation'!
+
+names:aNames
+
+ | anIdNode |
+
+ anIdNode := self new.
+ anIdNode names:aNames.
+
+ ^anIdNode
+
+ "Created: / 02-11-2007 / 13:52:13 / haja"
+! !
+
+!CUnresolvedTypeNode methodsFor:'accessing'!
+
+cByteSize
+
+ ^type cByteSize
+
+ "Created: / 09-07-2008 / 19:39:45 / Jan Vrany <vranyj1@fel.cvut.cz>"
+!
+
+ffiTypeSymbol
+ "Superclass Cface::CTypeNode says that I am responsible to implement this method"
+
+ ^type ffiTypeSymbol
+
+ "Created: / 03-07-2008 / 22:55:48 / Jan Vrany <vranyj1@fel.cvut.cz>"
+!
+
+type
+ ^ type
+
+ "Created: / 12-02-2008 / 23:21:13 / janfrog"
+!
+
+type:something
+ type := something.
+
+ "Created: / 12-02-2008 / 23:21:13 / janfrog"
+! !
+
+!CUnresolvedTypeNode methodsFor:'converting'!
+
+resolved
+ type
+ ifNil:[ self error:'User defined type ' , cName , ' not yet resolved' ].
+ ^ type
+
+ "Created: / 17-02-2008 / 17:56:03 / janfrog"
+ "Modified: / 09-07-2008 / 19:51:28 / Jan Vrany <vranyj1@fel.cvut.cz>"
+! !
+
+!CUnresolvedTypeNode methodsFor:'printing'!
+
+printOn: stream indent: level
+
+ stream nextPutAll: cName
+
+ "Created: / 17-02-2008 / 18:18:11 / janfrog"
+! !
+
+!CUnresolvedTypeNode methodsFor:'private'!
+
+fundamentalTypes
+
+"
+Possible combinations:
+
+char
+signed char
+unsigned char
+
+int, signed int
+short int, short, signed short int, signed short
+long int, long, signed long int,signed long
+
+unsigned int, unsigned
+unsigned short int, unsigned short
+unsigned long int, unsigned long
+
+float
+double
+long double
+"
+
+ ^#('char' 'short' 'int' 'long' 'float' 'double' 'void' 'signed' 'unsigned').
+
+ "Created: / 19-12-2007 / 15:28:32 / haja"
+! !
+
+!CUnresolvedTypeNode methodsFor:'testing'!
+
+isCEnumNode
+ ^ type isCEnumNode
+
+ "Created: / 06-07-2015 / 17:37:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+isCPointerToCStructure
+ ^type isCPointerToCStructure
+
+ "Created: / 06-07-2015 / 17:38:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+isCStructNode
+ ^ type isCStructNode
+
+ "Created: / 06-07-2015 / 17:37:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+isCUnionNode
+ ^ type isCUnionNode
+
+ "Created: / 06-07-2015 / 17:38:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+isCUserDefinedTypeNode
+ ^ true
+! !
+
+!CUnresolvedTypeNode methodsFor:'visiting'!
+
+acceptVisitor:aVisitor
+ "Double dispatch back to the visitor, passing my type encoded in
+ the selector (visitor pattern)"
+
+ "stub code automatically generated - please change if required"
+
+ ^ aVisitor visitCUnresolvedTypeNode:self
+
+ "Created: / 02-11-2007 / 13:50:44 / haja"
+ "Modified: / 12-02-2008 / 22:59:33 / janfrog"
+! !
+
+!CUnresolvedTypeNode class methodsFor:'documentation'!
+
+version
+ ^ '$Id$'
+!
+
+version_SVN
+ ^ '$Id$'
+! !
+
--- a/Cface__CUserDefinedTypeNode.st Mon Jul 06 22:21:35 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +0,0 @@
-"{ Package: 'jv:cface' }"
-
-"{ NameSpace: Cface }"
-
-CTypeNode subclass:#CUserDefinedTypeNode
- instanceVariableNames:'type'
- classVariableNames:''
- poolDictionaries:''
- category:'Cface-C AST'
-!
-
-!CUserDefinedTypeNode class methodsFor:'documentation'!
-
-history
-
- "Created: / 25-10-2007 / 17:44:38 / haja"
- "Created: #name / 25-10-2007 / 17:44:44 / haja"
- "Created: #name: / 25-10-2007 / 17:44:44 / haja"
- "Created: #id / 25-10-2007 / 17:44:44 / haja"
- "Created: #id: / 25-10-2007 / 17:44:44 / haja"
- "Created: #acceptVisitor: / 02-11-2007 / 10:45:15 / haja"
- "Created: #name:id: / 02-11-2007 / 13:50:44 / haja"
- "Deleted: #id / 02-11-2007 / 13:50:50 / haja"
- "Deleted: #id: / 02-11-2007 / 13:50:50 / haja"
- "Deleted: #name / 02-11-2007 / 13:50:50 / haja"
- "Deleted: #name: / 02-11-2007 / 13:50:50 / haja"
- "Created: #names / 02-11-2007 / 13:51:15 / haja"
- "Created: #reference / 02-11-2007 / 13:51:15 / haja"
- "Created: #reference: / 02-11-2007 / 13:51:15 / haja"
- "Created: #names: / 02-11-2007 / 13:52:13 / haja"
- "Deleted: #name:id: / 02-11-2007 / 13:52:15 / haja"
- "Created: #acceptNameVisitor: / 05-11-2007 / 17:34:09 / haja"
- "Deleted: #acceptNameVisitor: / 12-11-2007 / 09:46:54 / haja"
- "Created: #buildTypeCheckFor:on: / 19-12-2007 / 15:24:03 / haja"
- "Created: #checkFundamentalType: / 19-12-2007 / 15:26:44 / haja"
- "Created: #checkDefinedType: / 19-12-2007 / 15:27:03 / haja"
- "Created: #fundamentalTypes / 19-12-2007 / 15:28:32 / haja"
- "Created: #buildTypeCheckForFundamentalType:on: / 19-12-2007 / 15:31:42 / haja"
- "Created: #buildTypeCheckForDefinedType:on: / 19-12-2007 / 15:31:52 / haja"
- "Deleted: #checkDefinedType: / 19-12-2007 / 15:34:33 / haja"
- "Deleted: #checkFundamentalType: / 19-12-2007 / 15:34:35 / haja"
- "Created: #buildObjectCreationOn: / 19-12-2007 / 16:34:44 / haja"
- "Created: #buildObjectCreationFundamentalTypeOn: / 19-12-2007 / 16:35:39 / haja"
- "Created: #buildObjectCreationOnDefinedTypeOn: / 19-12-2007 / 16:36:11 / haja"
- "Created: #buildValueExtractionFor:on: / 19-12-2007 / 17:26:12 / haja"
- "Created: #buildValueExtractionForDefinedType:on: / 19-12-2007 / 17:26:43 / haja"
- "Created: #buildValueExtractionForFundamentalType:on: / 19-12-2007 / 17:26:57 / haja"
- "Created: #buildObjectCreationFor:on: / 19-12-2007 / 17:40:07 / haja"
- "Created: #buildObjectCreationFundamentalTypeFor:on: / 19-12-2007 / 17:40:14 / haja"
- "Created: #buildObjectCreationOnDefinedTypeFor:on: / 19-12-2007 / 17:40:23 / haja"
- "Deleted: #buildObjectCreationOnDefinedTypeFor:on: / 19-12-2007 / 17:40:46 / haja"
- "Created: #buildObjectCreationDefinedTypeFor:on: / 19-12-2007 / 17:42:08 / haja"
- "Deleted: #buildObjectCreationFundamentalTypeOn: / 19-12-2007 / 17:42:14 / haja"
- "Deleted: #buildObjectCreationOn: / 19-12-2007 / 17:42:15 / haja"
- "Deleted: #buildObjectCreationOnDefinedTypeOn: / 19-12-2007 / 17:42:16 / haja"
- "Created: #buildCTypeOn: / 19-12-2007 / 18:13:30 / haja"
- "Created: #buildTypeDescriptionOn: / 20-12-2007 / 12:11:52 / haja"
-! !
-
-!CUserDefinedTypeNode class methodsFor:'instance creation'!
-
-names:aNames
-
- | anIdNode |
-
- anIdNode := self new.
- anIdNode names:aNames.
-
- ^anIdNode
-
- "Created: / 02-11-2007 / 13:52:13 / haja"
-! !
-
-!CUserDefinedTypeNode methodsFor:'accessing'!
-
-cByteSize
-
- ^type cByteSize
-
- "Created: / 09-07-2008 / 19:39:45 / Jan Vrany <vranyj1@fel.cvut.cz>"
-!
-
-ffiTypeSymbol
- "Superclass Cface::CTypeNode says that I am responsible to implement this method"
-
- ^type ffiTypeSymbol
-
- "Created: / 03-07-2008 / 22:55:48 / Jan Vrany <vranyj1@fel.cvut.cz>"
-!
-
-type
- ^ type
-
- "Created: / 12-02-2008 / 23:21:13 / janfrog"
-!
-
-type:something
- type := something.
-
- "Created: / 12-02-2008 / 23:21:13 / janfrog"
-! !
-
-!CUserDefinedTypeNode methodsFor:'converting'!
-
-resolved
- type
- ifNil:[ self error:'User defined type ' , cName , ' not yet resolved' ].
- ^ type
-
- "Created: / 17-02-2008 / 17:56:03 / janfrog"
- "Modified: / 09-07-2008 / 19:51:28 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
-!CUserDefinedTypeNode methodsFor:'printing'!
-
-printOn: stream indent: level
-
- stream nextPutAll: cName
-
- "Created: / 17-02-2008 / 18:18:11 / janfrog"
-! !
-
-!CUserDefinedTypeNode methodsFor:'private'!
-
-fundamentalTypes
-
-"
-Possible combinations:
-
-char
-signed char
-unsigned char
-
-int, signed int
-short int, short, signed short int, signed short
-long int, long, signed long int,signed long
-
-unsigned int, unsigned
-unsigned short int, unsigned short
-unsigned long int, unsigned long
-
-float
-double
-long double
-"
-
- ^#('char' 'short' 'int' 'long' 'float' 'double' 'void' 'signed' 'unsigned').
-
- "Created: / 19-12-2007 / 15:28:32 / haja"
-! !
-
-!CUserDefinedTypeNode methodsFor:'testing'!
-
-isCEnumNode
- ^ type isCEnumNode
-
- "Created: / 06-07-2015 / 17:37:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-isCPointerToCStructure
- ^type isCPointerToCStructure
-
- "Created: / 06-07-2015 / 17:38:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-isCStructNode
- ^ type isCStructNode
-
- "Created: / 06-07-2015 / 17:37:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-isCUnionNode
- ^ type isCUnionNode
-
- "Created: / 06-07-2015 / 17:38:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-isCUserDefinedTypeNode
- ^ true
-! !
-
-!CUserDefinedTypeNode methodsFor:'visiting'!
-
-acceptVisitor:aVisitor
- "Double dispatch back to the visitor, passing my type encoded in
- the selector (visitor pattern)"
-
- "stub code automatically generated - please change if required"
-
- ^ aVisitor visitCUserDefinedTypeNode:self
-
- "Created: / 02-11-2007 / 13:50:44 / haja"
- "Modified: / 12-02-2008 / 22:59:33 / janfrog"
-! !
-
-!CUserDefinedTypeNode class methodsFor:'documentation'!
-
-version
- ^ '$Id$'
-!
-
-version_SVN
- ^ '$Id$'
-! !
-
--- a/Cface__TypeResolver.st Mon Jul 06 22:21:35 2015 +0100
+++ b/Cface__TypeResolver.st Mon Jul 06 22:28:52 2015 +0100
@@ -53,21 +53,22 @@
"Created: / 05-09-2012 / 11:37:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-visitCUserDefinedTypeNode: anObject
+visitCUnresolvedTypeNode:anObject
"/thisContext isRecursive ifTrue:[^self].
-
+
anObject type isNil ifTrue:[
- |type|
+ | type |
- type := (typeMap at: anObject cName ifAbsent:[CPointerNode new type: CVoidNode new]).
- self visit: type.
- anObject type: type
+ type := (typeMap at:anObject cName ifAbsent:[ CPointerNode new type:CVoidNode new ]).
+ self visit:type.
+ anObject type:type
]
"Created: / 12-02-2008 / 23:45:17 / janfrog"
"Modified: / 17-02-2008 / 18:30:56 / janfrog"
"Modified: / 09-07-2008 / 20:53:13 / Jan Vrany <vranyj1@fel.cvut.cz>"
"Modified: / 06-07-2015 / 08:01:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (format): / 06-07-2015 / 22:25:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!TypeResolver class methodsFor:'documentation'!
--- a/Make.proto Mon Jul 06 22:21:35 2015 +0100
+++ b/Make.proto Mon Jul 06 22:28:52 2015 +0100
@@ -182,7 +182,7 @@
$(OUTDIR)Cface__CBuiltinNode.$(O) Cface__CBuiltinNode.$(H): Cface__CBuiltinNode.st $(INCLUDE_TOP)/jv/cface/Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CTypeNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Cface__CDerivedTypeNode.$(O) Cface__CDerivedTypeNode.$(H): Cface__CDerivedTypeNode.st $(INCLUDE_TOP)/jv/cface/Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CTypeNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Cface__CPointerNode.$(O) Cface__CPointerNode.$(H): Cface__CPointerNode.st $(INCLUDE_TOP)/jv/cface/Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CTypeNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)Cface__CUserDefinedTypeNode.$(O) Cface__CUserDefinedTypeNode.$(H): Cface__CUserDefinedTypeNode.st $(INCLUDE_TOP)/jv/cface/Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CTypeNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)Cface__CUnresolvedTypeNode.$(O) Cface__CUnresolvedTypeNode.$(H): Cface__CUnresolvedTypeNode.st $(INCLUDE_TOP)/jv/cface/Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CTypeNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Cface__CCharNode.$(O) Cface__CCharNode.$(H): Cface__CCharNode.st $(INCLUDE_TOP)/jv/cface/Cface__CBuiltinNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CTypeNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Cface__CDoubleNode.$(O) Cface__CDoubleNode.$(H): Cface__CDoubleNode.st $(INCLUDE_TOP)/jv/cface/Cface__CBuiltinNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CTypeNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Cface__CEnumNode.$(O) Cface__CEnumNode.$(H): Cface__CEnumNode.st $(INCLUDE_TOP)/jv/cface/Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CDerivedTypeNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CNode.$(H) $(INCLUDE_TOP)/jv/cface/Cface__CTypeNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/Make.spec Mon Jul 06 22:21:35 2015 +0100
+++ b/Make.spec Mon Jul 06 22:28:52 2015 +0100
@@ -86,7 +86,7 @@
Cface::CBuiltinNode \
Cface::CDerivedTypeNode \
Cface::CPointerNode \
- Cface::CUserDefinedTypeNode \
+ Cface::CUnresolvedTypeNode \
Cface::CCharNode \
Cface::CDoubleNode \
Cface::CEnumNode \
@@ -139,7 +139,7 @@
$(OUTDIR_SLASH)Cface__CBuiltinNode.$(O) \
$(OUTDIR_SLASH)Cface__CDerivedTypeNode.$(O) \
$(OUTDIR_SLASH)Cface__CPointerNode.$(O) \
- $(OUTDIR_SLASH)Cface__CUserDefinedTypeNode.$(O) \
+ $(OUTDIR_SLASH)Cface__CUnresolvedTypeNode.$(O) \
$(OUTDIR_SLASH)Cface__CCharNode.$(O) \
$(OUTDIR_SLASH)Cface__CDoubleNode.$(O) \
$(OUTDIR_SLASH)Cface__CEnumNode.$(O) \
--- a/abbrev.stc Mon Jul 06 22:21:35 2015 +0100
+++ b/abbrev.stc Mon Jul 06 22:28:52 2015 +0100
@@ -37,7 +37,7 @@
Cface::CDerivedTypeNode Cface__CDerivedTypeNode jv:cface 'Cface-C AST' 0
Cface::CPointerNode Cface__CPointerNode jv:cface 'Cface-C AST' 0
Cface::CTypedefNode Cface__CTypedefNode jv:cface 'Cface-C AST' 0
-Cface::CUserDefinedTypeNode Cface__CUserDefinedTypeNode jv:cface 'Cface-C AST' 0
+Cface::CUnresolvedTypeNode Cface__CUnresolvedTypeNode jv:cface 'Cface-C AST' 0
Cface::CCharNode Cface__CCharNode jv:cface 'Cface-C AST' 0
Cface::CDoubleNode Cface__CDoubleNode jv:cface 'Cface-C AST' 0
Cface::CEnumNode Cface__CEnumNode jv:cface 'Cface-C AST' 0
--- a/bc.mak Mon Jul 06 22:21:35 2015 +0100
+++ b/bc.mak Mon Jul 06 22:28:52 2015 +0100
@@ -107,7 +107,7 @@
$(OUTDIR)Cface__CBuiltinNode.$(O) Cface__CBuiltinNode.$(H): Cface__CBuiltinNode.st $(INCLUDE_TOP)\jv\cface\Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CTypeNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Cface__CDerivedTypeNode.$(O) Cface__CDerivedTypeNode.$(H): Cface__CDerivedTypeNode.st $(INCLUDE_TOP)\jv\cface\Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CTypeNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Cface__CPointerNode.$(O) Cface__CPointerNode.$(H): Cface__CPointerNode.st $(INCLUDE_TOP)\jv\cface\Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CTypeNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Cface__CUserDefinedTypeNode.$(O) Cface__CUserDefinedTypeNode.$(H): Cface__CUserDefinedTypeNode.st $(INCLUDE_TOP)\jv\cface\Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CTypeNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)Cface__CUnresolvedTypeNode.$(O) Cface__CUnresolvedTypeNode.$(H): Cface__CUnresolvedTypeNode.st $(INCLUDE_TOP)\jv\cface\Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CTypeNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Cface__CCharNode.$(O) Cface__CCharNode.$(H): Cface__CCharNode.st $(INCLUDE_TOP)\jv\cface\Cface__CBuiltinNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CTypeNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Cface__CDoubleNode.$(O) Cface__CDoubleNode.$(H): Cface__CDoubleNode.st $(INCLUDE_TOP)\jv\cface\Cface__CBuiltinNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CTypeNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Cface__CEnumNode.$(O) Cface__CEnumNode.$(H): Cface__CEnumNode.st $(INCLUDE_TOP)\jv\cface\Cface__CDefinitionNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CDerivedTypeNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CNode.$(H) $(INCLUDE_TOP)\jv\cface\Cface__CTypeNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/jv_cface.st Mon Jul 06 22:21:35 2015 +0100
+++ b/jv_cface.st Mon Jul 06 22:28:52 2015 +0100
@@ -1,5 +1,7 @@
"{ Package: 'jv:cface' }"
+"{ NameSpace: Smalltalk }"
+
LibraryDefinition subclass:#jv_cface
instanceVariableNames:''
classVariableNames:''
@@ -68,58 +70,55 @@
Each entry in the list may be: a single class-name (symbol),
or an array-literal consisting of class name and attributes.
Attributes are: #autoload or #<os> where os is one of win32, unix,..."
-
- ^ #(
- "<className> or (<className> attributes...) in load order"
- #'Cface::CDefinitionParser'
- #'Cface::CDefinitionScanner'
- #'Cface::CNode'
- #'Cface::CNodeVisitor'
- #'Cface::GeneratorCommand'
- #'Cface::Platform'
- #'Cface::TypeMapping'
- #'jv_cface'
- #'Cface::CDefinitionNode'
- #'Cface::CModifierNode'
- #'Cface::CNoNode'
- #'Cface::CairoMapping'
- #'Cface::GTKMapping'
- #'Cface::Generator'
- #'Cface::Libgit2Mapping'
- #'Cface::SVNMapping'
- #'Cface::SmalltalkX'
- #'Cface::TypeCollector'
- #'Cface::TypeMapper'
- #'Cface::TypeResolver'
- #'Cface::CArgumentNode'
- #'Cface::CConstNode'
- #'Cface::CDefinitionFileNode'
- #'Cface::CEnumValueNode'
- #'Cface::CFunctionNode'
- #'Cface::CLongNode'
- #'Cface::CShortNode'
- #'Cface::CStructFieldNode'
- #'Cface::CTypeNode'
- #'Cface::CUnsignedNode'
- #'Cface::SmalltalkXGenerator'
- #'Cface::CArrayNode'
- #'Cface::CBuiltinNode'
- #'Cface::CDerivedTypeNode'
- #'Cface::CPointerNode'
- #'Cface::CTypedefNode'
- #'Cface::CUserDefinedTypeNode'
- #'Cface::CCharNode'
- #'Cface::CDoubleNode'
- #'Cface::CEnumNode'
- #'Cface::CFloatNode'
- #'Cface::CFunctionTypeNode'
- #'Cface::CIntNode'
- #'Cface::CStructuredNode'
- #'Cface::CVoidNode'
- #'Cface::CWCharNode'
- #'Cface::CStructNode'
- #'Cface::CUnionNode'
- )
+
+ ^ "<className> or (<className> attributes...) in load order" #( #'Cface::CDefinitionParser'
+ #'Cface::CDefinitionScanner'
+ #'Cface::CNode'
+ #'Cface::CNodeVisitor'
+ #'Cface::GeneratorCommand'
+ #'Cface::Platform'
+ #'Cface::TypeMapping'
+ #'jv_cface'
+ #'Cface::CDefinitionNode'
+ #'Cface::CModifierNode'
+ #'Cface::CNoNode'
+ #'Cface::CairoMapping'
+ #'Cface::GTKMapping'
+ #'Cface::Generator'
+ #'Cface::Libgit2Mapping'
+ #'Cface::SVNMapping'
+ #'Cface::SmalltalkX'
+ #'Cface::TypeCollector'
+ #'Cface::TypeMapper'
+ #'Cface::TypeResolver'
+ #'Cface::CArgumentNode'
+ #'Cface::CConstNode'
+ #'Cface::CDefinitionFileNode'
+ #'Cface::CEnumValueNode'
+ #'Cface::CFunctionNode'
+ #'Cface::CLongNode'
+ #'Cface::CShortNode'
+ #'Cface::CStructFieldNode'
+ #'Cface::CTypeNode'
+ #'Cface::CUnsignedNode'
+ #'Cface::SmalltalkXGenerator'
+ #'Cface::CArrayNode'
+ #'Cface::CBuiltinNode'
+ #'Cface::CDerivedTypeNode'
+ #'Cface::CPointerNode'
+ #'Cface::CTypedefNode'
+ #'Cface::CUnresolvedTypeNode'
+ #'Cface::CCharNode'
+ #'Cface::CDoubleNode'
+ #'Cface::CEnumNode'
+ #'Cface::CFloatNode'
+ #'Cface::CFunctionTypeNode'
+ #'Cface::CIntNode'
+ #'Cface::CStructuredNode'
+ #'Cface::CVoidNode'
+ #'Cface::CWCharNode'
+ #'Cface::CStructNode'
+ #'Cface::CUnionNode' )
!
extensionMethodNames
--- a/libInit.cc Mon Jul 06 22:21:35 2015 +0100
+++ b/libInit.cc Mon Jul 06 22:28:52 2015 +0100
@@ -62,7 +62,7 @@
_Cface__CBuiltinNode_Init(pass,__pRT__,snd);
_Cface__CDerivedTypeNode_Init(pass,__pRT__,snd);
_Cface__CPointerNode_Init(pass,__pRT__,snd);
-_Cface__CUserDefinedTypeNode_Init(pass,__pRT__,snd);
+_Cface__CUnresolvedTypeNode_Init(pass,__pRT__,snd);
_Cface__CCharNode_Init(pass,__pRT__,snd);
_Cface__CDoubleNode_Init(pass,__pRT__,snd);
_Cface__CEnumNode_Init(pass,__pRT__,snd);