Scanner.st
changeset 2858 588ba3e53fd2
parent 2854 64b0decefcec
child 2876 57e181acee74
--- a/Scanner.st	Tue Apr 03 20:49:37 2012 +0200
+++ b/Scanner.st	Tue Apr 03 20:50:42 2012 +0200
@@ -1368,13 +1368,11 @@
      error (and/or to abort the compile).
      Return the result passed back by the requestor."
 
-    |err|
-
-    Smalltalk isInitialized ifFalse:[
-        Smalltalk isStandAloneDebug ifTrue:[
-            "/ error during startup
+    (Smalltalk isInitialized not and:[Smalltalk isStandAloneDebug]) ifTrue:[
+        "/ error during startup, but sometimes we expect an error and want to supress it
+        Parser parseWarningSignal query ~~ #ignore ifTrue:[
             thisContext fullPrintAll.
-        ]
+        ].
     ].
 
     ignoreErrors ifFalse:[
@@ -1384,11 +1382,11 @@
             ^ self
         ].
         Parser::ParseError isHandled ifTrue:[
-            err := Parser::ParseError new.
-            err errorMessage:aMessage startPosition:position endPosition:endPos.
-            err parameter:self.
-            err lineNumber:tokenLineNr "lineNr".
-            err raiseRequest.
+            Parser::ParseError new
+                errorMessage:aMessage startPosition:position endPosition:endPos;
+                parameter:self;
+                lineNumber:tokenLineNr; "lineNr"
+                raiseRequest.
             ^ self
         ].
         self showErrorMessage:aMessage position:position.
@@ -3423,11 +3421,11 @@
 !Scanner class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.280 2012-03-16 17:47:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.281 2012-04-03 18:50:42 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.280 2012-03-16 17:47:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.281 2012-04-03 18:50:42 stefan Exp $'
 ! !
 
 Scanner initialize!