[armedbear-cvs] r12601 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Sat Apr 10 17:19:11 2010
New Revision: 12601

Log:
Remove end-of-line translation (for Windows) from the reader;
this is handled at the stream level.

Modified:
   trunk/abcl/src/org/armedbear/lisp/FaslReader.java
   trunk/abcl/src/org/armedbear/lisp/LispReader.java

Modified: trunk/abcl/src/org/armedbear/lisp/FaslReader.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/FaslReader.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/FaslReader.java	Sat Apr 10 17:19:11 2010
@@ -69,24 +69,6 @@
                     sb.append((char)n);
                     continue;
                   }
-                  if (Utilities.isPlatformWindows) {
-                    if (c == '\r') {
-                      n = stream._readChar();
-                      if (n < 0) {
-                        error(new EndOfFile(stream));
-                        // Not reached.
-                        return null;
-                      }
-                      if (n == '\n') {
-                        sb.append('\n');
-                      } else {
-                        // '\r' was not followed by '\n'.
-                        stream._unreadChar(n);
-                        sb.append('\r');
-                      }
-                      continue;
-                    }
-                  }
                   if (c == terminator)
                     break;
                   // Default.

Modified: trunk/abcl/src/org/armedbear/lisp/LispReader.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/LispReader.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/LispReader.java	Sat Apr 10 17:19:11 2010
@@ -96,24 +96,6 @@
                     sb.append((char)n); // ### BUG: Codepoint conversion
                     continue;
                   }
-                  if (Utilities.isPlatformWindows) {
-                    if (c == '\r') {
-                      n = stream._readChar();
-                      if (n < 0) {
-                        error(new EndOfFile(stream));
-                        // Not reached.
-                        return null;
-                      }
-                      if (n == '\n') {
-                        sb.append('\n');
-                      } else {
-                        // '\r' was not followed by '\n'.
-                        stream._unreadChar(n);
-                        sb.append('\r');
-                      }
-                      continue;
-                    }
-                  }
                   if (c == terminator)
                     break;
                   // Default.