Fix in PeekableStream>>basicFileInNotifying:passChunk: jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 18 Mar 2013 17:55:24 +0000
branchjv
changeset 18032 1216c6885589
parent 18031 abddcc02ecb7
child 18033 c90d8fdd805d
Fix in PeekableStream>>basicFileInNotifying:passChunk: Also catch a 'Parser askForVariableTypeOfUndeclaredQuery' and proceed with nil. Imagine somebody has autodefine workspace variables on and then evaluate Smalltalk loadPackage:'xyz' that loads code from source (using file-in), Certainly we don't want to compile workspace variable access for every not-yet-loaded class in some namespace. This is demonstrated by Regression::CompilerTests2>>test_01 and this change actually fixes this test.
PeekableStream.st
libbasic.rc
--- a/PeekableStream.st	Sat Mar 16 00:13:23 2013 +0000
+++ b/PeekableStream.st	Mon Mar 18 17:55:24 2013 +0000
@@ -447,8 +447,11 @@
     handledSignals add:nameSpaceQuerySignal.
 
     handledSignals add:confirmationQuerySignal.
+    handledSignals add:Parser askForVariableTypeOfUndeclaredQuery.
+
     passedSignals add:confirmationQuerySignal.
 
+
     outerContext := thisContext.
 
     handledSignals handle:[:ex |
@@ -491,6 +494,10 @@
             "don't pop up dialogs"
             ex proceedWith:false
         ].
+        sig == Parser askForVariableTypeOfUndeclaredQuery ifTrue:[
+            "no autodefined variables or so"
+            ex proceedWith: nil.
+        ].
     ] do:[
         [self atEnd] whileFalse:[
             lastValue := self fileInNextChunkNotifying:someone passChunk:passChunk
@@ -498,8 +505,9 @@
     ].
     ^ lastValue
 
-    "Modified: / 10.9.1999 / 16:54:01 / stefan"
-    "Modified: / 16.11.2001 / 16:21:28 / cg"
+    "Modified: / 10-09-1999 / 16:54:01 / stefan"
+    "Modified: / 16-11-2001 / 16:21:28 / cg"
+    "Modified (format): / 18-03-2013 / 17:45:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 fileInNextChunkNotifying:someone
@@ -1029,6 +1037,12 @@
 
 version_CVS
     ^ '$Header: /cvs/stx/stx/libbasic/PeekableStream.st,v 1.41 2012-11-19 15:00:10 stefan Exp $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 ! !
 
+
 PeekableStream initialize!
--- a/libbasic.rc	Sat Mar 16 00:13:23 2013 +0000
+++ b/libbasic.rc	Mon Mar 18 17:55:24 2013 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libbasic.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,32767,32767
+  FILEVERSION     6,2,27,27
   PRODUCTVERSION  6,2,3,0
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Basic Classes (LIB)\0"
-      VALUE "FileVersion", "6.2.32767.32767\0"
+      VALUE "FileVersion", "6.2.27.27\0"
       VALUE "InternalName", "stx:libbasic\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Fri, 15 Mar 2013 11:22:13 GMT\0"
+      VALUE "ProductDate", "Mon, 18 Mar 2013 17:46:35 GMT\0"
     END
 
   END