ListView.st
changeset 770 a41466e3dfaa
parent 721 4a01084cf643
child 776 007d1d3463cf
--- a/ListView.st	Sun Jun 30 12:35:55 1996 +0200
+++ b/ListView.st	Sun Jun 30 12:37:40 1996 +0200
@@ -2900,7 +2900,9 @@
      the last col of the blank-block.
      Return 0 if we should wrap to next line (for spaces)"
 
-    |endCol thisCharacter len|
+    |endCol "{ Class: SmallInteger }"
+     len    "{ Class: SmallInteger }"
+     thisCharacter|
 
     endCol := selectCol.
     endCol == 0 ifTrue:[endCol := 1].
@@ -2941,8 +2943,13 @@
      found evaluate block2.
      Sorry, but pattern is no regular expression pattern (yet)"
 
-    |lineString col cc found firstChar patternSize 
-     line1 "{Class: SmallInteger}"|
+    |lineString 
+     found firstChar 
+     col         "{ Class: SmallInteger }"
+     cc          "{ Class: SmallInteger }"
+     patternSize "{ Class: SmallInteger }"
+     line1       "{ Class: SmallInteger }"
+     lineSize    "{ Class: SmallInteger }" |
 
     patternSize := pattern size.
     (list notNil and:[patternSize ~~ 0]) ifTrue:[
@@ -2951,13 +2958,14 @@
             col := startCol - 1.
             firstChar := pattern at:1.
             col > (list at:startLine) size ifTrue:[
-                col := nil
+                col := -999
             ].
             line1 := startLine.
             line1 to:1 by:-1 do:[:lnr |
                 lineString := list at:lnr.
                 lineString notNil ifTrue:[
-                    col isNil ifTrue:[col := lineString size - patternSize + 1].
+		    lineSize := lineString size.
+                    col == -999 ifTrue:[col := lineSize - patternSize + 1].
                     [(col > 0) and:[(lineString at:col) ~= firstChar]] whileTrue:[
                         col := col - 1
                     ].
@@ -2965,7 +2973,7 @@
                         cc := col.
                         found := true.
                         1 to:patternSize do:[:cnr |
-                            cc > lineString size ifTrue:[
+                            cc > lineSize ifTrue:[
                                 found := false
                             ] ifFalse:[
                                 (pattern at:cnr) ~= (lineString at:cc) ifTrue:[
@@ -2983,7 +2991,7 @@
                         ]
                     ]
                 ].
-                col := nil
+                col := -999.
             ]
         ]
     ].
@@ -3254,5 +3262,5 @@
 !ListView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.94 1996-05-29 14:36:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.95 1996-06-30 10:37:02 cg Exp $'
 ! !