--- a/ChangeSet.st	Mon May 22 14:00:59 2000 +0200
+++ b/ChangeSet.st	Tue May 23 10:03:56 2000 +0200
@@ -46,7 +46,7 @@
 
 !ChangeSet class methodsFor:'instance creation'!
 
-changesFromParseTree:aTree andStream:aStream do:aBlock
+changesFromParseTree:aTree andStream:aStream lineNumber:initialLineNumberOrNil do:aBlock
     "given a parse-tree (from parsing some changes source/chunk),
      create changes and evaluate aBlock on each.
      The block is invoked with the change and a lineNumberOrNil as
@@ -59,7 +59,7 @@
      receiverSelector receiverReceiver primSource
      nameSpace lineNumberOrNil|
 
-     lineNumberOrNil := aStream lineNumber.
+     lineNumberOrNil := initialLineNumberOrNil.
 
 "/    nameSpace := Class nameSpaceQuerySignal query.
 "/    nameSpace isNil ifTrue:[nameSpace := Smalltalk].
@@ -394,6 +394,7 @@
                                     (self 
                                             changesFromParseTree:tree 
                                             andStream:aStream
+                                            lineNumber:lineNumber
                                             do:aBlock) ifFalse:[
                                         change := DoItChange new.
                                         change source:chunk.
@@ -696,23 +697,6 @@
     ^ self
 ! !
 
-!ChangeSet methodsFor:'private'!
-
-addFromParseTree:aTree andStream:aStream
-    "given a parse-tree (from parsing some changes source/chunk),
-     create changes and add them to the changeSet.
-     (usually only one, except for multiple methodsFor: changes,
-      which are not encountered in normal change files.)"
-
-    ^ self class 
-        changesFromParseTree:aTree andStream:aStream
-        do:[:aChange :lineNumberOrNil |
-            self add:aChange.
-        ].
-
-
-! !
-
 !ChangeSet methodsFor:'utilities'!
 
 apply
@@ -868,5 +852,5 @@
 !ChangeSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.46 2000-05-22 12:00:59 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.47 2000-05-23 08:03:56 cg Exp $'
 ! !