From e46eacc852aacf74de6d98ed5aad9249f41eabb0 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Thu, 30 Dec 2010 08:50:00 +0000
Subject: 	* interp/vmlisp.lisp (QSTRING): Remove. 
 (QSTRINGLENGTH): Likewise. 	(STRINGLENGTH): Likewise. 	*
 interp/g-opt.boot ($VMsideEffectFreeOperators): Include %i2s. 	*
 interp/g-util.boot: Expand it. 	* interp/debug.lisp (/LOCATE): Replace
 STRINGLENGTH with LENGTH. 	* algebra/fortran.spad.pamphlet: Don't use
 STRINGIMAGE from Lisp. 	* algebra/generic.spad.pamphlet: Likewise. 
 * algebra/naalg.spad.pamphlet: Likewise. 	*
 algebra/naalgc.spad.pamphlet: Likewise. 	*
 algebra/outform.spad.pamphlet: Likewise. 	*
 algebra/string.spad.pamphlet: Likewise.

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

(limited to 'src/algebra/strap')

diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp
index f528d6be..32e4f83b 100644
--- a/src/algebra/strap/INT.lsp
+++ b/src/algebra/strap/INT.lsp
@@ -98,7 +98,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%String|)
                 |INT;convert;$S;26|)) 
 
-(PUT '|INT;convert;$S;26| '|SPADreplace| 'STRINGIMAGE) 
+(PUT '|INT;convert;$S;26| '|SPADreplace| '|%i2s|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%String|)
                 |INT;latex;$S;27|)) 
@@ -366,10 +366,10 @@
 
 (DEFUN |INT;convert;$S;26| (|x| $)
   (DECLARE (IGNORE $))
-  (STRINGIMAGE |x|)) 
+  (WRITE-TO-STRING |x|)) 
 
 (DEFUN |INT;latex;$S;27| (|x| $)
-  (LET ((|s| (STRINGIMAGE |x|)))
+  (LET ((|s| (WRITE-TO-STRING |x|)))
     (SEQ (COND ((< -1 |x|) (COND ((< |x| 10) (EXIT |s|)))))
          (EXIT (STRCONC "{" (STRCONC |s| "}")))))) 
 
diff --git a/src/algebra/strap/ISTRING.lsp b/src/algebra/strap/ISTRING.lsp
index b6f386f0..60503702 100644
--- a/src/algebra/strap/ISTRING.lsp
+++ b/src/algebra/strap/ISTRING.lsp
@@ -187,7 +187,7 @@
     (RETURN
       (LET ((|l| (- (SPADCALL |sg| (|getShellEntry| $ 44))
                     (|getShellEntry| $ 6)))
-            (|m| (QCSIZE |s|)) (|n| (QCSIZE |t|))
+            (|m| (LENGTH |s|)) (|n| (LENGTH |t|))
             (|h| (COND
                    ((SPADCALL |sg| (|getShellEntry| $ 45))
                     (- (SPADCALL |sg| (|getShellEntry| $ 46))
@@ -515,12 +515,12 @@
                ((ATOM #4#) (RETURN NIL))
                (T (LET ((|s| (CAR #4#)))
                     (SEQ (|ISTRING;copyInto!;2$I$;29| |t| |s| |i| $)
-                         (EXIT (SETQ |i| (+ |i| (QCSIZE |s|))))))))
+                         (EXIT (SETQ |i| (+ |i| (LENGTH |s|))))))))
              (SETQ #4# (CDR #4#))))
          (EXIT |t|)))) 
 
 (DEFUN |ISTRING;copyInto!;2$I$;29| (|y| |x| |s| $)
-  (LET ((|m| (SPADCALL |x| (|getShellEntry| $ 16))) (|n| (QCSIZE |y|)))
+  (LET ((|m| (SPADCALL |x| (|getShellEntry| $ 16))) (|n| (LENGTH |y|)))
     (SEQ (SETQ |s| (- |s| (|getShellEntry| $ 6)))
          (COND
            ((OR (MINUSP |s|) (< |n| (+ |s| |m|)))
@@ -544,7 +544,7 @@
                (T (- (SPADCALL |s| (|getShellEntry| $ 47))
                      (|getShellEntry| $ 6))))))
     (SEQ (COND
-           ((OR (MINUSP |l|) (NOT (< |h| (QCSIZE |s|))))
+           ((OR (MINUSP |l|) (NOT (< |h| (LENGTH |s|))))
             (EXIT (|error| "index out of bound"))))
          (EXIT (SUBSTRING |s| |l| (MAX 0 (+ (- |h| |l|) 1))))))) 
 
@@ -625,7 +625,7 @@
                                         (T
                                          (SEQ
                                           (SETQ |i|
-                                           (+ |i| (QCSIZE |s|)))
+                                           (+ |i| (LENGTH |s|)))
                                           (SETQ |p| |q|)
                                           (EXIT
                                            (SETQ |q|
-- 
cgit v1.2.3