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

[vvoutilainen at common-lisp.net]

Author: vvoutilainen
Date: Sun Jan 13 02:29:06 2013
New Revision: 14351

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

Modified:
   trunk/abcl/src/org/armedbear/lisp/LispCharacter.java

Modified: trunk/abcl/src/org/armedbear/lisp/LispCharacter.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/LispCharacter.java	Sun Jan  6 10:19:42 2013	(r14350)
+++ trunk/abcl/src/org/armedbear/lisp/LispCharacter.java	Sun Jan 13 02:29:06 2013	(r14351)
@@ -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();