From 76862a96d4ba24beffa94cfbfbb1c2c8dbd1dd26 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Fri, 31 Dec 2010 09:08:44 +0000
Subject: 	* interp/g-opt.boot ($VMsideEffectFreeOperators): Include new 
 builtin functions %strlt, %streq, %strcopy, and %strconc. 	*
 interp/g-util.boot: Expand them. 	* algebra/string.spad.pamphlet
 (String): Remove uses of 	Lisp-level functions CHAR, EQUAL, CHAR=, ans
 SXHASH.

---
 src/interp/g-util.boot | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src/interp/g-util.boot')

diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index 9f5502b3..fb08a56a 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -349,6 +349,13 @@ expandFlt ['%flt,x,y] ==
 expandFgt ['%fgt,x,y] ==
   expandFlt ['%flt,y,x]
 
+-- String operations  
+expandStreq ['%streq,x,y] ==
+  expandToVMForm ['%not,['%peq,['STRING_=,x,y],'%nil]]
+
+expandStrlt ['%strlt,x,y] ==
+  expandToVMForm ['%not,['%peq,['STRING_<,x,y],'%nil]]
+
 -- Local variable bindings
 expandBind ['%bind,inits,:body] ==
   body := expandToVMForm body
@@ -515,6 +522,9 @@ for x in [
     -- string unary functions
     ['%string?, :'STRINGP],
     ['%strlength, :'LENGTH],
+    ['%schar,     :'CHAR],
+    ['%strconc,   :'STRCONC],
+    ['%strcopy,   :'COPY_-SEQ],
 
     -- general utility
     ['%hash,     :'SXHASH],
@@ -554,6 +564,9 @@ for x in [
    ['%fneg,    :function expandFneg],
    ['%fprec,   :function expandFprec],
 
+   ['%streq,   :function expandStreq],
+   ['%strlt,   :function expandStrlt],
+
    ['%peq,     :function expandPeq],
    ['%before?, :function expandBefore?],
 
-- 
cgit v1.2.3