[armedbear-cvs] r14353 - branches/1.1.x/src/org/armedbear/lisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Mon Jan 14 01:58:29 2013
New Revision: 14353

Log:
Backport r14351 | vvoutilainen | 2013-01-13 11:29:06 +0100 (Sun, 13 Jan 2013) | 1 line.

Fix 288, add alternative names to name-char for ascii control characters.

Modified:
   branches/1.1.x/src/org/armedbear/lisp/LispCharacter.java

Modified: branches/1.1.x/src/org/armedbear/lisp/LispCharacter.java
==============================================================================
--- branches/1.1.x/src/org/armedbear/lisp/LispCharacter.java	Sun Jan 13 12:05:50 2013	(r14352)
+++ branches/1.1.x/src/org/armedbear/lisp/LispCharacter.java	Mon Jan 14 01:58:29 2013	(r14353)
@@ -560,30 +560,25 @@
             return i;
         } catch (NumberFormatException e) {};
     }
-
-    if (lower.equals("null"))
-      return 0;
     if (lower.equals("nul"))
       return 0;
-    if (lower.equals("bell"))
+    if (lower.equals("bel"))
       return 7;
-    if (lower.equals("backspace"))
+    if (lower.equals("bs"))
       return '\b';
-    if (lower.equals("tab"))
+    if (lower.equals("ht"))
       return '\t';
-    if (lower.equals("linefeed"))
-      return '\n';
-    if (lower.equals("newline"))
+    if (lower.equals("linefeed") || lower.equals("lf")) 
       return '\n';
-    if (lower.equals("page"))
+    if (lower.equals("ff"))
       return '\f';
-    if (lower.equals("return"))
+    if (lower.equals("cr"))
       return '\r';
-    if (lower.equals("escape"))
-        return 27;
-    if (lower.equals("space"))
+    if (lower.equals("esc"))
+      return 27;
+    if (lower.equals("space") || lower.equals("sp"))
       return ' ';
-    if (lower.equals("rubout"))
+    if (lower.equals("rubout") || lower.equals("del"))
       return 127;
     if (lower.startsWith("u")) {
       int length = lower.length();