Changeset 271

Timestamp:

Jan 13, 2004, 4:46:11 PM (21 years ago)

Author:

Gary Byers

Message:

Add an IN-PACKAGE. PARSE-INTEGER signals PARSE-ERRORs.

File:

• trunk/ccl/lib/read.lisp (modified) (4 diffs)

trunk/ccl/lib/read.lisp

@@ -15 +15 @@
 ;;;   http://opensource.franz.com/preamble.html
 
+(in-package "CCL")
 
 (define-condition simple-reader-error (reader-error simple-error) ()
@@ -124 +125 @@
 (defun parse-integer (string &key (start 0) end
                       (radix 10) junk-allowed)
-  (when (null end)
-    (setq end (length string)))
-  (let ((index (do ((i start (1+ i)))
-                   ((= i end)
-                    (if junk-allowed
+  (flet ((parse-integer-not-integer-string (s)
+           (error 'parse-integer-not-integer-string :string s)))
+    (declare (inline not-integer-string-error))
+    (when (null end)
+      (setq end (length string)))
+    (let ((index (do ((i start (1+ i)))
+                     ((= i end)
+                      (if junk-allowed
                         (return-from parse-integer (values nil end))
-                        (error "Not an integer string: ~S." string)))
+                        (parse-integer-not-integer-string string)))
                    (unless (whitespacep (char string i)) (return i))))
         (minusp nil)
@@ -153 +157 @@
                      (until (eq (setq index (1+ index)) end)
                        (unless (whitespacep (char string index))
-                         (error "Not an integer string: ~S." string)))
+                         (parse-integer-not-integer-string string)))
                      (return nil))
                     (t
-                     (error "Not an integer string: ~S." string))))
+                     (parse-integer-not-integer-string string))))
          (setq index (1+ index)))
        (values
@@ -163 +167 @@
             (if junk-allowed
                 nil
-                (error "Not an integer string: ~S." string)))
-        index)))
+                (parse-integer-not-integer-string string)))
+        index))))