--- a/Class.st Tue Sep 12 11:00:04 1995 +0200
+++ b/Class.st Wed Sep 13 20:52:44 1995 +0200
@@ -23,7 +23,7 @@
COPYRIGHT (c) 1989 by Claus Gittinger
All Rights Reserved
-$Header: /cvs/stx/stx/libbasic/Class.st,v 1.60 1995-09-08 16:45:26 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Class.st,v 1.61 1995-09-13 18:51:47 claus Exp $
'!
!Class class methodsFor:'documentation'!
@@ -44,7 +44,7 @@
version
"
-$Header: /cvs/stx/stx/libbasic/Class.st,v 1.60 1995-09-08 16:45:26 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Class.st,v 1.61 1995-09-13 18:51:47 claus Exp $
"
!
@@ -1122,7 +1122,7 @@
self printClassNameOn:aStream.
aStream nextPutAll:(' removeSelector:#' , aSelector).
- aStream nextPut:(aStream class chunkSeparator).
+ aStream nextPutChunkSeparator.
!
addChangeRecordForMethodCategory:aMethod category:newCategory to:aStream
@@ -1136,7 +1136,7 @@
self printClassNameOn:aStream.
aStream nextPutAll:(' compiledMethodAt:' , selector storeString).
aStream nextPutAll:(') category:' , newCategory storeString).
- aStream nextPut:(aStream class chunkSeparator).
+ aStream nextPutChunkSeparator.
]
!
@@ -1151,7 +1151,7 @@
self printClassNameOn:aStream.
aStream nextPutAll:(' compiledMethodAt:' , selector storeString).
aStream nextPutAll:(') privacy:' , aMethod privacy storeString).
- aStream nextPut:(aStream class chunkSeparator).
+ aStream nextPutChunkSeparator.
]
"Modified: 27.8.1995 / 22:59:56 / claus"
@@ -1162,7 +1162,7 @@
aClass isLoaded ifTrue:[
aClass fileOutDefinitionOn:aStream.
- aStream nextPut:(aStream class chunkSeparator).
+ aStream nextPutChunkSeparator.
]
!
@@ -1170,14 +1170,14 @@
"append a class-instvars-record to aStream"
aClass fileOutClassInstVarDefinitionOn:aStream.
- aStream nextPut:(aStream class chunkSeparator).
+ aStream nextPutChunkSeparator.
!
addChangeRecordForClassComment:aClass to:aStream
"append a class-comment-record to aStream"
aClass fileOutCommentOn:aStream.
- aStream nextPut:(aStream class chunkSeparator).
+ aStream nextPutChunkSeparator.
!
addChangeRecordForPrimitiveVariables:aClass to:aStream
@@ -1186,7 +1186,7 @@
aStream nextPutAll:aClass name
, ' primitiveVariables: '
, aClass primitiveVariablesString storeString.
- aStream nextPut:(aStream class chunkSeparator).
+ aStream nextPutChunkSeparator.
!
addChangeRecordForPrimitiveDefinitions:aClass to:aStream
@@ -1195,7 +1195,7 @@
aStream nextPutAll:aClass name
, ' primitiveDefinitions: '
, aClass primitiveDefinitionsString storeString.
- aStream nextPut:(aStream class chunkSeparator).
+ aStream nextPutChunkSeparator.
!
addChangeRecordForPrimitiveFunctions:aClass to:aStream
@@ -1204,21 +1204,21 @@
aStream nextPutAll:aClass name
, ' primitiveFunctions: '
, aClass primitiveFunctionsString storeString.
- aStream nextPut:(aStream class chunkSeparator).
+ aStream nextPutChunkSeparator.
!
addChangeRecordForClassRename:oldName to:newName to:aStream
"append a class-rename-record to aStream"
aStream nextPutAll:('Smalltalk renameClass:' , oldName , ' to:''' , newName , '''').
- aStream nextPut:(aStream class chunkSeparator).
+ aStream nextPutChunkSeparator.
!
addChangeRecordForClassRemove:oldName to:aStream
"append a class-remove-record to aStream"
aStream nextPutAll:('Smalltalk removeClass:' , oldName).
- aStream nextPut:(aStream class chunkSeparator).
+ aStream nextPutChunkSeparator.
!
addChangeRecordForRenameCategory:oldCategory to:newCategory to:aStream
@@ -1227,7 +1227,7 @@
self printClassNameOn:aStream.
aStream nextPutAll:(' renameCategory:' , oldCategory storeString).
aStream nextPutAll:(' to:' , newCategory storeString).
- aStream nextPut:(aStream class chunkSeparator).
+ aStream nextPutChunkSeparator.
!
addChangeRecordForChangeCategory:category to:aStream
@@ -1235,7 +1235,7 @@
self printClassNameOn:aStream.
aStream nextPutAll:(' category:' , category storeString).
- aStream nextPut:(aStream class chunkSeparator).
+ aStream nextPutChunkSeparator.
!
addInfoRecord:aMessage to:aStream
@@ -1245,7 +1245,7 @@
Date today printString , ' ' ,
Time now printString ,
' ----''').
- aStream nextPut:(aStream class chunkSeparator).
+ aStream nextPutChunkSeparator.
!
addChangeRecordForSnapshot:aFileName to:aStream
@@ -1892,34 +1892,33 @@
fileOutPrimitiveDefinitionsOn:aStream
"append primitive defs (if any) to aStream."
- |s sep|
-
- sep := aStream class chunkSeparator.
+ |s|
+
"
primitive definitions - if any
"
(s := self primitiveDefinitionsString) notNil ifTrue:[
- aStream nextPut:sep;
+ aStream nextPutChunkSeparator;
nextPutAll:name; nextPutAll:' primitiveDefinitions';
- nextPut:sep;
+ nextPutChunkSeparator;
cr.
aStream nextPutAll:s.
- aStream nextPut:sep; space; nextPut:sep; cr; cr
+ aStream nextPutChunkSeparator; space; nextPutChunkSeparator; cr; cr
].
(s := self primitiveVariablesString) notNil ifTrue:[
- aStream nextPut:sep;
+ aStream nextPutChunkSeparator;
nextPutAll:name; nextPutAll:' primitiveVariables';
- nextPut:sep;
+ nextPutChunkSeparator;
cr.
aStream nextPutAll:s.
- aStream nextPut:sep; space; nextPut:sep; cr; cr
+ aStream nextPutChunkSeparator; space; nextPutChunkSeparator; cr; cr
].
!
fileOutPrimitiveSpecsOn:aStream
"append primitive defs (if any) to aStream."
- |s sep|
+ |s|
"
primitive definitions - if any
@@ -1929,13 +1928,12 @@
primitive functions - if any
"
(s := self primitiveFunctionsString) notNil ifTrue:[
- sep := aStream class chunkSeparator.
- aStream nextPut:sep;
+ aStream nextPutChunkSeparator;
nextPutAll:name; nextPutAll:' primitiveFunctions';
- nextPut:sep;
+ nextPutChunkSeparator;
cr.
aStream nextPutAll:s.
- aStream nextPut:sep; space; nextPut:sep; cr; cr
+ aStream nextPutChunkSeparator; space; nextPutChunkSeparator; cr; cr
].
!
@@ -1962,7 +1960,7 @@
fileOutCategory:aCategory on:aStream
"file out all methods belonging to aCategory, aString onto aStream"
- |nMethods count sep source sortedSelectors sortedMethods first
+ |nMethods count source sortedSelectors sortedMethods first
privacy|
methodArray notNil ifTrue:[
@@ -1973,8 +1971,6 @@
]
].
(nMethods ~~ 0) ifTrue:[
- sep := aStream class chunkSeparator.
-
count := 1.
first := true.
@@ -1992,7 +1988,7 @@
privacy ~~ aMethod privacy ifTrue:[
first := true.
aStream space.
- aStream nextPut:sep.
+ aStream nextPutChunkSeparator.
].
aStream cr; cr
].
@@ -2000,7 +1996,7 @@
privacy := aMethod privacy.
first ifTrue:[
- aStream nextPut:sep.
+ aStream nextPutChunkSeparator.
self printClassNameOn:aStream.
privacy ~~ #public ifTrue:[
aStream space; nextPutAll:privacy; nextPutAll:'MethodsFor:'''.
@@ -2010,7 +2006,7 @@
aCategory notNil ifTrue:[
aStream nextPutAll:aCategory
].
- aStream nextPut:$'; nextPut:sep; cr; cr.
+ aStream nextPut:$'; nextPutChunkSeparator; cr; cr.
first := false.
].
source := aMethod source.
@@ -2023,7 +2019,7 @@
]
].
aStream space.
- aStream nextPut:sep.
+ aStream nextPutChunkSeparator.
aStream cr
]
]
@@ -2034,11 +2030,10 @@
fileOutMethod:aMethod on:aStream
"file out the method, aMethod onto aStream"
- |cat sep source privacy|
+ |cat source privacy|
methodArray notNil ifTrue:[
- sep := aStream class chunkSeparator.
- aStream nextPut:sep.
+ aStream nextPutChunkSeparator.
self printClassNameOn:aStream.
(privacy := aMethod privacy) ~~ #public ifTrue:[
@@ -2050,7 +2045,7 @@
cat notNil ifTrue:[
aStream nextPutAll:cat
].
- aStream nextPut:$'; nextPut:sep; cr; cr.
+ aStream nextPut:$'; nextPutChunkSeparator; cr; cr.
source := aMethod source.
source isNil ifTrue:[
FileOutErrorSignal
@@ -2062,7 +2057,7 @@
aStream nextChunkPut:source.
].
aStream space.
- aStream nextPut:sep.
+ aStream nextPutChunkSeparator.
aStream cr
]
@@ -2072,7 +2067,7 @@
fileOutOn:aStream
"file out my definition and all methods onto aStream"
- |collectionOfCategories copyrightText sep comment cls|
+ |collectionOfCategories copyrightText comment cls|
self isLoaded ifFalse:[
^ FileOutErrorSignal
@@ -2108,26 +2103,25 @@
copyrightText do:[:line | aStream nextPutAll:line. aStream cr.].
].
- sep := aStream class chunkSeparator.
"
first, a timestamp
"
aStream nextPutAll:(Smalltalk timeStamp).
- aStream nextPut:sep.
+ aStream nextPutChunkSeparator.
aStream cr; cr.
"
then the definition
"
self fileOutDefinitionOn:aStream.
- aStream nextPut:sep.
+ aStream nextPutChunkSeparator.
aStream cr; cr.
"
optional classInstanceVariables
"
self class instanceVariableString isBlank ifFalse:[
self fileOutClassInstVarDefinitionOn:aStream.
- aStream nextPut:sep.
+ aStream nextPutChunkSeparator.
aStream cr; cr
].
@@ -2137,7 +2131,7 @@
(comment := self comment) notNil ifTrue:[
aStream nextPutAll:name; nextPutAll:' comment:'.
aStream nextPutAll:(comment storeString).
- aStream nextPut:sep.
+ aStream nextPutChunkSeparator.
aStream cr; cr
].
@@ -2196,7 +2190,7 @@
"
(self class implements:#initialize) ifTrue:[
aStream nextPutAll:(name , ' initialize').
- aStream nextPut:sep.
+ aStream nextPutChunkSeparator.
aStream cr
]
!