WebSVN – Kolibri OS – Diff – /programs/develop/cedit/SRC/Text.ob07

 VAR
     ext: RW.tFileName;
 BEGIN
     text.fileName := name;
     U.getFileName(name, ext, ".");
-    U.upcase(ext);
+    U.lowcase8(ext);
     setLang(text, Lang.getLang(ext))
 END setName;
         ProcessComments(line, depth, i, 0, line.length - 1, text.lang);
         PrintLex(text, line, lexStart, i, y, color, backColor)
     END PrintComment;
-    PROCEDURE cap (c: WCHAR): WCHAR;
+    PROCEDURE upper (c: WCHAR): WCHAR;
     BEGIN
-        IF U.cap(c) THEN END
+        IF U.upper(c) THEN END
         RETURN c
-    END cap;
+    END upper;
     PROCEDURE UL (c: WCHAR): BOOLEAN;
-        RETURN (cap(c) = "U") OR (cap(c) = "L")
+        RETURN (upper(c) = "U") OR (upper(c) = "L")
     END UL;
             c := Lines.getChar(line, i);
         END;
         DEC(i);
         lexLen := getString(line, first, i - first + 1, s);
         IF ~cs THEN
-            U.upcase16(s)
+            U.lowcase(s)
         END;
         IF Lang.isKey(s, text.lang, 1) THEN
             color := colors.key1
         ELSIF Lang.isKey(s, text.lang, 2) THEN
             color := colors.key2
             ELSIF U.isDigit(c) THEN
                 hex := FALSE;
                 k := i;
                 INC(i);
                 c := Lines.getChar(line, i);
-                IF (cap(c) = "X") & (Lines.getChar(line, i - 1) = "0") THEN
+                IF (upper(c) = "X") & (Lines.getChar(line, i - 1) = "0") THEN
                     INC(i);
                     hex := TRUE
                 END;
-                WHILE U.isHex(cap(Lines.getChar(line, i))) DO
+                WHILE U.isHex(upper(Lines.getChar(line, i))) DO
                     INC(i)
                 END;
-                IF (cap(Lines.getChar(line, i)) = "H") & ~hex THEN
+                IF (upper(Lines.getChar(line, i)) = "H") & ~hex THEN
                     INC(i)
                 END;
 	                c := Lines.getChar(line, i);
 	                IF c = "." THEN
 	                    DEC(i);
 	                    c := Lines.getChar(line, i)
 	                END;
-	                IF (cap(c) = "X") & (Lines.getChar(line, i - 1) = "0") THEN
+	                IF (upper(c) = "X") & (Lines.getChar(line, i - 1) = "0") THEN
 	                    REPEAT
 	                        INC(i);
 	                        c := Lines.getChar(line, i)
-	                    UNTIL ~U.isHex(cap(c));
+	                    UNTIL ~U.isHex(upper(c));
 	                    IF UL(c) THEN
 	                        INC(i)
 	                    END
 	                ELSIF UL(c) THEN
 	                    INC(i)
 	                        INC(i);
 	                        WHILE U.isDigit(Lines.getChar(line, i)) DO
 	                            INC(i)
 	                        END;
 	                        c := Lines.getChar(line, i);
-	                        IF cap(c) = "E" THEN
+	                        IF upper(c) = "E" THEN
 	                            INC(i);
 	                            c := Lines.getChar(line, i);
 	                            IF (c = "+") OR (c = "-") THEN
 	                                INC(i)
 	                            END;
 	            ELSIF (c = "'") OR (c = '"') THEN
 	                String(text, line, i, y, backColor);
 	                cond := 0
 	            ELSIF U.isDigit(c) THEN
 	                k := i;
-	                IF (c = "0") & (cap(Lines.getChar(line, i + 1)) = "X") THEN
+	                IF (c = "0") & (upper(Lines.getChar(line, i + 1)) = "X") THEN
 	                    isDgt := U.isHex;
 	                    hex := TRUE;
 	                    INC(i, 2)
 	                ELSE
 	                    isDgt := U.isDigit;
 	                    hex := FALSE
 	                END;
-	                WHILE isDgt(cap(Lines.getChar(line, i))) DO
+	                WHILE isDgt(upper(Lines.getChar(line, i))) DO
 	                    INC(i)
 	                END;
 	                IF Lines.getChar(line, i) = "." THEN
 	                    INC(i);
 	                    IF Lines.getChar(line, i) = "." THEN
 	                        DEC(i)
 	                    END;
-	                    WHILE isDgt(cap(Lines.getChar(line, i))) DO
+	                    WHILE isDgt(upper(Lines.getChar(line, i))) DO
 	                        INC(i)
 	                    END
 	                END;
-	                IF (cap(Lines.getChar(line, i)) = "E") OR hex & (cap(Lines.getChar(line, i)) = "P") THEN
+	                IF (upper(Lines.getChar(line, i)) = "E") OR hex & (upper(Lines.getChar(line, i)) = "P") THEN
 	                    INC(i);
 	                    IF (Lines.getChar(line, i) = "-") OR (Lines.getChar(line, i) = "+") THEN
 	                        INC(i)
 	                    END;
-	                    WHILE isDgt(cap(Lines.getChar(line, i))) DO
+	                    WHILE isDgt(upper(Lines.getChar(line, i))) DO
 	                        INC(i)
 	                    END
 	                END;
 	                DEC(i);
 	                PrintLex(text, line, k, i, y, colors.num, backColor);
 	                ELSE
 	                    color := colors.num
 	                END;
 	                k := i;
 	                INC(i);
-	                WHILE U.isHex(cap(Lines.getChar(line, i))) DO
+	                WHILE U.isHex(upper(Lines.getChar(line, i))) DO
 	                    INC(i)
 	                END;
 	                DEC(i);
 	                PrintLex(text, line, k, i, y, color, backColor);
 	                cond := 0
 	                        DEC(i)
 	                    END;
 	                    WHILE U.isDigit(Lines.getChar(line, i)) DO
 	                        INC(i)
 	                    END;
-	                    IF cap(Lines.getChar(line, i)) = "E" THEN
+	                    IF upper(Lines.getChar(line, i)) = "E" THEN
 	                        INC(i);
 	                        IF (Lines.getChar(line, i) = "-") OR (Lines.getChar(line, i) = "+") THEN
 	                            INC(i)
 	                        END;
 	                        WHILE U.isDigit(Lines.getChar(line, i)) DO
 	END;
 	text.whole := whole;
 	text.cs := cs;
 	text.searchText := s;
 	IF ~cs THEN
-		U.upcase16(text.searchText)
+		U.lowcase(text.searchText)
 	END;
 	IF text.searchText # "" THEN
 		plainText := plain(text);
 		idxData := Search.index(plainText, cs);
 		Search.find(plainText, text.searchText, whole, text.foundList);
     WHILE (i >= 0) & U.isLetter(Lines.getChar(line, i)) DO
         DEC(i)
     END;
     IF upper THEN
-    	func := U.cap
+    	func := U.upper
     ELSE
-    	func := U.low
+    	func := U.lower
     END;
     IF Lines.convert(line, i + 1, text.cursor.X - 1, func) THEN
         first := getLine2(text, selBeg.Y);
         line := first;
         cnt := selEnd.Y - selBeg.Y;
 	    IF upper THEN
-	    	func := U.cap
+	    	func := U.upper
 	    ELSE
-	    	func := U.low
+	    	func := U.lower
 	    END;
         IF cnt = 0 THEN
 END setPadding;
 PROCEDURE draw* (text: tText);
 VAR
-    y, n, cnt, i, x: INTEGER;
+    y, n, cnt, i, x, pos: INTEGER;
     line, firstLine, lastLine: tLine;
     selBeg, selEnd: tPoint;
-    s: ARRAY 12 OF WCHAR;
-    backColor, numWidth, xNum, wNum: INTEGER;
+    s: ARRAY 12 OF WCHAR;
+    backColor, numWidth, xNum, wNum: INTEGER;
-    p: Search.tPos;
+    guard: tGuard;
-    guard: tGuard;
+    p: Search.tPos;
 BEGIN
     IF text.comments THEN
         Comments(text)
     		firstLine := text.curLine;
     		lastLine := firstLine
     	ELSE
     	    lastLine := getLine2(text, MIN(text.scroll.Y + textsize.Y + 1, text.count) - 1)
         END;
+        i := 0;
         p := text.foundList.first(Search.tPos);
+        pos := Search.next(p, i);
-        WHILE p # NIL DO
+        WHILE pos # -1 DO
         	y := padding.top + inter DIV 2;
         	IF text.smallMove THEN
         		y := y + charHeight*(text.cursor.Y - text.scroll.Y)
             END;
-            IF (firstLine.pos <= p.pos) & (p.pos <= lastLine.pos + lastLine.length) THEN
+            IF (firstLine.pos <= pos) & (pos <= lastLine.pos + lastLine.length) THEN
                 line := firstLine;
-                WHILE (line.pos <= p.pos) & (line # lastLine) DO
+                WHILE (line.pos <= pos) & (line # lastLine) DO
                     NextLine(line);
                     INC(y, charHeight)
                 END;
-                IF (line # lastLine) & (line # firstLine) OR (line = lastLine) & (line.pos > p.pos) THEN
+                IF (line # lastLine) & (line # firstLine) OR (line = lastLine) & (line.pos > pos) THEN
                     PrevLine(line);
                     DEC(y, charHeight)
                 END;
-                x := (p.pos - line.pos - text.scroll.X)*charWidth + padding.left;
+                x := (pos - line.pos - text.scroll.X)*charWidth + padding.left;
                 n := LENGTH(text.searchText)*charWidth;
                 WHILE n > 0 DO
                     IF x >= padding.left THEN
                         G.notVLine(canvas, x, y, y + charHeight - inter)
                     END;
                     INC(x);
                     DEC(n)
                 END
             END;
-            p := p.next(Search.tPos)
+            pos := Search.next(p, i)
         END
     END;
 PROCEDURE findNext* (text: tText; prev: BOOLEAN): BOOLEAN;
-VAR
-    cursorPos, x, y, X, Y, Len: INTEGER;
+VAR
-    p: Search.tPos;
+    cursorPos, x, y, X, Y, Len: INTEGER;
+    line: tLine;
+    res: BOOLEAN;
-    line: tLine;
+    pos, i, pos0: INTEGER;
-    res: BOOLEAN;
+    p: Search.tPos;
 BEGIN
     X := text.cursor.X;
     Y := text.cursor.Y;
+    text.cursor.X := MIN(text.cursor.X, text.curLine.length);
+    cursorPos := text.curLine.pos + text.cursor.X - ORD(prev) - ORD(~prev & (text.foundSel = 0));
-    text.cursor.X := MIN(text.cursor.X, text.curLine.length);
+    pos0 := -1;
+    i := 0;
-    cursorPos := text.curLine.pos + text.cursor.X - ORD(prev) - ORD(~prev & (text.foundSel = 0));
+    p := text.foundList.first(Search.tPos);
+    pos := Search.next(p, i);
-    p := text.foundList.first(Search.tPos);
+    WHILE (pos # -1) & (pos <= cursorPos) DO
-    WHILE (p # NIL) & (p.pos <= cursorPos) DO
+    	pos0 := pos;
-        p := p.next(Search.tPos)
+    	pos := Search.next(p, i)
-    END;
-    IF prev THEN
-        IF p = NIL THEN
+    END;
-            p := text.foundList.last(Search.tPos)
-        ELSE
-            p := p.prev(Search.tPos)
+    IF prev THEN
-        END
+    	pos := pos0
     END;
-    res := p # NIL;
+    res := pos # -1;
     IF res THEN
         y := 0;
         line := text.first(tLine);
-        WHILE (line.pos <= p.pos) & (line.next # NIL) DO
+        WHILE (line.pos <= pos) & (line.next # NIL) DO
             NextLine(line);
             INC(y)
         END;
-        IF (line.next # NIL) OR (line.pos > p.pos) THEN
+        IF (line.next # NIL) OR (line.pos > pos) THEN
             PrevLine(line);
             DEC(y)
         END;
         resetSelect(text);
         searchScroll(text, y);
-        x := p.pos - line.pos;
+        x := pos - line.pos;
         Len := LENGTH(text.searchText);
         IF x + Len > text.scroll.X + textsize.X THEN
             text.scroll.X := MAX(x + Len - textsize.X + 3, 0)
 END replace;
-PROCEDURE replaceAll* (text: tText; s: ARRAY OF WCHAR; n: INTEGER): INTEGER;
-VAR
+PROCEDURE replaceAll* (text: tText; s: ARRAY OF WCHAR; n: INTEGER): INTEGER;
-    p: Search.tPos;
+VAR
+    line: tLine;
-    line: tLine;
+    y, k, d, pos, y0, i, c: INTEGER;
-    y, k, d, pos, y0: INTEGER;
+    p: Search.tPos;
 BEGIN
     resetSelect(text);
     SetPos(text, 0, 0);
     line := text.first(tLine);
     y := 0;
     y0 := -1;
+    k := 0;
+    d := LENGTH(s) - n;
-    k := 0;
+    c := 0;
-    d := LENGTH(s) - n;
+    i := 0;
     p := text.foundList.first(Search.tPos);
-    WHILE p # NIL DO
+    pos := Search.next(p, i);
-        pos := p.pos;
+    WHILE pos # -1 DO
         WHILE (line.pos <= pos) & (line.next # NIL) DO
             NextLine(line);
             INC(y)
             y0 := y
         END;
         SetPos(text, pos - line.pos + k, y);
         text.foundSel := n;
         replace(text, s, n);
+        INC(c);
-        p := p.next(Search.tPos)
+        pos := Search.next(p, i)
     END
-    RETURN text.foundList.count
+    RETURN c
 END replaceAll;

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/Text.ob07 @ 9904 – Rev 9902 → 9903