--- a/ChangeSet.st Wed Feb 02 13:41:14 2000 +0100
+++ b/ChangeSet.st Wed Feb 02 13:42:49 2000 +0100
@@ -98,58 +98,58 @@
nameSpace := Smalltalk.
[aStream atEnd] whileFalse:[
- aStream skipSeparators.
- sawExcla := aStream peekFor:$!!.
- chunk := aStream nextChunk.
- (chunk notNil and:[chunk notEmpty]) ifTrue:[
- Class nameSpaceQuerySignal answer:nameSpace do:[
- |parser tree|
+ aStream skipSeparators.
+ sawExcla := aStream peekFor:$!!.
+ chunk := aStream nextChunk.
+ (chunk notNil and:[chunk notEmpty]) ifTrue:[
+ Class nameSpaceQuerySignal answer:nameSpace do:[
+ |parser tree|
- parser := Parser for:chunk.
- tree := parser
- parseExpressionWithSelf:nil
- notifying:nil
- ignoreErrors:true
- ignoreWarnings:true
- inNameSpace:nameSpace.
- tree == #Error ifTrue:[
- change := DoItChange new.
- change source:chunk.
- changeSet add: change.
- ] ifFalse:[
- (tree notNil and:[tree ~~ #Error]) ifTrue:[
- "/ if there is any nameSPace directoive in there, extract it.
- parser currentNameSpace notNil ifTrue:[
- nameSpace := parser currentNameSpace
- ].
- Class nameSpaceQuerySignal answer:nameSpace do:[
- "/
- "/ what type of chunk is this ...
- "/
- tree isConstant ifTrue:[
- (s := tree evaluate) isString ifTrue:[
- (s startsWith:'---- timestamp ') ifTrue:[
- lastTimeStamp := s.
- ]
- ] ifFalse:[
- self halt:'unexpected change-chunk'
- ]
- ] ifFalse:[
- tree isMessage ifTrue:[
- (changeSet addFromParseTree:tree andStream:aStream) ifFalse:[
- change := DoItChange new.
- change source:chunk.
- changeSet add: change.
- ]
- ] ifFalse:[
- self halt:'unexpected change-chunk'
- ]
- ]
- ]
- ]
- ]
- ]
- ]
+ parser := Parser for:chunk.
+ tree := parser
+ parseExpressionWithSelf:nil
+ notifying:nil
+ ignoreErrors:true
+ ignoreWarnings:true
+ inNameSpace:nameSpace.
+ tree == #Error ifTrue:[
+ change := DoItChange new.
+ change source:chunk.
+ changeSet add: change.
+ ] ifFalse:[
+ (tree notNil and:[tree ~~ #Error]) ifTrue:[
+ "/ if there is any nameSPace directive in there, extract it.
+ parser currentNameSpace notNil ifTrue:[
+ nameSpace := parser currentNameSpace
+ ].
+ Class nameSpaceQuerySignal answer:nameSpace do:[
+ "/
+ "/ what type of chunk is this ...
+ "/
+ tree isConstant ifTrue:[
+ (s := tree evaluate) isString ifTrue:[
+ (s startsWith:'---- timestamp ') ifTrue:[
+ lastTimeStamp := s.
+ ]
+ ] ifFalse:[
+ self halt:'unexpected change-chunk'
+ ]
+ ] ifFalse:[
+ tree isMessage ifTrue:[
+ (changeSet addFromParseTree:tree andStream:aStream) ifFalse:[
+ change := DoItChange new.
+ change source:chunk.
+ changeSet add: change.
+ ]
+ ] ifFalse:[
+ self halt:'unexpected change-chunk'
+ ]
+ ]
+ ]
+ ]
+ ]
+ ]
+ ]
].
^ changeSet
@@ -772,5 +772,5 @@
!ChangeSet class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.39 2000-02-01 20:13:25 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.40 2000-02-02 12:42:49 cg Exp $'
! !