--- a/ResourcePack.st	Sat Aug 29 17:16:41 1998 +0200
+++ b/ResourcePack.st	Sun Aug 30 12:36:55 1998 +0200
@@ -432,7 +432,7 @@
     "Created: 6.9.1997 / 11:38:53 / cg"
 !
 
-processLine:aLine encoding:encoding
+processLine:aLine encoding:encoding file:fileName
     "process a single valid line (i.e. #ifdef & #include has already been processed)"
 
     |lineString name stream l rest macroName value conditional|
@@ -444,7 +444,11 @@
         stream signalAtEnd:false.
         name := String 
                     readFrom:stream 
-                    onError:[('ResourcePack [warning]: invalid line <',lineString,'>') errorPrintCR. nil].
+                    onError:[('ResourcePack [warning]: invalid line <'
+                             ,lineString
+                             ,'> in file:'
+                             , fileName
+                            ) errorPrintCR. nil].
 "/ OLD: l := stream position
         l := stream position + 1.
 
@@ -510,8 +514,8 @@
         ]
     ]
 
-    "Created: / 26.2.1996 / 19:17:07 / cg"
-    "Modified: / 16.6.1998 / 17:02:44 / cg"
+    "Modified: / 30.8.1998 / 12:33:22 / cg"
+    "Created: / 30.8.1998 / 12:35:37 / cg"
 !
 
 readFromFile:fileName directory:dirName
@@ -601,12 +605,12 @@
                                     (lineString startsWith:'include') ifTrue:[
                                         rest := lineString copyFrom:8.
                                         value := Compiler evaluate:rest compile:false.
-					value isString ifFalse:[
-                            		    ('ResourcePack [warning]: bad include filename: ' , value printString) errorPrintCR.
-					    ('ResourcePack [info]: line ' , lNo printString , ': ''' , lineString , '''') infoPrintCR.
-					] ifTrue:[
+                                        value isString ifFalse:[
+                                            ('ResourcePack [warning]: bad include filename: ' , value printString) errorPrintCR.
+                                            ('ResourcePack [info]: line ' , lNo printString , ': ''' , lineString , '''') infoPrintCR.
+                                        ] ifTrue:[
                                             self readFromFile:value directory:dirName
-					]
+                                        ]
                                     ] ifFalse:[
                                         (lineString startsWith:'encoding') ifTrue:[
                                             rest := lineString copyFrom:9.
@@ -624,7 +628,12 @@
                             ('ResourcePack [info]: line ' , lNo printString , ': ''' , lineString , '''') infoPrintCR.
                             ok := false.
                         ] do:[
-                            self processLine:lineString encoding:encoding
+                            self 
+                                processLine:lineString 
+                                encoding:encoding 
+                                file:(inStream isFileStream 
+                                        ifTrue:[inStream pathName]
+                                        ifFalse:['---'])
                         ]
                     ]
                 ]
@@ -633,13 +642,13 @@
     ].
     ^ ok
 
-    "Modified: 31.8.1995 / 02:33:45 / claus"
-    "Modified: 1.7.1997 / 00:59:22 / cg"
+    "Modified: / 31.8.1995 / 02:33:45 / claus"
+    "Modified: / 30.8.1998 / 12:35:24 / cg"
 ! !
 
 !ResourcePack class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.46 1998-06-16 15:05:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.47 1998-08-30 10:36:55 cg Exp $'
 ! !
 ResourcePack initialize!