Changeset 7952

Timestamp:

Dec 26, 2007, 8:02:34 AM (13 years ago)

Author:

gb

Message:

CHAR/SET-CHAR: define in terms of SCHAR.

File:

• branches/working-0711/ccl/level-1/sysutils.lisp (modified) (1 diff)

branches/working-0711/ccl/level-1/sysutils.lisp

@@ -441 +441 @@
   the string, returns the character object representing the character at
   that position in the string."
- (if (stringp string)
-  (aref string index)
-  (report-bad-arg string 'string)))
+  (if (typep string 'simple-string)
+    (schar (the simple-string string) index)
+    (if (stringp string)
+      (multiple-value-bind (data offset) (array-data-and-offset string)
+        (schar (the simple-string data) (+ index offset)))
+      (report-bad-arg string 'string))))
 
 (defun set-char (string index new-el)
-  (if (stringp string)
-    (aset string index new-el)
-    (report-bad-arg string 'string)))
+  (if (typep string 'simple-string)
+    (setf (schar string index) new-el)
+    (if (stringp string)
+      (multiple-value-bind (data offset) (array-data-and-offset string)
+        (setf (schar (the simple-string data) (+ index offset)) new-el))
+      (report-bad-arg string 'string))))
 
 (defun equalp (x y)