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

     BUF_SIZE = 65536;
-    NAME_LEN = 1024;
-    EOL_CRLF* = 0; EOL_LF* = 1; EOL_CR* = 2;
+    NAME_LEN = 1024;
 TYPE
-    tFileName* = ARRAY NAME_LEN OF CHAR;
+TYPE
-    tEOL = ARRAY 3 OF WCHAR;
+    tFileName* = ARRAY NAME_LEN OF CHAR;
     tOutput* = POINTER TO RECORD
         handle:   File.FS;
         buffer:   ARRAY BUF_SIZE OF BYTE;
         pos:      INTEGER;
-        eol:      tEOL;
+        eol:      E.tEOL;
         putChar:  PROCEDURE (file: tOutput; code: INTEGER);
         error:    BOOLEAN
-    END;
-VAR
-    eol*: ARRAY 3 OF tEOL;
-    eolNames*: ARRAY 3, 16 OF WCHAR;
+    END;
 PROCEDURE getByte (file: tInput): BYTE;
 VAR
         DEC(b, 0C0H);
         n := 1
     ELSIF (0E0H <= b) & (b <= 0EFH) THEN
         DEC(b, 0E0H);
         n := 2
+    ELSE
+    	n := -1
-    ELSIF (0F0H <= b) & (b <= 0F7H) THEN
+(*    ELSIF (0F0H <= b) & (b <= 0F7H) THEN
         DEC(b, 0F0H);
         n := 3
     ELSIF (0F8H <= b) & (b <= 0FBH) THEN
         DEC(b, 0F8H);
         n := 4
         b := 0;
         n := 6
     ELSIF b = 0FFH THEN
         n := -1
     ELSIF (080H <= b) & (b <= 0BFH) THEN
-        n := -1
+        n := -1*)
     END;
     code := b;
 (*
     IF n > 2 THEN
         n := -1
     END;
 *)
     WHILE n > 0 DO
         DEC(n);
         b := peakByte(file);
         IF (080H <= b) & (b <= 0BFH) THEN
 PROCEDURE getCharCP866 (file: tInput): INTEGER;
     RETURN E.cp866[getByte(file)]
 END getCharCP866;
 (*
 PROCEDURE getCharUTF16LE (file: tInput): INTEGER;
     RETURN getByte(file) + getByte(file) * 256
 END getCharUTF16LE;
 *)
 PROCEDURE getString* (file: tInput; line: Lines.tLine; tabs: BOOLEAN; VAR eol: BOOLEAN): INTEGER;
 	res := -1;
 	pos := text.pos;
 	cnt := text.cnt;
 	WHILE (text.cnt > 0) & (res = -1) DO
 		c := text.getChar(text);
-		IF c = 10 THEN
+		IF CHR(c) = LF THEN
-			res := EOL_LF
+			res := E.EOL_LF
-		ELSIF c = 13 THEN
+		ELSIF CHR(c) = CR THEN
-			IF text.getChar(text) = 10 THEN
+			IF CHR(text.getChar(text)) = LF THEN
-				res := EOL_CRLF
+				res := E.EOL_CRLF
 			ELSE
-				res := EOL_CR
+				res := E.EOL_CR
 			END
 		END
 	END;
 	text.cnt := cnt;
 	text.pos := pos;
 	IF res = -1 THEN
-		res := EOL_CRLF
+		res := E.EOL_CRLF
 	END
 	RETURN res
 END detectEOL;
     END;
     IF res.buffer = 0 THEN
         DISPOSE(res)
     ELSE
         enc := detectEncoding(res);
-        IF (enc = E.UTF8BOM) OR (enc = E.UTF8) THEN
+        IF enc IN {E.UTF8BOM, E.UTF8} THEN
             res.getChar := getCharUTF8
         ELSIF enc = E.CP866 THEN
             res.getChar := getCharCP866
         ELSIF enc = E.W1251 THEN
             res.getChar := getCharW1251
     i: INTEGER;
     c: WCHAR;
 BEGIN
     FOR i := 0 TO n - 1 DO
         c := Lines.getChar(line, i);
-        IF c = Lines.TAB1 THEN
-        	(* nothing to do *)
-        ELSIF c = Lines.NUL THEN
+        IF c = Lines.NUL THEN
         	file.putChar(file, 0)
-        ELSE
+        ELSIF c # Lines.TAB1 THEN
         	file.putChar(file, ORD(c))
         END
     END
 END putString;
     	putByte(file, ORD("?"))
     END
 END putCharUTF8;
-PROCEDURE putCharW1251 (file: tOutput; code: INTEGER);
+PROCEDURE putCharCP (file: tOutput; code, cp: INTEGER);
 VAR
     n: INTEGER;
 BEGIN
-    n := E.UNI[code, E.W1251];
+    n := E.UNI[code, cp];
     IF n # E.UNDEF THEN
         putByte(file, n)
     ELSE
+        putByte(file, ORD("?"))
+    END
+END putCharCP;
+PROCEDURE putCharW1251 (file: tOutput; code: INTEGER);
-        putByte(file, ORD("?"))
+BEGIN
-    END
+	putCharCP(file, code, E.W1251)
-END putCharW1251;
 END putCharW1251;
-PROCEDURE putCharCP866 (file: tOutput; code: INTEGER);
-VAR
-    n: INTEGER;
-BEGIN
-    n := E.UNI[code, E.CP866];
-    IF n # E.UNDEF THEN
         putByte(file, n)
-    ELSE
+PROCEDURE putCharCP866 (file: tOutput; code: INTEGER);
-    	putByte(file, ORD("?"))
+BEGIN
-    END
+	putCharCP(file, code, E.CP866)
 END putCharCP866;
 (*
 PROCEDURE putCharUTF16LE (file: tOutput; code: INTEGER);
 BEGIN
     IF ~((0 <= code) & (code <= 65535)) THEN
     	code := ORD("?")
     END;
     putByte(file, code MOD 256);
 VAR
     res: tOutput;
 BEGIN
     NEW(res);
     res.pos := 0;
-    res.eol := eol[nl];
+    res.eol := E.eol[nl];
     res.putChar := NIL;
-    IF (enc = E.UTF8) OR (enc = E.UTF8BOM) THEN
+    IF enc IN {E.UTF8BOM, E.UTF8} THEN
-        res.putChar := putCharUTF8;
         IF enc = E.UTF8BOM THEN
-            res.putChar(res, ORD(BOM))
+            putCharUTF8(res, ORD(BOM))
-        END
+        END;
+        res.putChar := putCharUTF8
-    ELSIF enc = E.UTF16LE THEN
+    (*ELSIF enc = E.UTF16LE THEN
-        res.putChar := putCharUTF16LE;
+        res.putChar := putCharUTF16LE*)
     ELSIF enc = E.W1251 THEN
         res.putChar := putCharW1251
     ELSIF enc = E.CP866 THEN
         res.putChar := putCharCP866
     END;
         DISPOSE(file)
     END
 END destroy;
-BEGIN
-    eol[EOL_CRLF] := CR + LF;
-    eol[EOL_LF] := LF;
-    eol[EOL_CR] := CR;
-    eolNames[EOL_CRLF] := "CRLF";
     eolNames[EOL_LF] := "LF";
     eolNames[EOL_CR] := "CR"

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/RW.ob07 – Rev 9560 → 9659