*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Tue, 19 Apr 2005 16:23:56 +0200
changeset 1584 0df14b652d03
parent 1583 031fae13e533
child 1585 63f4b846bf3d
*** empty log message ***
Scanner.st
--- a/Scanner.st	Tue Apr 19 15:55:42 2005 +0200
+++ b/Scanner.st	Tue Apr 19 16:23:56 2005 +0200
@@ -1,6 +1,6 @@
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
-	      All Rights Reserved
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -13,41 +13,41 @@
 "{ Package: 'stx:libcomp' }"
 
 Object subclass:#Scanner
-	instanceVariableNames:'typeArray actionArray source lineNr token tokenType tokenPosition
-		tokenValue tokenName tokenLineNr hereChar peekChar peekChar2
-		requestor exitBlock errorFlag ignoreErrors ignoreWarnings
-		saveComments currentComments collectedSource
-		allowUnderscoreInIdentifier allowDollarInIdentifier
-		allowOldStyleAssignment scanColonAsKeyword allowSqueakExtensions
-		warnSTXSpecialComment warnUnderscoreInIdentifier
-		warnOldStyleAssignment warnCommonMistakes outStream outCol
-		warnSTXNameSpaceUse warnPossibleIncompatibilities
-		warnDollarInIdentifier inArrayLiteral
-		allowLiteralNameSpaceSymbols'
-	classVariableNames:'TypeArray ActionArray Warnings EmptySourceNotificationSignal
-		WarnSTXSpecials WarnOldStyleAssignment WarnUnderscoreInIdentifier
-		WarnCommonMistakes WarnPossibleIncompatibilities
-		WarnDollarInIdentifier AllowUnderscoreInIdentifier
-		AllowDollarInIdentifier AllowSqueakExtensions AllowQualifiedNames
-		AllowDolphinExtensions AllowOldStyleAssignment
-		AllowExtendedBinarySelectors AllowExtendedSTXSyntax
-		AllowFixedPointLiterals AllowLiteralNameSpaceSymbols'
-	poolDictionaries:''
-	category:'System-Compiler'
+        instanceVariableNames:'typeArray actionArray source lineNr token tokenType tokenPosition
+                tokenValue tokenName tokenLineNr hereChar peekChar peekChar2
+                requestor exitBlock errorFlag ignoreErrors ignoreWarnings
+                saveComments currentComments collectedSource
+                allowUnderscoreInIdentifier allowDollarInIdentifier
+                allowOldStyleAssignment scanColonAsKeyword allowSqueakExtensions
+                warnSTXSpecialComment warnUnderscoreInIdentifier
+                warnOldStyleAssignment warnCommonMistakes outStream outCol
+                warnSTXNameSpaceUse warnPossibleIncompatibilities
+                warnDollarInIdentifier inArrayLiteral
+                allowLiteralNameSpaceSymbols'
+        classVariableNames:'TypeArray ActionArray Warnings EmptySourceNotificationSignal
+                WarnSTXSpecials WarnOldStyleAssignment WarnUnderscoreInIdentifier
+                WarnCommonMistakes WarnPossibleIncompatibilities
+                WarnDollarInIdentifier AllowUnderscoreInIdentifier
+                AllowDollarInIdentifier AllowSqueakExtensions AllowQualifiedNames
+                AllowDolphinExtensions AllowOldStyleAssignment
+                AllowExtendedBinarySelectors AllowExtendedSTXSyntax
+                AllowFixedPointLiterals AllowLiteralNameSpaceSymbols'
+        poolDictionaries:''
+        category:'System-Compiler'
 !
 
 Object subclass:#Comment
-	instanceVariableNames:'commentType commentString'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:Scanner
+        instanceVariableNames:'commentType commentString'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:Scanner
 !
 
 Query subclass:#DoNotShowCompilerWarningAgainActionQuery
-	instanceVariableNames:''
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:Scanner
+        instanceVariableNames:''
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:Scanner
 !
 
 !Scanner class methodsFor:'documentation'!
@@ -75,7 +75,7 @@
 copyright
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
-	      All Rights Reserved
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -414,7 +414,7 @@
      Examples are: expr or:expr2, where expr2 is not a block.
      If you get bored by those warnings, turn them off by adding
      a line as:
-	Compiler warnCommonMistakes:false
+        Compiler warnCommonMistakes:false
      in your 'private.rc' file"
 
     WarnCommonMistakes := aBoolean
@@ -455,7 +455,7 @@
     "this allows turning on/off warnings about underscore-assignment (pre ST-80v4 syntax).
      If you get bored by those warnings, turn them off by adding
      a line as:
-	Compiler warnOldStyleAssignment:false
+        Compiler warnOldStyleAssignment:false
      in your 'private.rc' file"
 
     WarnOldStyleAssignment := aBoolean
@@ -493,7 +493,7 @@
     "this allows turning on/off warnings about stx specials.
      If you get bored by those warnings, turn them off by adding
      a line as:
-	Compiler warnSTXSpecials:false
+        Compiler warnSTXSpecials:false
      in your 'private.rc' file"
 
     WarnSTXSpecials := aBoolean
@@ -636,7 +636,7 @@
 !Scanner methodsFor:'accessing'!
 
 comments
-    ^ currentComments 
+    ^ currentComments ? #()
 !
 
 exitBlock:aBlock
@@ -667,9 +667,6 @@
     "not yet implemented"
 
     saveComments := aBoolean.
-    currentComments isNil ifTrue:[
-        currentComments := #().
-    ]
 
     "Created: 20.4.1996 / 20:03:56 / cg"
     "Modified: 23.5.1997 / 12:14:49 / cg"
@@ -1130,9 +1127,9 @@
     "show an errormessage on the Transcript"
 
     ignoreErrors ifFalse:[
-	Smalltalk silentLoading == true ifFalse:[
-	    Transcript showCR:(pos printString , ' [line: ' , tokenLineNr printString , '] ' , aMessage)
-	]
+        Smalltalk silentLoading == true ifFalse:[
+            Transcript showCR:(pos printString , ' [line: ' , tokenLineNr printString , '] ' , aMessage)
+        ]
     ]
 
     "Modified: 18.5.1996 / 15:44:35 / cg"
@@ -1540,11 +1537,11 @@
 
 endComment:comment
     saveComments ifTrue:[
-	currentComments isNil ifTrue:[
-	    currentComments := OrderedCollection with:comment
-	] ifFalse:[
-	    currentComments add:comment
-	]
+        currentComments isNil ifTrue:[
+            currentComments := OrderedCollection with:comment
+        ] ifFalse:[
+            currentComments add:comment
+        ]
     ].
 !
 
@@ -2784,7 +2781,7 @@
 !Scanner class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.197 2005-04-19 13:55:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.198 2005-04-19 14:23:56 cg Exp $'
 ! !
 
 Scanner initialize!