--- a/Scanner.st	Tue Jan 08 10:35:51 2002 +0100
+++ b/Scanner.st	Tue Jan 08 10:36:50 2002 +0100
@@ -670,82 +670,87 @@
     source skipSeparatorsExceptCR.
     hereChar := source peekOrNil.
     hereChar isLetter ifTrue:[
-        directive := source nextWord asLowercase.
-        source peekOrNil == $: ifTrue:[
-            source next.
-            source skipSeparatorsExceptCR.
-            hereChar := source peekOrNil.
+	directive := source nextWord asLowercase.
+	source peekOrNil == $: ifTrue:[
+	    source next.
+	    source skipSeparatorsExceptCR.
+	    hereChar := source peekOrNil.
 
-            "
-             package: 'name-of-package'
-             package: packageId
-            "
-            directive = 'package' ifTrue:[
-                packageName := self parseDirectiveStringArg.
-                packageName notNil ifTrue:[
-                    (requestor respondsTo:#setPackage:) ifTrue:[
-                        requestor setPackage:packageName
-                    ].
-                ] ifFalse:[
-                    Transcript showCR:'unrecognized ''package'' directive'.
-                    ^ false
-                ]
-            ].
+	    "
+	     package: 'name-of-package'
+	     package: packageId
+	    "
+	    directive = 'package' ifTrue:[
+		packageName := self parseDirectiveStringArg.
+		packageName notNil ifTrue:[
+		    (requestor notNil 
+		    and:[requestor respondsTo:#setPackage:]) ifTrue:[
+			requestor setPackage:packageName
+		    ].
+		] ifFalse:[
+		    Transcript showCR:'unrecognized ''package'' directive'.
+		    ^ false
+		]
+	    ].
 
-            "
-             Namespace: 'nameSpaceIdentifier'
-             Namespace: nameSpaceIdentifier
-            "
-            (directive = 'namespace') ifTrue:[
-                namespace := self parseDirectiveStringArg.
-                namespace notNil ifTrue:[
-                    (requestor respondsTo:#setNameSpace:) ifTrue:[
-                        requestor setNameSpace:namespace 
-                    ] ifFalse:[
-                        self setNameSpace:namespace
-                    ].
-                ] ifFalse:[
-                    Transcript showCR:'unrecognized ''namespace'' directive'.
-                    ^ false
-                ].
-            ].
+	    "
+	     Namespace: 'nameSpaceIdentifier'
+	     Namespace: nameSpaceIdentifier
+	    "
+	    (directive = 'namespace') ifTrue:[
+		namespace := self parseDirectiveStringArg.
+		namespace notNil ifTrue:[
+		    (requestor notNil
+		    and:[requestor respondsTo:#setNameSpace:]) ifTrue:[
+			requestor setNameSpace:namespace 
+		    ] ifFalse:[
+			self setNameSpace:namespace
+		    ].
+		] ifFalse:[
+		    Transcript showCR:'unrecognized ''namespace'' directive'.
+		    ^ false
+		].
+	    ].
 
-            "
-             Uses: 'nameSpace1', ... , 'nameSpaceN'
-             Uses: nameSpaceId1, ... , nameSpaceIdN
-            "
-            directive = 'uses' ifTrue:[
-                list := self parseDirectiveStringListArg.
-                list notNil ifTrue:[
-                    (requestor respondsTo:#addNameSpaces:) ifTrue:[
-                        requestor addNameSpaces:list 
-                    ]
-                ] ifFalse:[
-                    Transcript showCR:'unrecognized ''uses'' directive'.
-                    ^ false
-                ]
-            ].
+	    "
+	     Uses: 'nameSpace1', ... , 'nameSpaceN'
+	     Uses: nameSpaceId1, ... , nameSpaceIdN
+	    "
+	    directive = 'uses' ifTrue:[
+		list := self parseDirectiveStringListArg.
+		list notNil ifTrue:[
+		    (requestor notNil
+		    and:[requestor respondsTo:#addNameSpaces:]) ifTrue:[
+			requestor addNameSpaces:list 
+		    ]
+		] ifFalse:[
+		    Transcript showCR:'unrecognized ''uses'' directive'.
+		    ^ false
+		]
+	    ].
 
-            "
-             Prerequisites: 'name-of-package', ... , 'name-of-package'
-            "
-            directive = 'prerequisites' ifTrue:[
-                list := self parseDirectiveStringListArg.
-                list notNil ifTrue:[
-                    (requestor respondsTo:#requirePackages:) ifTrue:[
-                        requestor requirePackages:list 
-                    ].
-                ] ifFalse:[
-                    Transcript showCR:'unrecognized ''prerequisites'' directive'.
-                    ^ false
-                ]
-            ].
-        ]
+	    "
+	     Prerequisites: 'name-of-package', ... , 'name-of-package'
+	    "
+	    directive = 'prerequisites' ifTrue:[
+		list := self parseDirectiveStringListArg.
+		list notNil ifTrue:[
+		    (requestor notNil
+		    and:[requestor respondsTo:#requirePackages:]) ifTrue:[
+			requestor requirePackages:list 
+		    ].
+		] ifFalse:[
+		    Transcript showCR:'unrecognized ''prerequisites'' directive'.
+		    ^ false
+		]
+	    ].
+	]
     ].
     hereChar := source peekOrNil.
     ^ true.
 
     "Modified: / 5.3.1998 / 02:55:32 / cg"
+
 !
 
 parseDirectiveStringArg
@@ -2240,6 +2245,6 @@
 !Scanner class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.136 2002-01-08 09:35:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.137 2002-01-08 09:36:50 cg Exp $'
 ! !
 Scanner initialize!