Mercurial Mercurial > hg > stx-libbasic / 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.
namespace fixes
authorClaus Gittinger <cg@exept.de>
Tue, 05 Nov 1996 23:24:57 +0100
changeset 1902 52376295aca8
parent 1901 8eebbd3c7232
child 1903 30c98b3377c5
namespace fixes
PosStream.st file | annotate | diff | comparison | revisions
PositionableStream.st file | annotate | diff | comparison | revisions 
--- a/PosStream.st	Tue Nov 05 23:21:29 1996 +0100
+++ b/PosStream.st	Tue Nov 05 23:24:57 1996 +0100
@@ -409,18 +409,33 @@
      return the value of the last chunk.
      Someone (which is usually some codeView) is notified of errors."
 
-    |lastValue|
+    |lastValue queries|
 
-    Class packageQuerySignal handle:[:ex |
-        |pkg|
+    queries := SignalSet with:(Class packageQuerySignal)
+                         with:(Class nameSpaceQuerySignal).
+
+    queries handle:[:ex |
+        |pkg spc|
 
-        (someone respondsTo:#packageToInstall) ifFalse:[
-            pkg := Class packageQuerySignal raise.
-        ] ifTrue:[
-            pkg := someone packageToInstall
+        ex signal == Class packageQuerySignal ifTrue:[
+            (someone respondsTo:#packageToInstall) ifFalse:[
+                pkg := Class packageQuerySignal raise.
+            ] ifTrue:[
+                pkg := someone packageToInstall
+            ].
+
+            ex proceedWith:pkg
+        ].
+        ex signal == Class nameSpaceQuerySignal ifTrue:[
+            (someone respondsTo:#currentNameSpace) ifFalse:[
+                spc := Class nameSpaceQuerySignal raise.
+            ] ifTrue:[
+                spc := someone currentNameSpace
+            ].
+
+            ex proceedWith:spc
         ].
 
-        ex proceedWith:pkg
     ] do:[
         "
          catch any errors during fileIn 
@@ -466,7 +481,7 @@
     ].
     ^ lastValue
 
-    "Modified: 5.11.1996 / 20:32:05 / cg"
+    "Modified: 5.11.1996 / 22:55:42 / cg"
 ! !
 
 !PositionableStream methodsFor:'positioning'!
@@ -646,6 +661,6 @@
 !PositionableStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Attic/PosStream.st,v 1.45 1996-11-05 19:39:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Attic/PosStream.st,v 1.46 1996-11-05 22:24:57 cg Exp $'
 ! !
 PositionableStream initialize!
--- a/PositionableStream.st	Tue Nov 05 23:21:29 1996 +0100
+++ b/PositionableStream.st	Tue Nov 05 23:24:57 1996 +0100
@@ -409,18 +409,33 @@
      return the value of the last chunk.
      Someone (which is usually some codeView) is notified of errors."
 
-    |lastValue|
+    |lastValue queries|
 
-    Class packageQuerySignal handle:[:ex |
-        |pkg|
+    queries := SignalSet with:(Class packageQuerySignal)
+                         with:(Class nameSpaceQuerySignal).
+
+    queries handle:[:ex |
+        |pkg spc|
 
-        (someone respondsTo:#packageToInstall) ifFalse:[
-            pkg := Class packageQuerySignal raise.
-        ] ifTrue:[
-            pkg := someone packageToInstall
+        ex signal == Class packageQuerySignal ifTrue:[
+            (someone respondsTo:#packageToInstall) ifFalse:[
+                pkg := Class packageQuerySignal raise.
+            ] ifTrue:[
+                pkg := someone packageToInstall
+            ].
+
+            ex proceedWith:pkg
+        ].
+        ex signal == Class nameSpaceQuerySignal ifTrue:[
+            (someone respondsTo:#currentNameSpace) ifFalse:[
+                spc := Class nameSpaceQuerySignal raise.
+            ] ifTrue:[
+                spc := someone currentNameSpace
+            ].
+
+            ex proceedWith:spc
         ].
 
-        ex proceedWith:pkg
     ] do:[
         "
          catch any errors during fileIn 
@@ -466,7 +481,7 @@
     ].
     ^ lastValue
 
-    "Modified: 5.11.1996 / 20:32:05 / cg"
+    "Modified: 5.11.1996 / 22:55:42 / cg"
 ! !
 
 !PositionableStream methodsFor:'positioning'!
@@ -646,6 +661,6 @@
 !PositionableStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.45 1996-11-05 19:39:05 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.46 1996-11-05 22:24:57 cg Exp $'
 ! !
 PositionableStream initialize!
hg/stx-libbasic