Changeset 5188

Timestamp:

Sep 9, 2006, 3:21:37 AM (18 years ago)

Author:

Gary Byers

Message:

NAME-CHAR: insist on something more reasonable for ^{c syntax; don't do MOD for octal.}

File:

• trunk/ccl/level-1/l1-reader.lisp (modified) (2 diffs)

trunk/ccl/level-1/l1-reader.lisp

@@ -81 +81 @@
               (char name 0)
               (if (and (= namelen 2) (eq (char name 0) #\^))
-                (code-char (the fixnum (logxor (the fixnum (char-code (char-upcase (char name 1)))) #x40)))
+                (let* ((c1 (char-code (char-upcase (char name 1)))))
+                  (if (and (>= c1 64) (< c1 96))
+                    (code-char (the fixnum (logxor (the fixnum (char-code (char-upcase (char name 1)))) #x40)))))
                 (let* ((n 0))
                   (or
@@ -99 +101 @@
                              (setq n 0)
                              (return))))))
-                   (dotimes (i namelen (code-char (mod n char-code-limit)))
+                   (dotimes (i namelen (if (< n char-code-limit)
+                                         (code-char n)))
                      (let* ((code (the fixnum (- (the fixnum (char-code (char name i)))
                                                  (char-code #\0)))))