From b06db52e69e3a7b7f4bd90ac129ea369be45284a Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Fri, 31 Dec 2010 15:20:08 +0000
Subject: 	* interp/g-opt.boot ($VMsideEffectFreeOperators): Include %cup
 and 	%cdown. 	* interp/g-util.boot: Expand them. 	*
 interp/vmlisp.lisp (QESET): Remove. 	* algebra/string.spad.pamphlet
 (String): Don't use QESET.

---
 src/algebra/strap/CHAR.lsp    | 4 ++--
 src/algebra/strap/ISTRING.lsp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/algebra/strap')

diff --git a/src/algebra/strap/CHAR.lsp b/src/algebra/strap/CHAR.lsp
index a36914df..76abf4fe 100644
--- a/src/algebra/strap/CHAR.lsp
+++ b/src/algebra/strap/CHAR.lsp
@@ -135,12 +135,12 @@
 (DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) |%Char|)
                 |CHAR;upperCase;2$;32|)) 
 
-(PUT '|CHAR;upperCase;2$;32| '|SPADreplace| 'CHAR-UPCASE) 
+(PUT '|CHAR;upperCase;2$;32| '|SPADreplace| '|%cup|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) |%Char|)
                 |CHAR;lowerCase;2$;33|)) 
 
-(PUT '|CHAR;lowerCase;2$;33| '|SPADreplace| 'CHAR-DOWNCASE) 
+(PUT '|CHAR;lowerCase;2$;33| '|SPADreplace| '|%cdown|) 
 
 (DEFUN |CHAR;=;2$B;1| (|a| |b| $)
   (DECLARE (IGNORE $))
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index 1b686d19..36f22984 100644
--- a/src/algebra/strap/ISTRING.lsp
+++ b/src/algebra/strap/ISTRING.lsp
@@ -214,21 +214,21 @@
                (LOOP
                  (COND
                    ((> |i| #1#) (RETURN NIL))
-                   (T (SEQ (QESET |r| |k| (CHAR |s| |i|))
+                   (T (SEQ (SETF (CHAR |r| |k|) (CHAR |s| |i|))
                            (EXIT (SETQ |k| (+ |k| 1))))))
                  (SETQ |i| (+ |i| 1))))
              (LET ((|i| 0) (#2=#:G1511 (- |n| 1)))
                (LOOP
                  (COND
                    ((> |i| #2#) (RETURN NIL))
-                   (T (SEQ (QESET |r| |k| (CHAR |t| |i|))
+                   (T (SEQ (SETF (CHAR |r| |k|) (CHAR |t| |i|))
                            (EXIT (SETQ |k| (+ |k| 1))))))
                  (SETQ |i| (+ |i| 1))))
              (LET ((|i| (+ |h| 1)) (#3=#:G1512 (- |m| 1)))
                (LOOP
                  (COND
                    ((> |i| #3#) (RETURN NIL))
-                   (T (SEQ (QESET |r| |k| (CHAR |s| |i|))
+                   (T (SEQ (SETF (CHAR |r| |k|) (CHAR |s| |i|))
                            (EXIT (SETQ |k| (+ |k| 1))))))
                  (SETQ |i| (+ |i| 1))))
              (EXIT |r|)))))) 
@@ -238,7 +238,7 @@
          ((OR (< |i| (|getShellEntry| $ 6))
               (< (SPADCALL |s| (|getShellEntry| $ 47)) |i|))
           (|error| "index out of range"))
-         (T (SEQ (QESET |s| (- |i| (|getShellEntry| $ 6)) |c|)
+         (T (SEQ (SETF (CHAR |s| (- |i| (|getShellEntry| $ 6))) |c|)
                  (EXIT |c|)))))) 
 
 (DEFUN |ISTRING;substring?;2$IB;17| (|part| |whole| |startpos| $)
-- 
cgit v1.2.3