Mercurial Mercurial > hg > stx-libview / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(notNil and:[isEmpty not]) -> (size > 0)
authorClaus Gittinger <cg@exept.de>
Wed, 17 Feb 1999 21:09:40 +0100
changeset 2459 55f57cb8551b
parent 2458 92792582f878
child 2460 a1c5c2053f42
(notNil and:[isEmpty not]) -> (size > 0)
ResourcePack.st file | annotate | diff | comparison | revisions
RsrcPack.st file | annotate | diff | comparison | revisions 
--- a/ResourcePack.st	Wed Feb 17 13:34:04 1999 +0100
+++ b/ResourcePack.st	Wed Feb 17 21:09:40 1999 +0100
@@ -575,84 +575,84 @@
     skipping := false.
     lNo := 0.
     [inStream atEnd] whileFalse:[
-	lineString := inStream nextLine. lNo := lNo + 1.
-	[lineString notNil and:[lineString endsWith:$\]] whileTrue:[
-	    lineString := lineString copyWithoutLast:1.
-	    l := inStream nextLine. lNo := lNo + 1.
-	    l notNil ifTrue:[
-		lineString := lineString , l.
-	    ].
-	].
+        lineString := inStream nextLine. lNo := lNo + 1.
+        [lineString notNil and:[lineString endsWith:$\]] whileTrue:[
+            lineString := lineString copyWithoutLast:1.
+            l := inStream nextLine. lNo := lNo + 1.
+            l notNil ifTrue:[
+                lineString := lineString , l.
+            ].
+        ].
 
-	(lineString notNil and:[lineString isEmpty not]) ifTrue:[
-	    first := lineString at:1.
-	    "/
-	    "/ for your convenience: treat ; AND "/ as comment-line
-	    "/
-	    ((first == $;) or:[lineString startsWith:'"/']) ifFalse:[
-		first == $# ifTrue:[
-		    lineString := (lineString copyFrom:2) withoutSpaces.
+        (lineString size > 0) ifTrue:[
+            first := lineString at:1.
+            "/
+            "/ for your convenience: treat ; AND "/ as comment-line
+            "/
+            ((first == $;) or:[lineString startsWith:'"/']) ifFalse:[
+                first == $# ifTrue:[
+                    lineString := (lineString copyFrom:2) withoutSpaces.
 
-		    (lineString startsWith:'if') ifTrue:[
-			skipping ifFalse:[
-			    rest := lineString copyFrom:3.
-			    value := Compiler evaluate:rest compile:false.
-			    (value == #Error) ifTrue:[
-				('ResourcePack [warning]: error in resource:' , lineString) errorPrintCR.
-			    ].
-			    (value == false) ifTrue:[
-				skipping := true
-			    ]
-			].
-			ifLevel := ifLevel + 1
-		    ] ifFalse:[
-			(lineString startsWith:'endif') ifTrue:[
-			    ifLevel := ifLevel - 1.
-			    ifLevel == 0 ifTrue:[
-				skipping := false
-			    ]
-			] ifFalse:[
-			    (lineString startsWith:'else') ifTrue:[
-				skipping := skipping not
-			    ] ifFalse:[
-				skipping ifFalse:[
-				    (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:[
-					    self readFromFile:value directory:dirName
-					]
-				    ] ifFalse:[
-					(lineString startsWith:'encoding') ifTrue:[
-					    rest := lineString copyFrom:9.
-					    encoding := rest withoutSeparators asSymbol
-					]
-				    ]
-				]
-			    ]
-			]
-		    ].
-		] ifFalse:[
-		    skipping ifFalse:[
-			ErrorSignal handle:[:ex |
-			    ('ResourcePack [warning]: ''' , ex errorString , '''') errorPrintCR.
-			    ('ResourcePack [info]: line ' , lNo printString , ': ''' , lineString , '''') infoPrintCR.
-			    ok := false.
-			] do:[
-			    self 
-				processLine:lineString 
-				encoding:encoding 
-				file:(inStream isFileStream 
-					ifTrue:[inStream pathName]
-					ifFalse:['---'])
-			]
-		    ]
-		]
-	    ]
-	]
+                    (lineString startsWith:'if') ifTrue:[
+                        skipping ifFalse:[
+                            rest := lineString copyFrom:3.
+                            value := Compiler evaluate:rest compile:false.
+                            (value == #Error) ifTrue:[
+                                ('ResourcePack [warning]: error in resource:' , lineString) errorPrintCR.
+                            ].
+                            (value == false) ifTrue:[
+                                skipping := true
+                            ]
+                        ].
+                        ifLevel := ifLevel + 1
+                    ] ifFalse:[
+                        (lineString startsWith:'endif') ifTrue:[
+                            ifLevel := ifLevel - 1.
+                            ifLevel == 0 ifTrue:[
+                                skipping := false
+                            ]
+                        ] ifFalse:[
+                            (lineString startsWith:'else') ifTrue:[
+                                skipping := skipping not
+                            ] ifFalse:[
+                                skipping ifFalse:[
+                                    (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:[
+                                            self readFromFile:value directory:dirName
+                                        ]
+                                    ] ifFalse:[
+                                        (lineString startsWith:'encoding') ifTrue:[
+                                            rest := lineString copyFrom:9.
+                                            encoding := rest withoutSeparators asSymbol
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ].
+                ] ifFalse:[
+                    skipping ifFalse:[
+                        ErrorSignal handle:[:ex |
+                            ('ResourcePack [warning]: ''' , ex errorString , '''') errorPrintCR.
+                            ('ResourcePack [info]: line ' , lNo printString , ': ''' , lineString , '''') infoPrintCR.
+                            ok := false.
+                        ] do:[
+                            self 
+                                processLine:lineString 
+                                encoding:encoding 
+                                file:(inStream isFileStream 
+                                        ifTrue:[inStream pathName]
+                                        ifFalse:['---'])
+                        ]
+                    ]
+                ]
+            ]
+        ]
     ].
     ^ ok
 
@@ -663,6 +663,6 @@
 !ResourcePack class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.48 1998-09-08 20:17:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/ResourcePack.st,v 1.49 1999-02-17 20:09:40 cg Exp $'
 ! !
 ResourcePack initialize!
--- a/RsrcPack.st	Wed Feb 17 13:34:04 1999 +0100
+++ b/RsrcPack.st	Wed Feb 17 21:09:40 1999 +0100
@@ -575,84 +575,84 @@
     skipping := false.
     lNo := 0.
     [inStream atEnd] whileFalse:[
-	lineString := inStream nextLine. lNo := lNo + 1.
-	[lineString notNil and:[lineString endsWith:$\]] whileTrue:[
-	    lineString := lineString copyWithoutLast:1.
-	    l := inStream nextLine. lNo := lNo + 1.
-	    l notNil ifTrue:[
-		lineString := lineString , l.
-	    ].
-	].
+        lineString := inStream nextLine. lNo := lNo + 1.
+        [lineString notNil and:[lineString endsWith:$\]] whileTrue:[
+            lineString := lineString copyWithoutLast:1.
+            l := inStream nextLine. lNo := lNo + 1.
+            l notNil ifTrue:[
+                lineString := lineString , l.
+            ].
+        ].
 
-	(lineString notNil and:[lineString isEmpty not]) ifTrue:[
-	    first := lineString at:1.
-	    "/
-	    "/ for your convenience: treat ; AND "/ as comment-line
-	    "/
-	    ((first == $;) or:[lineString startsWith:'"/']) ifFalse:[
-		first == $# ifTrue:[
-		    lineString := (lineString copyFrom:2) withoutSpaces.
+        (lineString size > 0) ifTrue:[
+            first := lineString at:1.
+            "/
+            "/ for your convenience: treat ; AND "/ as comment-line
+            "/
+            ((first == $;) or:[lineString startsWith:'"/']) ifFalse:[
+                first == $# ifTrue:[
+                    lineString := (lineString copyFrom:2) withoutSpaces.
 
-		    (lineString startsWith:'if') ifTrue:[
-			skipping ifFalse:[
-			    rest := lineString copyFrom:3.
-			    value := Compiler evaluate:rest compile:false.
-			    (value == #Error) ifTrue:[
-				('ResourcePack [warning]: error in resource:' , lineString) errorPrintCR.
-			    ].
-			    (value == false) ifTrue:[
-				skipping := true
-			    ]
-			].
-			ifLevel := ifLevel + 1
-		    ] ifFalse:[
-			(lineString startsWith:'endif') ifTrue:[
-			    ifLevel := ifLevel - 1.
-			    ifLevel == 0 ifTrue:[
-				skipping := false
-			    ]
-			] ifFalse:[
-			    (lineString startsWith:'else') ifTrue:[
-				skipping := skipping not
-			    ] ifFalse:[
-				skipping ifFalse:[
-				    (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:[
-					    self readFromFile:value directory:dirName
-					]
-				    ] ifFalse:[
-					(lineString startsWith:'encoding') ifTrue:[
-					    rest := lineString copyFrom:9.
-					    encoding := rest withoutSeparators asSymbol
-					]
-				    ]
-				]
-			    ]
-			]
-		    ].
-		] ifFalse:[
-		    skipping ifFalse:[
-			ErrorSignal handle:[:ex |
-			    ('ResourcePack [warning]: ''' , ex errorString , '''') errorPrintCR.
-			    ('ResourcePack [info]: line ' , lNo printString , ': ''' , lineString , '''') infoPrintCR.
-			    ok := false.
-			] do:[
-			    self 
-				processLine:lineString 
-				encoding:encoding 
-				file:(inStream isFileStream 
-					ifTrue:[inStream pathName]
-					ifFalse:['---'])
-			]
-		    ]
-		]
-	    ]
-	]
+                    (lineString startsWith:'if') ifTrue:[
+                        skipping ifFalse:[
+                            rest := lineString copyFrom:3.
+                            value := Compiler evaluate:rest compile:false.
+                            (value == #Error) ifTrue:[
+                                ('ResourcePack [warning]: error in resource:' , lineString) errorPrintCR.
+                            ].
+                            (value == false) ifTrue:[
+                                skipping := true
+                            ]
+                        ].
+                        ifLevel := ifLevel + 1
+                    ] ifFalse:[
+                        (lineString startsWith:'endif') ifTrue:[
+                            ifLevel := ifLevel - 1.
+                            ifLevel == 0 ifTrue:[
+                                skipping := false
+                            ]
+                        ] ifFalse:[
+                            (lineString startsWith:'else') ifTrue:[
+                                skipping := skipping not
+                            ] ifFalse:[
+                                skipping ifFalse:[
+                                    (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:[
+                                            self readFromFile:value directory:dirName
+                                        ]
+                                    ] ifFalse:[
+                                        (lineString startsWith:'encoding') ifTrue:[
+                                            rest := lineString copyFrom:9.
+                                            encoding := rest withoutSeparators asSymbol
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ].
+                ] ifFalse:[
+                    skipping ifFalse:[
+                        ErrorSignal handle:[:ex |
+                            ('ResourcePack [warning]: ''' , ex errorString , '''') errorPrintCR.
+                            ('ResourcePack [info]: line ' , lNo printString , ': ''' , lineString , '''') infoPrintCR.
+                            ok := false.
+                        ] do:[
+                            self 
+                                processLine:lineString 
+                                encoding:encoding 
+                                file:(inStream isFileStream 
+                                        ifTrue:[inStream pathName]
+                                        ifFalse:['---'])
+                        ]
+                    ]
+                ]
+            ]
+        ]
     ].
     ^ ok
 
@@ -663,6 +663,6 @@
 !ResourcePack class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Attic/RsrcPack.st,v 1.48 1998-09-08 20:17:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Attic/RsrcPack.st,v 1.49 1999-02-17 20:09:40 cg Exp $'
 ! !
 ResourcePack initialize!
hg/stx-libview