Mercurial Mercurial > hg > stx-libbasic3 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 13 Apr 2012 13:37:41 +0100
branchjv
changeset 3049 b920db5cdeb3
parent 3048 d36a2f8da02a
child 3050 dd9d607b0c20
ChangeSet::ClassSourceWriter fixed to correctly fileout primitive definitions
ChangeSet.st file | annotate | diff | comparison | revisions
Make.proto file | annotate | diff | comparison | revisions
Make.spec file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
libbasic3.rc file | annotate | diff | comparison | revisions 
--- a/ChangeSet.st	Thu Apr 12 18:19:04 2012 +0100
+++ b/ChangeSet.st	Fri Apr 13 13:37:41 2012 +0100
@@ -43,7 +43,8 @@
 !
 
 Object subclass:#ClassInfo
-	instanceVariableNames:'name superclass definition methods methodDictionary namespace'
+	instanceVariableNames:'name superclass definition methods methodDictionary namespace
+		primitiveDefinitions primitiveVariables primitiveFunctions'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:ChangeSet::ClassSourceWriter
@@ -3180,9 +3181,32 @@
     "Created: / 20-03-2012 / 22:33:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-fileOutPrimitiveSpecsOf: nonMeta on:outStream
-
-    "Nothing now..."
+fileOutPrimitiveSpecsOf: nonMeta on:aStream
+    "append primitive defs (if any) to aStream."
+
+    |s|
+
+    "
+     primitive definitions - if any
+    "
+    (s := nonMeta primitiveDefinitionsString) notNil ifTrue:[
+        aStream nextPutChunkSeparator.
+        nonMeta printClassNameOn:aStream.
+        aStream nextPutAll:' primitiveDefinitions';
+                nextPutChunkSeparator;
+                cr.
+        aStream nextPutAll:s.
+        aStream nextPutChunkSeparator; space; nextPutChunkSeparator; cr; cr
+    ].
+    (s := nonMeta primitiveVariablesString) notNil ifTrue:[
+        aStream nextPutChunkSeparator.
+        nonMeta printClassNameOn:aStream.
+        aStream nextPutAll:' primitiveVariables';
+                nextPutChunkSeparator;
+                cr.
+        aStream nextPutAll:s.
+        aStream nextPutChunkSeparator; space; nextPutChunkSeparator; cr; cr
+    ].
 
     "Created: / 15-03-2012 / 19:48:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -3285,6 +3309,42 @@
     namespace := aString.
 !
 
+primitiveDefinitions
+    ^ primitiveDefinitions
+!
+
+primitiveDefinitionsString
+    ^ primitiveDefinitions isNil 
+        ifTrue:[nil]
+        ifFalse:[primitiveDefinitions source]
+
+    "Created: / 13-04-2012 / 13:14:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+primitiveFunctions
+    ^ primitiveFunctions
+!
+
+primitiveFunctionsString
+    ^ primitiveFunctions isNil 
+        ifTrue:[nil]
+        ifFalse:[primitiveFunctions source]
+
+    "Created: / 13-04-2012 / 13:15:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+primitiveVariables
+    ^ primitiveVariables
+!
+
+primitiveVariablesString
+    ^ primitiveVariables isNil 
+        ifTrue:[nil]
+        ifFalse:[primitiveVariables source]
+
+    "Created: / 13-04-2012 / 13:15:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 selectorAtMethod: m
     ^m selector
 
@@ -3323,6 +3383,21 @@
         ^self
     ].
 
+    change isPrimitiveDefinitionsChange ifTrue:[
+        primitiveDefinitions := change.
+        ^self
+    ].
+
+    change isPrimitiveVariablesChange ifTrue:[
+        primitiveVariables := change.
+        ^self
+    ].
+
+    change isPrimitiveFunctionsChange ifTrue:[
+        primitiveFunctions := change.
+        ^self
+    ].
+
     self error: 'Unknown change'
 
     "Created: / 15-03-2012 / 19:12:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3811,5 +3886,5 @@
 !
 
 version_SVN
-    ^ '$Id: ChangeSet.st 1910 2012-04-03 12:29:20Z vranyj1 $'
+    ^ '$Id: ChangeSet.st 1918 2012-04-13 12:37:41Z vranyj1 $'
 ! !
--- a/Make.proto	Thu Apr 12 18:19:04 2012 +0100
+++ b/Make.proto	Fri Apr 13 13:37:41 2012 +0100
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libbasic3 at 2012-04-11 17:08:30.078.
+# automagically generated from the projectDefinition: stx_libbasic3.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -129,7 +129,7 @@
 $(OUTDIR)Change.$(O) Change.$(H): Change.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ChangeDeltaInformation.$(O) ChangeDeltaInformation.$(H): ChangeDeltaInformation.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ChangeNotificationParameter.$(O) ChangeNotificationParameter.$(H): ChangeNotificationParameter.st $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ChangeSet.$(O) ChangeSet.$(H): ChangeSet.st $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SmalltalkChunkFileSourceWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(STCHDR)
+$(OUTDIR)ChangeSet.$(O) ChangeSet.$(H): ChangeSet.st $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/SmalltalkChunkFileSourceWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/AbstractSourceFileWriter.$(H) $(STCHDR)
 $(OUTDIR)ChangeSetDiff.$(O) ChangeSetDiff.$(H): ChangeSetDiff.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ChangeSetDiffComponent.$(O) ChangeSetDiffComponent.$(H): ChangeSetDiffComponent.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ClassOrganizer.$(O) ClassOrganizer.$(H): ClassOrganizer.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/Make.spec	Thu Apr 12 18:19:04 2012 +0100
+++ b/Make.spec	Fri Apr 13 13:37:41 2012 +0100
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libbasic3 at 2012-04-11 17:08:29.225.
+# automagically generated from the projectDefinition: stx_libbasic3.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/bc.mak	Thu Apr 12 18:19:04 2012 +0100
+++ b/bc.mak	Fri Apr 13 13:37:41 2012 +0100
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libbasic3 at 2012-04-11 17:08:30.550.
+# automagically generated from the projectDefinition: stx_libbasic3.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -71,7 +71,7 @@
 $(OUTDIR)Change.$(O) Change.$(H): Change.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ChangeDeltaInformation.$(O) ChangeDeltaInformation.$(H): ChangeDeltaInformation.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ChangeNotificationParameter.$(O) ChangeNotificationParameter.$(H): ChangeNotificationParameter.st $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)ChangeSet.$(O) ChangeSet.$(H): ChangeSet.st $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SmalltalkChunkFileSourceWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(STCHDR)
+$(OUTDIR)ChangeSet.$(O) ChangeSet.$(H): ChangeSet.st $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\SmalltalkChunkFileSourceWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractSourceFileWriter.$(H) $(STCHDR)
 $(OUTDIR)ChangeSetDiff.$(O) ChangeSetDiff.$(H): ChangeSetDiff.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ChangeSetDiffComponent.$(O) ChangeSetDiffComponent.$(H): ChangeSetDiffComponent.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ClassOrganizer.$(O) ClassOrganizer.$(H): ClassOrganizer.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/libbasic3.rc	Thu Apr 12 18:19:04 2012 +0100
+++ b/libbasic3.rc	Fri Apr 13 13:37:41 2012 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.1.1\0"
-      VALUE "ProductDate", "Wed, 11 Apr 2012 16:27:27 GMT\0"
+      VALUE "ProductDate", "Fri, 13 Apr 2012 12:36:43 GMT\0"
     END
 
   END
hg/stx-libbasic3