Changeset 40a3e1a in tol

Timestamp:

May 27, 2009, 7:28:05 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

1308348

Parents:

830be0c

Message:

Fixing control of CRLF

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1042 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/bbasic/txtalgeb.cpp (modified) (6 diffs)

tol/bbasic/txtalgeb.cpp

@@ -1521 +1521 @@
 }
 
+#define READ_CRLF_AS_LF 
+
 
 //--------------------------------------------------------------------
@@ -1543 +1545 @@
   length_ = 0;
   BChar ch  = ' ';
+  bool untilIsLF = until=='\n';
   for(;(length_<=maxChars)&&(ch!=until)&&(ch!='\0')&&(!is.eof()); length_++)
   {
     is.get(ch);
+#   ifdef READ_CRLF_AS_LF
+    if(untilIsLF && (ch == '\r')&&(!is.eof()))
+    {
+      is.get(ch);
+      if(ch!='\n') { is.unget(); ch = '\r'; }
+    }
+#   endif
     buffer_[length_] = ch;
   }
@@ -1574 +1584 @@
   }
   length_ = 0;
-  BChar ch  = ' ';
+  BChar ch  = ' ', c;
+  bool untilIsLF = until=='\n';
   for(;(length_<=maxChars)&&(ch!=until)&&(ch!='\0')&&(!feof(file)); length_++)
   {
     ch = fgetc(file);
+#   ifdef READ_CRLF_AS_LF
+    if(untilIsLF && (ch == '\r')&&(!feof(file)))
+    {
+      ch = fgetc(file);
+      if(ch!='\n') { ungetc(c, file); ch = '\r'; }
+    }
+#   endif
     buffer_[length_] = ch;
   }
@@ -1583 +1601 @@
   if(ch=='\0')  { length_--; }
   buffer_[length_] = '\0';
-
 }
 
@@ -1663 +1680 @@
   txt.ReallocateBuffer(size);
   BInt n=-1;
+  char ch;
   do
   {
@@ -1672 +1690 @@
       txt.ReallocateBuffer(size);
     }
-    txt.PutChar(n,(BChar)is.get());
+    ch = (BChar)is.get();
+#   ifdef READ_CRLF_AS_LF
+    if((ch == '\r')&&(!is.eof()))
+    {
+      ch = is.get();
+      if(ch!='\n') { is.unget(); ch = '\r'; }
+    }
+#   endif
+    txt.PutChar(n,ch);
   }
   while(!(is.eof()) && (txt.String()[n]!=end));