--- a/Scanner.st	Wed Oct 15 13:14:50 1997 +0200
+++ b/Scanner.st	Wed Oct 15 13:15:08 1997 +0200
@@ -10,7 +10,7 @@
  hereby transferred.
 "
 
-'From Smalltalk/X, Version:3.1.9 on 7-sep-1997 at 1:59:17 pm'                   !
+'From Smalltalk/X, Version:3.2.1 on 14-oct-1997 at 11:15:56 pm'                 !
 
 Object subclass:#Scanner
 	instanceVariableNames:'source lineNr collectedSource token tokenType tokenPosition
@@ -940,7 +940,8 @@
 
     nextChar := source nextPeek.
     nextChar notNil ifTrue:[
-        nextChar isLetterOrDigit ifTrue:[
+        (nextChar isLetterOrDigit
+        or:[(AllowUnderscoreInIdentifier == true) and:[nextChar == $_]]) ifTrue:[
             string := ''.
             [nextChar notNil 
              and:[nextChar isLetterOrDigit 
@@ -1026,7 +1027,7 @@
     ^ #Error
 "
 
-    "Modified: 20.6.1997 / 17:53:09 / cg"
+    "Modified: 14.10.1997 / 17:14:56 / cg"
 !
 
 nextId
@@ -1590,6 +1591,6 @@
 !Scanner class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.70 1997-09-18 20:54:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.71 1997-10-15 11:15:08 cg Exp $'
 ! !
 Scanner initialize!