OpenAxiom: Scientific Computation System

Revision: 1707
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1707&view=rev
Author:   dos-reis
Date:     2010-07-26 00:46:58 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
	* interp/g-opt.boot (oprCond): Replace use of TruthP with direct
	comparison to %true.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/interp/g-opt.boot

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-25 21:53:34 UTC (rev 1706)
+++ trunk/src/ChangeLog	2010-07-26 00:46:58 UTC (rev 1707)
@@ -1,5 +1,10 @@
 2010-07-25  Gabriel Dos Reis  <gdr@...>
 
+	* interp/g-opt.boot (oprCond): Replace use of TruthP with direct
+	comparison to %true.
+
+2010-07-25  Gabriel Dos Reis  <gdr@...>
+
 	* interp/g-opt.boot (optCall): Don't call optimize again.
 	(optCallSpecially): Remove deadcode.
 

Modified: trunk/src/interp/g-opt.boot
===================================================================
--- trunk/src/interp/g-opt.boot	2010-07-25 21:53:34 UTC (rev 1706)
+++ trunk/src/interp/g-opt.boot	2010-07-26 00:46:58 UTC (rev 1707)
@@ -321,7 +321,7 @@
   ["VECTOR",:u]
  
 optCond (x is ['COND,:l]) ==
-  if l is [a,[aa,b]] and TruthP aa and b is ["COND",:c] then
+  if l is [a,[aa,b]] and aa = '%true and b is ["COND",:c] then
     x.rest.rest := c
   if l is [[p1,:c1],[p2,:c2],:.] then
     if (p1 is ['%not,=p2]) or (p2 is ['%not,=p1]) then
@@ -330,7 +330,7 @@
     c1 is ['NIL] and p2 = '%true and first c2 = '%true =>
       p1 is ['%not,p1']=> return p1'
       return ['%not,p1]
-  l is [[p1,:c1],[p2,:c2],[p3,:c3]] and TruthP p3 =>
+  l is [[p1,:c1],[p2,:c2],[p3,:c3]] and p3 = '%true =>
     EqualBarGensym(c1,c3) =>
       ["COND",[['%or,p1,['%not,p2]],:c1],['%true,:c2]]
     EqualBarGensym(c1,c2) => ["COND",[['%or,p1,p2],:c1],['%true,:c3]]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1708
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1708&view=rev
Author:   dos-reis
Date:     2010-07-26 01:47:11 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
	* interp/g-opt.boot (optimize): Remove as no longer used.
	* interp/define.boot (DomainSubstitutionFunction): Use
	simplifyVMForm in lieu of optimize.
	* interp/nruncomp.boot (NRTsetVector4a): Likewise.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/interp/define.boot
    trunk/src/interp/g-opt.boot
    trunk/src/interp/nruncomp.boot

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-26 00:46:58 UTC (rev 1707)
+++ trunk/src/ChangeLog	2010-07-26 01:47:11 UTC (rev 1708)
@@ -1,5 +1,12 @@
 2010-07-25  Gabriel Dos Reis  <gdr@...>
 
+	* interp/g-opt.boot (optimize): Remove as no longer used.
+	* interp/define.boot (DomainSubstitutionFunction): Use
+	simplifyVMForm in lieu of optimize.
+	* interp/nruncomp.boot (NRTsetVector4a): Likewise.
+
+2010-07-25  Gabriel Dos Reis  <gdr@...>
+
 	* interp/g-opt.boot (oprCond): Replace use of TruthP with direct
 	comparison to %true.
 

Modified: trunk/src/interp/define.boot
===================================================================
--- trunk/src/interp/define.boot	2010-07-26 00:46:58 UTC (rev 1707)
+++ trunk/src/interp/define.boot	2010-07-26 01:47:11 UTC (rev 1708)
@@ -1684,7 +1684,7 @@
         cons? $definition and
             isFunctor body.op and 
               body.op ~= $definition.op
-          =>  ['QUOTE,optimize body]
+          =>  ['QUOTE,simplifyVMForm body]
         [Subst(parameters,u) for u in body]
   not (body is ["Join",:.]) => body
   atom $definition => body

Modified: trunk/src/interp/g-opt.boot
===================================================================
--- trunk/src/interp/g-opt.boot	2010-07-26 00:46:58 UTC (rev 1707)
+++ trunk/src/interp/g-opt.boot	2010-07-26 01:47:11 UTC (rev 1708)
@@ -145,9 +145,7 @@
   x.rest := y.rest
   x
 
-++ Like `optimize', except that non-atomic form may be reduced to
-++ to atomic forms.  In particular, the address of the input may
-++ not be the same as that of the output.
+++ Simplify the VM form `x'
 simplifyVMForm x ==
   isAtomicForm x => x
   x.op = 'CLOSEDFN => x
@@ -164,26 +162,6 @@
   for xs in tails x repeat
     xs.first := simplifyVMForm first xs
   x
-
-optimize x ==
-  (opt x; x) where
-    opt x ==
-      atom x => nil
-      (y:= first x)='QUOTE => nil
-      y='CLOSEDFN => nil
-      y is [["XLAM",argl,body],:a] =>
-        optimize rest x
-        argl = "ignore" => x.first := body
-        if not (# argl<= # a) then
-          SAY '"length mismatch in XLAM expression"
-          PRETTYPRINT y
-        x.first := optimize optXLAMCond SUBLIS(pairList(argl,a),body)
-      atom y => optimize rest x
-      if first y="IF" then (x.first := optIF2COND y; y:= first x)
-      op:= GETL(subrname first y,"OPTIMIZE") =>
-        (optimize rest x; x.first := FUNCALL(op,optimize first x))
-      x.first := optimize first x
-      optimize rest x
  
 subrname u ==
   IDENTP u => u
@@ -233,7 +211,7 @@
   if a is ["SEQ",:s,["THROW", =g,u]] then
     changeThrowToExit(s,g)
     a.rest := [:s,["EXIT",u]]
-    ["CATCH",y,a]:= optimize x
+    a := simplifyVMForm a
   if hasNoThrows(a,g) then
     resetTo(x,a)
   else

Modified: trunk/src/interp/nruncomp.boot
===================================================================
--- trunk/src/interp/nruncomp.boot	2010-07-26 00:46:58 UTC (rev 1707)
+++ trunk/src/interp/nruncomp.boot	2010-07-26 01:47:11 UTC (rev 1708)
@@ -557,7 +557,7 @@
 NRTsetVector4a(sig,form,cond) ==
   sig = '$ =>
      domainList :=
-       [optimize COPY comp(d,$EmptyMode,$e).expr or d
+       [simplifyVMForm COPY comp(d,$EmptyMode,$e).expr or d
          for d in $domainShell.4.0]
      $uncondList := append(domainList,$uncondList)
      if isCategoryForm(form,$e) then $uncondList := [form,:$uncondList]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1711
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1711&view=rev
Author:   dos-reis
Date:     2010-07-26 02:49:04 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
	* interp/g-opt.boot (optCond): Simplify newly built COND-expression.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/algebra/strap/DFLOAT.lsp
    trunk/src/algebra/strap/POLYCAT-.lsp
    trunk/src/interp/g-opt.boot

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-26 02:29:37 UTC (rev 1710)
+++ trunk/src/ChangeLog	2010-07-26 02:49:04 UTC (rev 1711)
@@ -1,5 +1,9 @@
 2010-07-25  Gabriel Dos Reis  <gdr@...>
 
+	* interp/g-opt.boot (optCond): Simplify newly built COND-expression.
+
+2010-07-25  Gabriel Dos Reis  <gdr@...>
+
 	* interp/g-opt.boot (optimize): Remove as no longer used.
 	* interp/define.boot (DomainSubstitutionFunction): Use
 	simplifyVMForm in lieu of optimize.

Modified: trunk/src/algebra/strap/DFLOAT.lsp
===================================================================
--- trunk/src/algebra/strap/DFLOAT.lsp	2010-07-26 02:29:37 UTC (rev 1710)
+++ trunk/src/algebra/strap/DFLOAT.lsp	2010-07-26 02:49:04 UTC (rev 1711)
@@ -810,41 +810,33 @@
                 (T 0.0)))
              ((OR (SPADCALL |r| (|getShellEntry| $ 145)) (= |x| 1.0))
               1.0)
-             (T (COND
-                  ((SPADCALL |r| (|getShellEntry| $ 147)) |x|)
-                  (T (SEQ (LETT |n|
-                                (SPADCALL |r| (|getShellEntry| $ 148))
-                                |DFLOAT;**;$F$;88|)
-                          (LETT |d|
-                                (SPADCALL |r| (|getShellEntry| $ 149))
-                                |DFLOAT;**;$F$;88|)
-                          (EXIT (COND
-                                  ((MINUSP |x|)
-                                   (COND
-                                     ((ODDP |d|)
-                                      (COND
-                                        ((ODDP |n|)
-                                         (RETURN-FROM
-                                          |DFLOAT;**;$F$;88|
-                                           (-
-                                            (|DFLOAT;**;$F$;88| (- |x|)
-                                             |r| $))))
-                                        (T
-                                         (RETURN-FROM
-                                          |DFLOAT;**;$F$;88|
-                                           (|DFLOAT;**;$F$;88| (- |x|)
-                                            |r| $)))))
-                                     (T (|error| "negative root"))))
-                                  ((EQL |d| 2)
-                                   (EXPT (|DFLOAT;sqrt;2$;33| |x| $)
-                                    |n|))
-                                  (T (|DFLOAT;**;3$;36| |x|
-                                      (/
-                                       (FLOAT |n|
-                                        |$DoubleFloatMaximum|)
-                                       (FLOAT |d|
-                                        |$DoubleFloatMaximum|))
-                                      $))))))))))))) 
+             ((SPADCALL |r| (|getShellEntry| $ 147)) |x|)
+             (T (SEQ (LETT |n| (SPADCALL |r| (|getShellEntry| $ 148))
+                           |DFLOAT;**;$F$;88|)
+                     (LETT |d| (SPADCALL |r| (|getShellEntry| $ 149))
+                           |DFLOAT;**;$F$;88|)
+                     (EXIT (COND
+                             ((MINUSP |x|)
+                              (COND
+                                ((ODDP |d|)
+                                 (COND
+                                   ((ODDP |n|)
+                                    (RETURN-FROM |DFLOAT;**;$F$;88|
+                                      (-
+                                       (|DFLOAT;**;$F$;88| (- |x|) |r|
+                                        $))))
+                                   (T
+                                    (RETURN-FROM |DFLOAT;**;$F$;88|
+                                      (|DFLOAT;**;$F$;88| (- |x|) |r|
+                                       $)))))
+                                (T (|error| "negative root"))))
+                             ((EQL |d| 2)
+                              (EXPT (|DFLOAT;sqrt;2$;33| |x| $) |n|))
+                             (T (|DFLOAT;**;3$;36| |x|
+                                    (/
+                                     (FLOAT |n| |$DoubleFloatMaximum|)
+                                     (FLOAT |d| |$DoubleFloatMaximum|))
+                                    $))))))))))) 
 
 (DEFUN |DoubleFloat| ()
   (DECLARE (SPECIAL |$ConstructorCache|))

Modified: trunk/src/algebra/strap/POLYCAT-.lsp
===================================================================
--- trunk/src/algebra/strap/POLYCAT-.lsp	2010-07-26 02:29:37 UTC (rev 1710)
+++ trunk/src/algebra/strap/POLYCAT-.lsp	2010-07-26 02:49:04 UTC (rev 1711)
@@ -745,7 +745,7 @@
                                                            "failed")))
                                                        (T
                                                         (LET
-                                                         ((#10=#:G1612
+                                                         ((#10=#:G1610
                                                            (CDR |nd|)))
                                                           (|check-subtype|
                                                            (NOT
@@ -809,14 +809,14 @@
                      (T (SEQ (LETT |i| 0 |POLYCAT-;conditionP;MU;27|)
                              (EXIT (CONS 0
                                     (LET
-                                     ((#14=#:G1611
+                                     ((#14=#:G1612
                                        (|makeSimpleArray|
                                         (|getVMType|
                                          (|getShellEntry| $ 6))
                                         (SIZE |monslist|))))
                                       (LET
                                        ((#15=#:G1728 |monslist|)
-                                        (#16=#:G1610 0))
+                                        (#16=#:G1611 0))
                                         (LOOP
                                           (COND
                                             ((ATOM #15#) (RETURN #14#))

Modified: trunk/src/interp/g-opt.boot
===================================================================
--- trunk/src/interp/g-opt.boot	2010-07-26 02:29:37 UTC (rev 1710)
+++ trunk/src/interp/g-opt.boot	2010-07-26 02:49:04 UTC (rev 1711)
@@ -393,7 +393,7 @@
       aft:= after(l,before)
       null before => ["SEQ",:aft]
       null aft => ["COND",:transform,'(%true (conderr))]
-      ["COND",:transform,['%true,optSEQ ["SEQ",:aft]]]
+      optCond ["COND",:transform,['%true,optSEQ ["SEQ",:aft]]]
     tryToRemoveSEQ l ==
       l is ["SEQ",[op,a]] and op in '(EXIT RETURN THROW) => a
       l


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1712
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1712&view=rev
Author:   dos-reis
Date:     2010-07-26 06:54:30 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
	* algebra/si.spad.pamphlet (SingleInteger): Tidy.
	* interp/g-opt.boot (simplifyVMForm): Expand %icst0 and %icst1.
	(optIlt): Fold more configurations.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/algebra/si.spad.pamphlet
    trunk/src/algebra/strap/SINT.lsp
    trunk/src/interp/g-opt.boot

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-26 02:49:04 UTC (rev 1711)
+++ trunk/src/ChangeLog	2010-07-26 06:54:30 UTC (rev 1712)
@@ -1,3 +1,9 @@
+2010-07-26  Gabriel Dos Reis  <gdr@...>
+
+	* algebra/si.spad.pamphlet (SingleInteger): Tidy.
+	* interp/g-opt.boot (simplifyVMForm): Expand %icst0 and %icst1.
+	(optIlt): Fold more configurations.
+
 2010-07-25  Gabriel Dos Reis  <gdr@...>
 
 	* interp/g-opt.boot (optCond): Simplify newly built COND-expression.

Modified: trunk/src/algebra/si.spad.pamphlet
===================================================================
--- trunk/src/algebra/si.spad.pamphlet	2010-07-26 02:49:04 UTC (rev 1711)
+++ trunk/src/algebra/si.spad.pamphlet	2010-07-26 06:54:30 UTC (rev 1712)
@@ -217,8 +217,26 @@
    MULTIPLIER ==> 314159269$Lisp    -- from Knuth's table
    MODULUS ==> 2147483647$Lisp      -- 2**31-1
 
+   import %icst0: %                 from Foreign Builtin
+   import %icst1: %                 from Foreign Builtin
+   import %iadd: (%,%) -> %         from Foreign Builtin
+   import %isub: (%,%) -> %         from Foreign Builtin
+   import %imul: (%,%) -> %         from Foreign Builtin
+   import %ineg: % -> %             from Foreign Builtin
+   import %iabs: % -> %             from Foreign Builtin
+   import %imax: (%,%) -> %         from Foreign Builtin
+   import %imin: (%,%) -> %         from Foreign Builtin
+   import %igcd: (%,%) -> %         from Foreign Builtin
+   import %hash: % -> SingleInteger from Foreign Builtin
+   import %iodd?: % -> Boolean      from Foreign Builtin
+   import %ieq: (%,%) -> Boolean    from Foreign Builtin
+   import %ilt: (%,%) -> Boolean    from Foreign Builtin
+   import %ile: (%,%) -> Boolean    from Foreign Builtin
+   import %igt: (%,%) -> Boolean    from Foreign Builtin
+   import %ige: (%,%) -> Boolean    from Foreign Builtin
+
    writeOMSingleInt(dev: OpenMathDevice, x: %): Void ==
-    if x < 0 then
+    if negative? x then
       OMputApp(dev)
       OMputSymbol(dev, "arith1", "unary_minus")
       OMputInteger(dev, convert(-x))
@@ -265,13 +283,13 @@
    reducedSystem(m: Matrix %) == m pretend Matrix(Integer)
    coerce(x):OutputForm == rep(x)::OutputForm
    convert(x:%):Integer == rep x
-   i:Integer * y:%      == i::% * y
-   0         == 0$Lisp
-   1         == 1$Lisp
-   base()    == 2$Lisp
+   i:Integer * y:%      == %imul(i::%,y)
+   0         == %icst0
+   1         == %icst1
+   base()    == per 2
    max()     == MAXINT
    min()     == MININT
-   x = y     == %ieq(x,y)$Foreign(Builtin)
+   x = y     == %ieq(x,y)
    ~ x       == LOGNOT(x)$Lisp
    not(x)    == LOGNOT(x)$Lisp
    x /\ y    == LOGAND(x,y)$Lisp
@@ -282,29 +300,29 @@
    Or(x,y)   == LOGIOR(x,y)$Lisp
    x or y    == Or(x,y)
    xor(x,y)  == LOGXOR(x,y)$Lisp
-   x < y     == QSLESSP(x,y)$Lisp
-   x > y     == QSGREATERP(x,y)$Lisp
-   x <= y    == %ile(x,y)$Foreign(Builtin)
-   x >= y    == %ige(x,y)$Foreign(Builtin)
+   x < y     == %ilt(x,y)
+   x > y     == %igt(x,y)
+   x <= y    == %ile(x,y)
+   x >= y    == %ige(x,y)
    inc x     == QSADD1(x)$Lisp
    dec x     == QSSUB1(x)$Lisp
-   - x       == QSMINUS(x)$Lisp
-   x + y     == QSPLUS(x,y)$Lisp
-   x:% - y:% == QSDIFFERENCE(x,y)$Lisp
-   x:% * y:% == QSTIMES(x,y)$Lisp
+   - x       == %ineg x
+   x + y     == %iadd(x,y)
+   x:% - y:% == %isub(x,y)
+   x:% * y:% == %imul(x,y)
    x:% ** n:NonNegativeInteger == 
       (%ipow(x, n)$Foreign(Builtin) pretend Integer)::%
    x quo y   == QSQUOTIENT(x,y)$Lisp
    x rem y   == QSREMAINDER(x,y)$Lisp
    divide(x, y)   == CONS(QSQUOTIENT(x,y)$Lisp,QSREMAINDER(x,y)$Lisp)$Lisp
-   gcd(x,y)  == %igcd(x,y)$Foreign(Builtin)
-   abs(x)    == QSABSVAL(x)$Lisp
-   odd?(x)   == QSODDP(x)$Lisp
+   gcd(x,y)  == %igcd(x,y)
+   abs(x)    == %iabs x
+   odd?(x)   == %iodd? x
    zero?(x)  == QSZEROP(x)$Lisp
-   one?(x)   == x = 1
-   max(x,y)  == QSMAX(x,y)$Lisp
-   min(x,y)  == QSMIN(x,y)$Lisp
-   hash(x)   == HASHEQ(x)$Lisp
+   one?(x)   == x = 1@%
+   max(x,y)  == %imax(x,y)
+   min(x,y)  == %imin(x,y)
+   hash(x)   == %hash x
    length(x) == INTEGER_-LENGTH(x)$Lisp
    shift(x,n)    == QSLEFTSHIFT(x,n)$Lisp
    mulmod(a,b,p) == QSMULTMOD(a,b,p)$Lisp
@@ -322,9 +340,9 @@
 
    positiveRemainder(x,n) ==
       r := QSREMAINDER(x,n)$Lisp
-      QSMINUSP(r)$Lisp =>
-          QSMINUSP(n)$Lisp => QSDIFFERENCE(x, n)$Lisp
-          QSPLUS(r, n)$Lisp
+      negative? r =>
+        negative? n => x - n 
+        r + n
       r
 
    coerce(x:Integer):% == per x
@@ -337,8 +355,8 @@
 
    UCA ==> Record(unit:%,canonical:%,associate:%)
    unitNormal x ==
-      x < 0 => [-1,-x,-1]$UCA
-      [1,x,1]$UCA
+      negative? x => [-1@...
+      [1@...
 
 @
 

Modified: trunk/src/algebra/strap/SINT.lsp
===================================================================
--- trunk/src/algebra/strap/SINT.lsp	2010-07-26 02:49:04 UTC (rev 1711)
+++ trunk/src/algebra/strap/SINT.lsp	2010-07-26 06:54:30 UTC (rev 1712)
@@ -108,12 +108,13 @@
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|)
                 |SINT;<;2$B;26|)) 
 
-(PUT '|SINT;<;2$B;26| '|SPADreplace| 'QSLESSP) 
+(PUT '|SINT;<;2$B;26| '|SPADreplace| '|%ilt|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|)
                 |SINT;>;2$B;27|)) 
 
-(PUT '|SINT;>;2$B;27| '|SPADreplace| 'QSGREATERP) 
+(PUT '|SINT;>;2$B;27| '|SPADreplace|
+     '(XLAM (|x| |y|) (|%ilt| |y| |x|))) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|)
                 |SINT;<=;2$B;28|)) 
@@ -139,22 +140,22 @@
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|) |SINT;-;2$;32|)) 
 
-(PUT '|SINT;-;2$;32| '|SPADreplace| 'QSMINUS) 
+(PUT '|SINT;-;2$;32| '|SPADreplace| '|%ineg|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;+;3$;33|)) 
 
-(PUT '|SINT;+;3$;33| '|SPADreplace| 'QSPLUS) 
+(PUT '|SINT;+;3$;33| '|SPADreplace| '|%iadd|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;-;3$;34|)) 
 
-(PUT '|SINT;-;3$;34| '|SPADreplace| 'QSDIFFERENCE) 
+(PUT '|SINT;-;3$;34| '|SPADreplace| '|%isub|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;*;3$;35|)) 
 
-(PUT '|SINT;*;3$;35| '|SPADreplace| 'QSTIMES) 
+(PUT '|SINT;*;3$;35| '|SPADreplace| '|%imul|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| (|%IntegerSection| 0) |%Shell|)
                     |%Short|)
@@ -181,12 +182,12 @@
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|)
                 |SINT;abs;2$;41|)) 
 
-(PUT '|SINT;abs;2$;41| '|SPADreplace| 'QSABSVAL) 
+(PUT '|SINT;abs;2$;41| '|SPADreplace| '|%iabs|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Boolean|)
                 |SINT;odd?;$B;42|)) 
 
-(PUT '|SINT;odd?;$B;42| '|SPADreplace| 'QSODDP) 
+(PUT '|SINT;odd?;$B;42| '|SPADreplace| '|%iodd?|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Boolean|)
                 |SINT;zero?;$B;43|)) 
@@ -199,17 +200,17 @@
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;max;3$;45|)) 
 
-(PUT '|SINT;max;3$;45| '|SPADreplace| 'QSMAX) 
+(PUT '|SINT;max;3$;45| '|SPADreplace| '|%imax|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;min;3$;46|)) 
 
-(PUT '|SINT;min;3$;46| '|SPADreplace| 'QSMIN) 
+(PUT '|SINT;min;3$;46| '|SPADreplace| '|%imin|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|)
                 |SINT;hash;2$;47|)) 
 
-(PUT '|SINT;hash;2$;47| '|SPADreplace| 'HASHEQ) 
+(PUT '|SINT;hash;2$;47| '|SPADreplace| '|%hash|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|)
                 |SINT;length;2$;48|)) 
@@ -288,54 +289,54 @@
 
 (DEFUN |SINT;writeOMSingleInt| (|dev| |x| $)
   (SEQ (COND
-         ((QSLESSP |x| 0)
-          (SEQ (SPADCALL |dev| (|getShellEntry| $ 13))
+         ((QSMINUSP |x|)
+          (SEQ (SPADCALL |dev| (|getShellEntry| $ 11))
                (SPADCALL |dev| "arith1" "unaryminus"
-                   (|getShellEntry| $ 15))
-               (SPADCALL |dev| (QSMINUS |x|) (|getShellEntry| $ 18))
-               (EXIT (SPADCALL |dev| (|getShellEntry| $ 19)))))
-         (T (SPADCALL |dev| |x| (|getShellEntry| $ 18)))))) 
+                   (|getShellEntry| $ 13))
+               (SPADCALL |dev| (- |x|) (|getShellEntry| $ 16))
+               (EXIT (SPADCALL |dev| (|getShellEntry| $ 17)))))
+         (T (SPADCALL |dev| |x| (|getShellEntry| $ 16)))))) 
 
 (DEFUN |SINT;OMwrite;$S;2| (|x| $)
   (LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
-         (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 21))
-                    (|getShellEntry| $ 22))))
-    (SEQ (SPADCALL |dev| (|getShellEntry| $ 23))
+         (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 19))
+                    (|getShellEntry| $ 20))))
+    (SEQ (SPADCALL |dev| (|getShellEntry| $ 21))
          (|SINT;writeOMSingleInt| |dev| |x| $)
-         (SPADCALL |dev| (|getShellEntry| $ 24))
-         (SPADCALL |dev| (|getShellEntry| $ 25))
+         (SPADCALL |dev| (|getShellEntry| $ 22))
+         (SPADCALL |dev| (|getShellEntry| $ 23))
          (SETQ |s| (OM-STRINGPTRTOSTRING |sp|)) (EXIT |s|)))) 
 
 (DEFUN |SINT;OMwrite;$BS;3| (|x| |wholeObj| $)
   (LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
-         (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 21))
-                    (|getShellEntry| $ 22))))
-    (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23))))
+         (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 19))
+                    (|getShellEntry| $ 20))))
+    (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 21))))
          (|SINT;writeOMSingleInt| |dev| |x| $)
-         (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 24))))
-         (SPADCALL |dev| (|getShellEntry| $ 25))
+         (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 22))))
+         (SPADCALL |dev| (|getShellEntry| $ 23))
          (SETQ |s| (OM-STRINGPTRTOSTRING |sp|)) (EXIT |s|)))) 
 
 (DEFUN |SINT;OMwrite;Omd$V;4| (|dev| |x| $)
-  (SEQ (SPADCALL |dev| (|getShellEntry| $ 23))
+  (SEQ (SPADCALL |dev| (|getShellEntry| $ 21))
        (|SINT;writeOMSingleInt| |dev| |x| $)
-       (EXIT (SPADCALL |dev| (|getShellEntry| $ 24))))) 
+       (EXIT (SPADCALL |dev| (|getShellEntry| $ 22))))) 
 
 (DEFUN |SINT;OMwrite;Omd$BV;5| (|dev| |x| |wholeObj| $)
-  (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23))))
+  (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 21))))
        (|SINT;writeOMSingleInt| |dev| |x| $)
        (EXIT (COND
-               (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 24))))))) 
+               (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 22))))))) 
 
 (DEFUN |SINT;reducedSystem;MM;6| (|m| $) (DECLARE (IGNORE $)) |m|) 
 
 (DEFUN |SINT;coerce;$Of;7| (|x| $)
-  (SPADCALL |x| (|getShellEntry| $ 34))) 
+  (SPADCALL |x| (|getShellEntry| $ 32))) 
 
 (DEFUN |SINT;convert;$I;8| (|x| $) (DECLARE (IGNORE $)) |x|) 
 
 (DEFUN |SINT;*;I2$;9| (|i| |y| $)
-  (QSTIMES (SPADCALL |i| (|getShellEntry| $ 36)) |y|)) 
+  (* (SPADCALL |i| (|getShellEntry| $ 34)) |y|)) 
 
 (DEFUN |SINT;Zero;$;10| ($) (DECLARE (IGNORE $)) 0) 
 
@@ -383,13 +384,9 @@
   (DECLARE (IGNORE $))
   (LOGXOR |x| |y|)) 
 
-(DEFUN |SINT;<;2$B;26| (|x| |y| $)
-  (DECLARE (IGNORE $))
-  (QSLESSP |x| |y|)) 
+(DEFUN |SINT;<;2$B;26| (|x| |y| $) (DECLARE (IGNORE $)) (< |x| |y|)) 
 
-(DEFUN |SINT;>;2$B;27| (|x| |y| $)
-  (DECLARE (IGNORE $))
-  (QSGREATERP |x| |y|)) 
+(DEFUN |SINT;>;2$B;27| (|x| |y| $) (DECLARE (IGNORE $)) (< |y| |x|)) 
 
 (DEFUN |SINT;<=;2$B;28| (|x| |y| $)
   (DECLARE (IGNORE $))
@@ -403,22 +400,16 @@
 
 (DEFUN |SINT;dec;2$;31| (|x| $) (DECLARE (IGNORE $)) (QSSUB1 |x|)) 
 
-(DEFUN |SINT;-;2$;32| (|x| $) (DECLARE (IGNORE $)) (QSMINUS |x|)) 
+(DEFUN |SINT;-;2$;32| (|x| $) (DECLARE (IGNORE $)) (- |x|)) 
 
-(DEFUN |SINT;+;3$;33| (|x| |y| $)
-  (DECLARE (IGNORE $))
-  (QSPLUS |x| |y|)) 
+(DEFUN |SINT;+;3$;33| (|x| |y| $) (DECLARE (IGNORE $)) (+ |x| |y|)) 
 
-(DEFUN |SINT;-;3$;34| (|x| |y| $)
-  (DECLARE (IGNORE $))
-  (QSDIFFERENCE |x| |y|)) 
+(DEFUN |SINT;-;3$;34| (|x| |y| $) (DECLARE (IGNORE $)) (- |x| |y|)) 
 
-(DEFUN |SINT;*;3$;35| (|x| |y| $)
-  (DECLARE (IGNORE $))
-  (QSTIMES |x| |y|)) 
+(DEFUN |SINT;*;3$;35| (|x| |y| $) (DECLARE (IGNORE $)) (* |x| |y|)) 
 
 (DEFUN |SINT;**;$Nni$;36| (|x| |n| $)
-  (SPADCALL (EXPT |x| |n|) (|getShellEntry| $ 36))) 
+  (SPADCALL (EXPT |x| |n|) (|getShellEntry| $ 34))) 
 
 (DEFUN |SINT;quo;3$;37| (|x| |y| $)
   (DECLARE (IGNORE $))
@@ -435,9 +426,9 @@
   (DECLARE (IGNORE $))
   (GCD |x| |y|)) 
 
-(DEFUN |SINT;abs;2$;41| (|x| $) (DECLARE (IGNORE $)) (QSABSVAL |x|)) 
+(DEFUN |SINT;abs;2$;41| (|x| $) (DECLARE (IGNORE $)) (ABS |x|)) 
 
-(DEFUN |SINT;odd?;$B;42| (|x| $) (DECLARE (IGNORE $)) (QSODDP |x|)) 
+(DEFUN |SINT;odd?;$B;42| (|x| $) (DECLARE (IGNORE $)) (ODDP |x|)) 
 
 (DEFUN |SINT;zero?;$B;43| (|x| $) (DECLARE (IGNORE $)) (QSZEROP |x|)) 
 
@@ -445,13 +436,13 @@
 
 (DEFUN |SINT;max;3$;45| (|x| |y| $)
   (DECLARE (IGNORE $))
-  (QSMAX |x| |y|)) 
+  (MAX |x| |y|)) 
 
 (DEFUN |SINT;min;3$;46| (|x| |y| $)
   (DECLARE (IGNORE $))
-  (QSMIN |x| |y|)) 
+  (MIN |x| |y|)) 
 
-(DEFUN |SINT;hash;2$;47| (|x| $) (DECLARE (IGNORE $)) (HASHEQ |x|)) 
+(DEFUN |SINT;hash;2$;47| (|x| $) (DECLARE (IGNORE $)) (SXHASH |x|)) 
 
 (DEFUN |SINT;length;2$;48| (|x| $)
   (DECLARE (IGNORE $))
@@ -482,7 +473,7 @@
   (+ (- |$ShortMaximum| |$ShortMinimum|) 1)) 
 
 (DEFUN |SINT;index;Pi$;55| (|i| $)
-  (LET ((#0=#:G1461 (- (+ |i| |$ShortMinimum|) 1)))
+  (LET ((#0=#:G1464 (- (+ |i| |$ShortMinimum|) 1)))
     (|check-subtype| (SMINTP #0#) '(|SingleInteger|) #0#))) 
 
 (DEFUN |SINT;lookup;$Pi;56| (|x| $)
@@ -497,9 +488,7 @@
   (LET ((|r| (QSREMAINDER |x| |n|)))
     (COND
       ((QSMINUSP |r|)
-       (COND
-         ((QSMINUSP |n|) (QSDIFFERENCE |x| |n|))
-         (T (QSPLUS |r| |n|))))
+       (COND ((QSMINUSP |n|) (- |x| |n|)) (T (+ |r| |n|))))
       (T |r|)))) 
 
 (DEFUN |SINT;coerce;I$;59| (|x| $)
@@ -514,13 +503,11 @@
 (DEFUN |SINT;random;2$;61| (|n| $) (DECLARE (IGNORE $)) (RANDOM |n|)) 
 
 (DEFUN |SINT;unitNormal;$R;62| (|x| $)
-  (COND
-    ((QSLESSP |x| 0) (VECTOR (QSMINUS 1) (QSMINUS |x|) (QSMINUS 1)))
-    (T (VECTOR 1 |x| 1)))) 
+  (COND ((QSMINUSP |x|) (VECTOR -1 (- |x|) -1)) (T (VECTOR 1 |x| 1)))) 
 
 (DEFUN |SingleInteger| ()
   (DECLARE (SPECIAL |$ConstructorCache|))
-  (PROG (#0=#:G1495)
+  (PROG (#0=#:G1499)
     (RETURN
       (COND
         ((SETQ #0# (HGET |$ConstructorCache| '|SingleInteger|))
@@ -534,7 +521,7 @@
                ((NOT #0#) (HREM |$ConstructorCache| '|SingleInteger|))))))))) 
 
 (DEFUN |SingleInteger;| ()
-  (LET ((|dv$| (LIST '|SingleInteger|)) ($ (|newShell| 116))
+  (LET ((|dv$| (LIST '|SingleInteger|)) ($ (|newShell| 114))
         (|pv$| (|buildPredVector| 0 0 NIL)))
     (DECLARE (SPECIAL |$ConstructorCache|))
     (|setShellEntry| $ 0 |dv$|)
@@ -545,22 +532,21 @@
     $)) 
 
 (MAKEPROP '|SingleInteger| '|infovec|
-    (LIST '#(NIL NIL NIL NIL NIL (|Integer|) '|seed|
-             (CONS IDENTITY
-                   (FUNCALL (|dispatchFunction| |SINT;Zero;$;10|) $))
-             (0 . |Zero|) (|Boolean|) |SINT;<;2$B;26| (|Void|)
-             (|OpenMathDevice|) (4 . |OMputApp|) (|String|)
-             (9 . |OMputSymbol|) |SINT;-;2$;32| |SINT;convert;$I;8|
-             (16 . |OMputInteger|) (22 . |OMputEndApp|)
-             (|OpenMathEncoding|) (27 . |OMencodingXML|)
-             (31 . |OMopenString|) (37 . |OMputObject|)
-             (42 . |OMputEndObject|) (47 . |OMclose|)
-             |SINT;OMwrite;$S;2| |SINT;OMwrite;$BS;3|
+    (LIST '#(NIL NIL NIL NIL NIL (|Integer|) '|seed| (|Boolean|)
+             |SINT;negative?;$B;53| (|Void|) (|OpenMathDevice|)
+             (0 . |OMputApp|) (|String|) (5 . |OMputSymbol|)
+             |SINT;-;2$;32| |SINT;convert;$I;8| (12 . |OMputInteger|)
+             (18 . |OMputEndApp|) (|OpenMathEncoding|)
+             (23 . |OMencodingXML|) (27 . |OMopenString|)
+             (33 . |OMputObject|) (38 . |OMputEndObject|)
+             (43 . |OMclose|) |SINT;OMwrite;$S;2| |SINT;OMwrite;$BS;3|
              |SINT;OMwrite;Omd$V;4| |SINT;OMwrite;Omd$BV;5|
              (|Matrix| 5) (|Matrix| $) |SINT;reducedSystem;MM;6|
-             (|OutputForm|) (52 . |coerce|) |SINT;coerce;$Of;7|
-             (57 . |coerce|) |SINT;*;3$;35| |SINT;*;I2$;9|
+             (|OutputForm|) (48 . |coerce|) |SINT;coerce;$Of;7|
+             (53 . |coerce|) |SINT;*;I2$;9|
              (CONS IDENTITY
+                   (FUNCALL (|dispatchFunction| |SINT;Zero;$;10|) $))
+             (CONS IDENTITY
                    (FUNCALL (|dispatchFunction| |SINT;One;$;11|) $))
              |SINT;base;$;12|
              (CONS IDENTITY
@@ -570,59 +556,59 @@
              |SINT;=;2$B;15| |SINT;~;2$;16| |SINT;not;2$;17|
              |SINT;/\\;3$;18| |SINT;\\/;3$;19| |SINT;Not;2$;20|
              |SINT;And;3$;21| |SINT;and;3$;22| |SINT;Or;3$;23|
-             |SINT;or;3$;24| |SINT;xor;3$;25| |SINT;>;2$B;27|
-             |SINT;<=;2$B;28| |SINT;>=;2$B;29| |SINT;inc;2$;30|
-             |SINT;dec;2$;31| |SINT;+;3$;33| |SINT;-;3$;34|
-             (|NonNegativeInteger|) |SINT;**;$Nni$;36| |SINT;quo;3$;37|
-             |SINT;rem;3$;38|
+             |SINT;or;3$;24| |SINT;xor;3$;25| |SINT;<;2$B;26|
+             |SINT;>;2$B;27| |SINT;<=;2$B;28| |SINT;>=;2$B;29|
+             |SINT;inc;2$;30| |SINT;dec;2$;31| |SINT;+;3$;33|
+             |SINT;-;3$;34| |SINT;*;3$;35| (|NonNegativeInteger|)
+             |SINT;**;$Nni$;36| |SINT;quo;3$;37| |SINT;rem;3$;38|
              (|Record| (|:| |quotient| $) (|:| |remainder| $))
              |SINT;divide;2$R;39| |SINT;gcd;3$;40| |SINT;abs;2$;41|
-             |SINT;odd?;$B;42| |SINT;zero?;$B;43| (62 . |One|)
-             |SINT;one?;$B;44| |SINT;max;3$;45| |SINT;min;3$;46|
-             (|SingleInteger|) |SINT;hash;2$;47| |SINT;length;2$;48|
-             |SINT;shift;3$;49| |SINT;mulmod;4$;50| |SINT;addmod;4$;51|
-             |SINT;submod;4$;52| |SINT;negative?;$B;53|
-             |SINT;size;Nni;54| (|PositiveInteger|) (66 . +) (72 . -)
-             |SINT;index;Pi$;55| |SINT;lookup;$Pi;56| (|Vector| 5)
-             (|Record| (|:| |mat| 30) (|:| |vec| 89)) (|Vector| $)
-             |SINT;reducedSystem;MVR;57| |SINT;positiveRemainder;3$;58|
-             |SINT;coerce;I$;59| |SINT;random;$;60| |SINT;random;2$;61|
+             |SINT;odd?;$B;42| |SINT;zero?;$B;43| |SINT;one?;$B;44|
+             |SINT;max;3$;45| |SINT;min;3$;46| (|SingleInteger|)
+             |SINT;hash;2$;47| |SINT;length;2$;48| |SINT;shift;3$;49|
+             |SINT;mulmod;4$;50| |SINT;addmod;4$;51|
+             |SINT;submod;4$;52| |SINT;size;Nni;54| (|PositiveInteger|)
+             (58 . +) (64 . -) |SINT;index;Pi$;55| |SINT;lookup;$Pi;56|
+             (|Vector| 5) (|Record| (|:| |mat| 28) (|:| |vec| 87))
+             (|Vector| $) |SINT;reducedSystem;MVR;57|
+             |SINT;positiveRemainder;3$;58| |SINT;coerce;I$;59|
+             |SINT;random;$;60| |SINT;random;2$;61|
              (|Record| (|:| |unit| $) (|:| |canonical| $)
                  (|:| |associate| $))
              |SINT;unitNormal;$R;62| (|Fraction| 5)
-             (|Union| 99 '"failed") (|Union| $ '"failed") (|Float|)
+             (|Union| 97 '"failed") (|Union| $ '"failed") (|Float|)
              (|DoubleFloat|) (|PatternMatchResult| 5 $) (|Pattern| 5)
              (|InputForm|) (|Union| 5 '"failed") (|List| $)
-             (|Union| 108 '"failed")
-             (|Record| (|:| |coef| 108) (|:| |generator| $))
+             (|Union| 106 '"failed")
+             (|Record| (|:| |coef| 106) (|:| |generator| $))
              (|Record| (|:| |coef1| $) (|:| |coef2| $)
                  (|:| |generator| $))
              (|Record| (|:| |coef1| $) (|:| |coef2| $))
-             (|Union| 112 '"failed") (|Factored| $)
+             (|Union| 110 '"failed") (|Factored| $)
              (|SparseUnivariatePolynomial| $))
-          '#(~= 78 ~ 84 |zero?| 89 |xor| 94 |unitNormal| 100
-             |unitCanonical| 105 |unit?| 110 |symmetricRemainder| 115
-             |subtractIfCan| 121 |submod| 127 |squareFreePart| 134
-             |squareFree| 139 |sizeLess?| 144 |size| 150 |sign| 154
-             |shift| 159 |sample| 165 |retractIfCan| 169 |retract| 174
-             |rem| 179 |reducedSystem| 185 |recip| 196 |rationalIfCan|
-             201 |rational?| 206 |rational| 211 |random| 216 |quo| 225
-             |principalIdeal| 231 |prime?| 236 |powmod| 241
-             |positiveRemainder| 248 |positive?| 254 |permutation| 259
-             |patternMatch| 265 |or| 272 |one?| 278 |odd?| 283 |not|
-             288 |nextItem| 293 |negative?| 298 |multiEuclidean| 303
-             |mulmod| 309 |min| 316 |max| 326 |mask| 336 |lookup| 341
-             |length| 346 |leftReducedSystem| 351 |lcm| 362 |latex| 373
-             |invmod| 378 |init| 384 |index| 388 |inc| 393 |hash| 398
-             |gcdPolynomial| 403 |gcd| 409 |factorial| 420 |factor| 425
-             |extendedEuclidean| 430 |exquo| 443 |expressIdealMember|
-             449 |even?| 455 |euclideanSize| 460 |divide| 465
-             |differentiate| 471 |dec| 482 |copy| 487 |convert| 492
-             |coerce| 517 |characteristic| 537 |bit?| 541 |binomial|
-             547 |before?| 553 |base| 559 |associates?| 563 |and| 569
-             |addmod| 575 |abs| 582 |\\/| 587 |Zero| 593 |Or| 597 |One|
-             603 |OMwrite| 607 |Not| 631 D 636 |And| 647 >= 653 > 659 =
-             665 <= 671 < 677 |/\\| 683 - 689 + 700 ** 706 * 718)
+          '#(~= 70 ~ 76 |zero?| 81 |xor| 86 |unitNormal| 92
+             |unitCanonical| 97 |unit?| 102 |symmetricRemainder| 107
+             |subtractIfCan| 113 |submod| 119 |squareFreePart| 126
+             |squareFree| 131 |sizeLess?| 136 |size| 142 |sign| 146
+             |shift| 151 |sample| 157 |retractIfCan| 161 |retract| 166
+             |rem| 171 |reducedSystem| 177 |recip| 188 |rationalIfCan|
+             193 |rational?| 198 |rational| 203 |random| 208 |quo| 217
+             |principalIdeal| 223 |prime?| 228 |powmod| 233
+             |positiveRemainder| 240 |positive?| 246 |permutation| 251
+             |patternMatch| 257 |or| 264 |one?| 270 |odd?| 275 |not|
+             280 |nextItem| 285 |negative?| 290 |multiEuclidean| 295
+             |mulmod| 301 |min| 308 |max| 318 |mask| 328 |lookup| 333
+             |length| 338 |leftReducedSystem| 343 |lcm| 354 |latex| 365
+             |invmod| 370 |init| 376 |index| 380 |inc| 385 |hash| 390
+             |gcdPolynomial| 395 |gcd| 401 |factorial| 412 |factor| 417
+             |extendedEuclidean| 422 |exquo| 435 |expressIdealMember|
+             441 |even?| 447 |euclideanSize| 452 |divide| 457
+             |differentiate| 463 |dec| 474 |copy| 479 |convert| 484
+             |coerce| 509 |characteristic| 529 |bit?| 533 |binomial|
+             539 |before?| 545 |base| 551 |associates?| 555 |and| 561
+             |addmod| 567 |abs| 574 |\\/| 579 |Zero| 585 |Or| 589 |One|
+             595 |OMwrite| 599 |Not| 623 D 628 |And| 639 >= 645 > 651 =
+             657 <= 663 < 669 |/\\| 675 - 681 + 692 ** 698 * 710)
           '((|noetherian| . 0) (|canonicalsClosed| . 0)
             (|canonical| . 0) (|canonicalUnitNormal| . 0)
             (|multiplicativeValuation| . 0) (|noZeroDivisors| . 0)
@@ -676,60 +662,60 @@
                                (|SetCategory|) (|BooleanLogic|)
                                (|RealConstant|) (|RetractableTo| 5)
                                (|DifferentialDomain| $$) (|BasicType|)
-                               (|OpenMath|) (|ConvertibleTo| 102)
-                               (|ConvertibleTo| 103)
+                               (|OpenMath|) (|ConvertibleTo| 100)
+                               (|ConvertibleTo| 101)
                                (|CombinatorialFunctionCategory|)
-                               (|ConvertibleTo| 105)
-                               (|ConvertibleTo| 106)
+                               (|ConvertibleTo| 103)
+                               (|ConvertibleTo| 104)
                                (|ConvertibleTo| 5) (|CoercibleFrom| $$)
                                (|CoercibleFrom| 5) (|Type|)
-                               (|CoercibleTo| 33))
-                            (|makeByteWordVec2| 115
-                                '(0 5 0 8 1 12 11 0 13 3 12 11 0 14 14
-                                  15 2 12 11 0 5 18 1 12 11 0 19 0 20 0
-                                  21 2 12 0 14 20 22 1 12 11 0 23 1 12
-                                  11 0 24 1 12 11 0 25 1 5 33 0 34 1 0
-                                  0 5 36 0 5 0 71 2 84 0 0 0 85 2 5 0 0
-                                  0 86 2 0 9 0 0 1 1 0 0 0 44 1 0 9 0
-                                  70 2 0 0 0 0 53 1 0 97 0 98 1 0 0 0 1
-                                  1 0 9 0 1 2 0 0 0 0 1 2 0 101 0 0 1 3
-                                  0 0 0 0 0 81 1 0 0 0 1 1 0 114 0 1 2
-                                  0 9 0 0 1 0 0 61 83 1 0 5 0 1 2 0 0 0
-                                  0 78 0 0 0 1 1 0 107 0 1 1 0 5 0 1 2
-                                  0 0 0 0 64 1 0 30 31 32 2 0 90 31 91
-                                  92 1 0 101 0 1 1 0 100 0 1 1 0 9 0 1
-                                  1 0 99 0 1 0 0 0 95 1 0 0 0 96 2 0 0
-                                  0 0 63 1 0 110 108 1 1 0 9 0 1 3 0 0
-                                  0 0 0 1 2 0 0 0 0 93 1 0 9 0 1 2 0 0
-                                  0 0 1 3 0 104 0 105 104 1 2 0 0 0 0
-                                  52 1 0 9 0 72 1 0 9 0 69 1 0 0 0 45 1
-                                  0 101 0 1 1 0 9 0 82 2 0 109 108 0 1
-                                  3 0 0 0 0 0 79 0 0 0 42 2 0 0 0 0 74
-                                  0 0 0 41 2 0 0 0 0 73 1 0 0 0 1 1 0
-                                  84 0 88 1 0 0 0 77 1 0 30 91 1 2 0 90
-                                  91 0 1 1 0 0 108 1 2 0 0 0 0 1 1 0 14
-                                  0 1 2 0 0 0 0 1 0 0 0 1 1 0 0 84 87 1
-                                  0 0 0 57 1 0 75 0 76 2 0 115 115 115
-                                  1 1 0 0 108 1 2 0 0 0 0 67 1 0 0 0 1
-                                  1 0 114 0 1 2 0 111 0 0 1 3 0 113 0 0
-                                  0 1 2 0 101 0 0 1 2 0 109 108 0 1 1 0
-                                  9 0 1 1 0 61 0 1 2 0 65 0 0 66 2 0 0
-                                  0 61 1 1 0 0 0 1 1 0 0 0 58 1 0 0 0 1
-                                  1 0 102 0 1 1 0 103 0 1 1 0 106 0 1 1
-                                  0 105 0 1 1 0 5 0 17 1 0 0 5 94 1 0 0
-                                  0 1 1 0 0 5 94 1 0 33 0 35 0 0 61 1 2
-                                  0 9 0 0 1 2 0 0 0 0 1 2 0 9 0 0 1 0 0
-                                  0 40 2 0 9 0 0 1 2 0 0 0 0 50 3 0 0 0
-                                  0 0 80 1 0 0 0 68 2 0 0 0 0 47 0 0 0
-                                  7 2 0 0 0 0 51 0 0 0 39 3 0 11 12 0 9
-                                  29 2 0 14 0 9 27 2 0 11 12 0 28 1 0
-                                  14 0 26 1 0 0 0 48 2 0 0 0 61 1 1 0 0
-                                  0 1 2 0 0 0 0 49 2 0 9 0 0 56 2 0 9 0
-                                  0 54 2 0 9 0 0 43 2 0 9 0 0 55 2 0 9
-                                  0 0 10 2 0 0 0 0 46 1 0 0 0 16 2 0 0
-                                  0 0 60 2 0 0 0 0 59 2 0 0 0 61 62 2 0
-                                  0 0 84 1 2 0 0 5 0 38 2 0 0 0 0 37 2
-                                  0 0 5 0 38 2 0 0 61 0 1 2 0 0 84 0 1)))))
+                               (|CoercibleTo| 31))
+                            (|makeByteWordVec2| 113
+                                '(1 10 9 0 11 3 10 9 0 12 12 13 2 10 9
+                                  0 5 16 1 10 9 0 17 0 18 0 19 2 10 0
+                                  12 18 20 1 10 9 0 21 1 10 9 0 22 1 10
+                                  9 0 23 1 5 31 0 32 1 0 0 5 34 2 82 0
+                                  0 0 83 2 5 0 0 0 84 2 0 7 0 0 1 1 0 0
+                                  0 42 1 0 7 0 70 2 0 0 0 0 51 1 0 95 0
+                                  96 1 0 0 0 1 1 0 7 0 1 2 0 0 0 0 1 2
+                                  0 99 0 0 1 3 0 0 0 0 0 80 1 0 0 0 1 1
+                                  0 112 0 1 2 0 7 0 0 1 0 0 61 81 1 0 5
+                                  0 1 2 0 0 0 0 77 0 0 0 1 1 0 105 0 1
+                                  1 0 5 0 1 2 0 0 0 0 64 1 0 28 29 30 2
+                                  0 88 29 89 90 1 0 99 0 1 1 0 98 0 1 1
+                                  0 7 0 1 1 0 97 0 1 0 0 0 93 1 0 0 0
+                                  94 2 0 0 0 0 63 1 0 108 106 1 1 0 7 0
+                                  1 3 0 0 0 0 0 1 2 0 0 0 0 91 1 0 7 0
+                                  1 2 0 0 0 0 1 3 0 102 0 103 102 1 2 0
+                                  0 0 0 50 1 0 7 0 71 1 0 7 0 69 1 0 0
+                                  0 43 1 0 99 0 1 1 0 7 0 8 2 0 107 106
+                                  0 1 3 0 0 0 0 0 78 0 0 0 40 2 0 0 0 0
+                                  73 0 0 0 39 2 0 0 0 0 72 1 0 0 0 1 1
+                                  0 82 0 86 1 0 0 0 76 1 0 28 89 1 2 0
+                                  88 89 0 1 1 0 0 106 1 2 0 0 0 0 1 1 0
+                                  12 0 1 2 0 0 0 0 1 0 0 0 1 1 0 0 82
+                                  85 1 0 0 0 56 1 0 74 0 75 2 0 113 113
+                                  113 1 1 0 0 106 1 2 0 0 0 0 67 1 0 0
+                                  0 1 1 0 112 0 1 2 0 109 0 0 1 3 0 111
+                                  0 0 0 1 2 0 99 0 0 1 2 0 107 106 0 1
+                                  1 0 7 0 1 1 0 61 0 1 2 0 65 0 0 66 2
+                                  0 0 0 61 1 1 0 0 0 1 1 0 0 0 57 1 0 0
+                                  0 1 1 0 100 0 1 1 0 101 0 1 1 0 104 0
+                                  1 1 0 103 0 1 1 0 5 0 15 1 0 0 5 92 1
+                                  0 0 0 1 1 0 0 5 92 1 0 31 0 33 0 0 61
+                                  1 2 0 7 0 0 1 2 0 0 0 0 1 2 0 7 0 0 1
+                                  0 0 0 38 2 0 7 0 0 1 2 0 0 0 0 48 3 0
+                                  0 0 0 0 79 1 0 0 0 68 2 0 0 0 0 45 0
+                                  0 0 36 2 0 0 0 0 49 0 0 0 37 3 0 9 10
+                                  0 7 27 2 0 12 0 7 25 2 0 9 10 0 26 1
+                                  0 12 0 24 1 0 0 0 46 2 0 0 0 61 1 1 0
+                                  0 0 1 2 0 0 0 0 47 2 0 7 0 0 55 2 0 7
+                                  0 0 53 2 0 7 0 0 41 2 0 7 0 0 54 2 0
+                                  7 0 0 52 2 0 0 0 0 44 1 0 0 0 14 2 0
+                                  0 0 0 59 2 0 0 0 0 58 2 0 0 0 61 62 2
+                                  0 0 0 82 1 2 0 0 5 0 35 2 0 0 0 0 60
+                                  2 0 0 5 0 35 2 0 0 61 0 1 2 0 0 82 0
+                                  1)))))
           '|lookupComplete|)) 
 
 (MAKEPROP '|SingleInteger| 'NILADIC T) 

Modified: trunk/src/interp/g-opt.boot
===================================================================
--- trunk/src/interp/g-opt.boot	2010-07-26 02:49:04 UTC (rev 1711)
+++ trunk/src/interp/g-opt.boot	2010-07-26 06:54:30 UTC (rev 1712)
@@ -147,6 +147,8 @@
 
 ++ Simplify the VM form `x'
 simplifyVMForm x ==
+  x = '%icst0 => 0
+  x = '%icst1 => 1
   isAtomicForm x => x
   x.op = 'CLOSEDFN => x
   atom x.op =>
@@ -440,6 +442,7 @@
        CGREATERP GGREATERP CHAR GET BVEC_-GREATER %false %true
         %and %or %not %peq %ieq %ilt %ile %igt %ige %head %tail %integer?
          %beq %blt %ble %bgt %bge %bitand %bitior %bitnot %bcompl
+         %icst0 %icst1
           %imul %iadd %isub %igcd %ilcm %ipow %imin %imax %ieven? %iodd? %iinc
            %feq %flt %fle %fgt %fge %fmul %fadd %fsub %fexp %fmin %fmax %float?
             %fpow %fdiv %fneg %i2f %fminval %fmaxval %fbase %fprec %ftrunc
@@ -673,9 +676,14 @@
   x
 
 optIlt(x is ['%ilt,a,b]) ==
+  -- 1. Don't delay if both operands are literals.
   integer? a and integer? b =>
     a < b => '%true
     '%false
+  -- 2. max(a,b) cannot be negative if either a or b is zero.
+  b = 0 and a is ['%imax,:.] and (second a = 0 or third a = 0) => '%false
+  -- 3. min(a,b) cannot be positive if either a or b is zero.
+  a = 0 and b is ['%imin,:.] and (second b = 0 or third b = 0) => '%false
   x
 
 optIle(x is ['%ile,a,b]) ==


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1713
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1713&view=rev
Author:   dos-reis
Date:     2010-07-26 16:33:38 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
	* interp/g-opt.boot ($VMsideEffectFreeOperators): Include new
	opcodes %icst0,	%icst1, %when, and %ccst.
	* interp/g-util.boot: Expand %ccst.
	* algebra/alql.spad.pamphlet: Clean up.
	* algebra/array1.spad.pamphlet: Likewise.
	* algebra/c02.spad.pamphlet: Likewise.
	* algebra/d03.spad.pamphlet: Likewise.
	* algebra/e04.spad.pamphlet: Likewise.
	* algebra/integer.spad.pamphlet: Likewise.
	* algebra/si.spad.pamphlet: Likewise.
	* algebra/string.spad.pamphlet: Likewise.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/algebra/alql.spad.pamphlet
    trunk/src/algebra/array1.spad.pamphlet
    trunk/src/algebra/c02.spad.pamphlet
    trunk/src/algebra/d03.spad.pamphlet
    trunk/src/algebra/e04.spad.pamphlet
    trunk/src/algebra/integer.spad.pamphlet
    trunk/src/algebra/si.spad.pamphlet
    trunk/src/algebra/strap/CHAR.lsp
    trunk/src/algebra/strap/INT.lsp
    trunk/src/algebra/strap/ISTRING.lsp
    trunk/src/algebra/string.spad.pamphlet
    trunk/src/interp/g-opt.boot
    trunk/src/interp/g-util.boot

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-26 06:54:30 UTC (rev 1712)
+++ trunk/src/ChangeLog	2010-07-26 16:33:38 UTC (rev 1713)
@@ -1,5 +1,19 @@
 2010-07-26  Gabriel Dos Reis  <gdr@...>
 
+	* interp/g-opt.boot ($VMsideEffectFreeOperators): Include new
+	opcodes %icst0,	%icst1, %when, and %ccst.
+	* interp/g-util.boot: Expand %ccst.
+	* algebra/alql.spad.pamphlet: Clean up.
+	* algebra/array1.spad.pamphlet: Likewise.
+	* algebra/c02.spad.pamphlet: Likewise.
+	* algebra/d03.spad.pamphlet: Likewise.
+	* algebra/e04.spad.pamphlet: Likewise.
+	* algebra/integer.spad.pamphlet: Likewise.
+	* algebra/si.spad.pamphlet: Likewise.
+	* algebra/string.spad.pamphlet: Likewise.
+
+2010-07-26  Gabriel Dos Reis  <gdr@...>
+
 	* algebra/si.spad.pamphlet (SingleInteger): Tidy.
 	* interp/g-opt.boot (simplifyVMForm): Expand %icst0 and %icst1.
 	(optIlt): Fold more configurations.

Modified: trunk/src/algebra/alql.spad.pamphlet
===================================================================
--- trunk/src/algebra/alql.spad.pamphlet	2010-07-26 06:54:30 UTC (rev 1712)
+++ trunk/src/algebra/alql.spad.pamphlet	2010-07-26 16:33:38 UTC (rev 1713)
@@ -55,6 +55,7 @@
       ++ \axiom{s} is not of the right format then an error will occur when using
       ++ it.
   Implementation == add
+    macro I == Integer
     Rep == String
 
     x<y == rep x < rep y
@@ -63,15 +64,15 @@
 
     display(x) ==
       name : OutputForm := dbName(x)$Lisp
-      type : OutputForm := dbPart(x,4,1$Lisp)$Lisp
+      type : OutputForm := dbPart(x,4,1@...
       output(hconcat(name,hconcat(" : ",type)))$OutputPackage
 
     fullDisplay(x) ==
       name : OutputForm := dbName(x)$Lisp
-      type : OutputForm := dbPart(x,4,1$Lisp)$Lisp
+      type : OutputForm := dbPart(x,4,1@...
       origin:OutputForm := hconcat(alqlGetOrigin(x$Lisp)$Lisp,alqlGetParams(x$Lisp)$Lisp)
       fromPart : OutputForm := hconcat(" from ",origin)
-      condition : String := dbPart(x,6,1$Lisp)$Lisp
+      condition : String := dbPart(x,6,1@...
       ifPart : OutputForm :=
         condition = "" => empty()
         hconcat(" if ",condition::OutputForm)
@@ -89,14 +90,14 @@
 
     elt(x,sel) ==
       sel = 'name => dbName(x)$Lisp
-      sel = 'nargs => dbPart(x,2,1$Lisp)$Lisp
+      sel = 'nargs => dbPart(x,2,1@...
       sel = 'exposed => SUBSTRING(dbPart(x,3,1)$Lisp,0,1)$Lisp 
-      sel = 'type => dbPart(x,4,1$Lisp)$Lisp
-      sel = 'abbreviation => dbPart(x,5,1$Lisp)$Lisp
+      sel = 'type => dbPart(x,4,1@...
+      sel = 'abbreviation => dbPart(x,5,1@...
       sel = 'kind => alqlGetKindString(x)$Lisp
       sel = 'origin => alqlGetOrigin(x)$Lisp
       sel = 'params => alqlGetParams(x)$Lisp
-      sel = 'condition => dbPart(x,6,1$Lisp)$Lisp
+      sel = 'condition => dbPart(x,6,1@...
       sel = 'doc => dbComments(x)$Lisp
       userError "unknown selector"
 

Modified: trunk/src/algebra/array1.spad.pamphlet
===================================================================
--- trunk/src/algebra/array1.spad.pamphlet	2010-07-26 06:54:30 UTC (rev 1712)
+++ trunk/src/algebra/array1.spad.pamphlet	2010-07-26 16:33:38 UTC (rev 1713)
@@ -15,8 +15,10 @@
 ++ This provides a fast array type with no bound checking on elt's.
 ++ Minimum index is 0 in this type, cannot be changed
 PrimitiveArray(S:Type): OneDimensionalArrayAggregate S == add
+   macro NNI == NonNegativeInteger
    import %vlength: % -> NonNegativeInteger from Foreign Builtin
    import %vref: (%,Integer) -> S           from Foreign Builtin
+   import makeSimpleArray: (Domain,NNI) -> % from Foreign Builtin
 
    #x == %vlength x
 
@@ -24,7 +26,7 @@
      0
  
    empty() == 
-     makeSimpleArray(getVMType(S)$Lisp,0$Lisp)$Lisp
+     makeSimpleArray(getVMType(S)$Lisp,0)
 
    construct l ==
      makeSimpleArrayFromList(getVMType(S)$Foreign(Builtin),l)$Foreign(Builtin)
@@ -429,12 +431,12 @@
      qsetelt!(x, i, s) == Qsetelt(x, i-1, s)
 
      elt(x:%, i:I) ==
-       QSLESSP(i,1$Lisp)$Lisp or QSLESSP(%vlength x,i)$Lisp =>
+       QSLESSP(i,1@... or QSLESSP(%vlength x,i)$Lisp =>
          error "index out of range"
        %vref(x, i-1)
 
      setelt(x:%, i:I, s:S) ==
-       QSLESSP(i,1$Lisp)$Lisp or QSLESSP(%vlength x,i)$Lisp =>
+       QSLESSP(i,1@... or QSLESSP(%vlength x,i)$Lisp =>
          error "index out of range"
        Qsetelt(x, i-1, s)
 

Modified: trunk/src/algebra/c02.spad.pamphlet
===================================================================
--- trunk/src/algebra/c02.spad.pamphlet	2010-07-26 06:54:30 UTC (rev 1712)
+++ trunk/src/algebra/c02.spad.pamphlet	2010-07-26 16:33:38 UTC (rev 1713)
@@ -48,6 +48,7 @@
     import AnyFunctions1(Matrix DoubleFloat)
     import AnyFunctions1(Integer)
     import AnyFunctions1(Boolean)
+    macro I == Integer
 
 
     c02aff(aArg:Matrix DoubleFloat,nArg:Integer,scaleArg:Boolean,_
@@ -56,8 +57,8 @@
 	"c02aff",_
 	["n"::S,"scale"::S,"ifail"::S,"a"::S,"z"::S,"w"::S]$Lisp,_
 	["z"::S,"w"::S]$Lisp,_
-	[["double"::S,["a"::S,2$Lisp,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp_
-	,["z"::S,2$Lisp,"n"::S]$Lisp,["w"::S,["*"::S,["+"::S,"n"::S,1$Lisp]$Lisp,4$Lisp]$Lisp]$Lisp]$Lisp_
+	[["double"::S,["a"::S,2$Lisp,["+"::S,"n"::S,1@..._
+	,["z"::S,2$Lisp,"n"::S]$Lisp,["w"::S,["*"::S,["+"::S,"n"::S,1@..._
 	,["integer"::S,"n"::S,"ifail"::S]$Lisp_
 	,["logical"::S,"scale"::S]$Lisp_
 	]$Lisp,_
@@ -74,8 +75,8 @@
 	"c02agf",_
 	["n"::S,"scale"::S,"ifail"::S,"a"::S,"z"::S,"w"::S]$Lisp,_
 	["z"::S,"w"::S]$Lisp,_
-	[["double"::S,["a"::S,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp_
-	,["z"::S,2$Lisp,"n"::S]$Lisp,["w"::S,["*"::S,["+"::S,"n"::S,1$Lisp]$Lisp,2$Lisp]$Lisp]$Lisp]$Lisp_
+	[["double"::S,["a"::S,["+"::S,"n"::S,1@..._
+	,["z"::S,2$Lisp,"n"::S]$Lisp,["w"::S,["*"::S,["+"::S,"n"::S,1@..._
 	,["integer"::S,"n"::S,"ifail"::S]$Lisp_
 	,["logical"::S,"scale"::S]$Lisp_
 	]$Lisp,_

Modified: trunk/src/algebra/d03.spad.pamphlet
===================================================================
--- trunk/src/algebra/d03.spad.pamphlet	2010-07-26 06:54:30 UTC (rev 1712)
+++ trunk/src/algebra/d03.spad.pamphlet	2010-07-26 16:33:38 UTC (rev 1713)
@@ -64,6 +64,7 @@
     import FortranPackage
     import Union(fn:FileName,fp:Asp73(PDEF))
     import Union(fn:FileName,fp:Asp74(BNDY))
+    macro I == Integer
 
 
 
@@ -136,11 +137,11 @@
 	,"lwrk"::S,"pertrb"::S,"ifail"::S,"bdxs"::S,"bdxf"::S,"bdys"::S,"bdyf"::S,"bdzs"::S_
 	,"bdzf"::S,"f"::S,"w"::S]$Lisp,_
 	["pertrb"::S,"w"::S]$Lisp,_
-	[["double"::S,"xs"::S,"xf"::S,["bdxs"::S,"mdimf"::S,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp_
-	,["bdxf"::S,"mdimf"::S,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp,"ys"::S,"yf"::S,["bdys"::S,"ldimf"::S,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp_
-	,["bdyf"::S,"ldimf"::S,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp,"zs"::S_
-	,"zf"::S,["bdzs"::S,"ldimf"::S,["+"::S,"m"::S,1$Lisp]$Lisp]$Lisp,["bdzf"::S,"ldimf"::S,["+"::S,"m"::S,1$Lisp]$Lisp]$Lisp_
-	,"lambda"::S,"pertrb"::S,["f"::S,"ldimf"::S,"mdimf"::S,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp,["w"::S,"lwrk"::S]$Lisp]$Lisp_
+	[["double"::S,"xs"::S,"xf"::S,["bdxs"::S,"mdimf"::S,["+"::S,"n"::S,1@..._
+	,["bdxf"::S,"mdimf"::S,["+"::S,"n"::S,1@..._
+	,["bdyf"::S,"ldimf"::S,["+"::S,"n"::S,1@..._
+	,"zf"::S,["bdzs"::S,"ldimf"::S,["+"::S,"m"::S,1@..._
+	,"lambda"::S,"pertrb"::S,["f"::S,"ldimf"::S,"mdimf"::S,["+"::S,"n"::S,1@..._
 	,["integer"::S,"l"::S,"lbdcnd"::S,"m"::S,"mbdcnd"::S_
 	,"n"::S,"nbdcnd"::S,"ldimf"::S,"mdimf"::S,"lwrk"::S,"ifail"::S]$Lisp_
 	]$Lisp,_

Modified: trunk/src/algebra/e04.spad.pamphlet
===================================================================
--- trunk/src/algebra/e04.spad.pamphlet	2010-07-26 06:54:30 UTC (rev 1712)
+++ trunk/src/algebra/e04.spad.pamphlet	2010-07-26 16:33:38 UTC (rev 1713)
@@ -115,6 +115,7 @@
     import AnyFunctions1(Boolean)
     import AnyFunctions1(Matrix DoubleFloat)
     import AnyFunctions1(Matrix Integer)
+    macro I == Integer
 
 
     e04dgf(nArg:Integer,esArg:DoubleFloat,fuArg:DoubleFloat,_
@@ -139,7 +140,7 @@
 	,"op"::S,"objf"::S,["objgrd"::S,"n"::S]$Lisp,["x"::S,"n"::S]$Lisp,["work"::S,["*"::S,13$Lisp,"n"::S]$Lisp]$Lisp,["user"::S,"*"::S]$Lisp_
 	,"objfun"::S]$Lisp_
 	,["integer"::S,"n"::S,"it"::S,"pr"::S,"sta"::S_
-	,"sto"::S,"ve"::S,"iter"::S,"ifail"::S,["iwork"::S,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp,["iuser"::S,"*"::S]$Lisp]$Lisp_
+	,"sto"::S,"ve"::S,"iter"::S,"ifail"::S,["iwork"::S,["+"::S,"n"::S,1@..._
 	,["logical"::S,"list"::S]$Lisp_
 	]$Lisp,_
 	["iter"::S,"objf"::S,"objgrd"::S,"x"::S,"ifail"::S]$Lisp,_
@@ -321,11 +322,11 @@
 	,"cra"::S,"fea"::S,"fun"::S,"infb"::S,"infs"::S,"linf"::S,"lint"::S,"nonf"::S,"opt"::S,"ste"::S_
 	,["c"::S,"ncnln"::S]$Lisp,"objf"::S,["objgrd"::S,"n"::S]$Lisp,["cjac"::S,"nrowj"::S,"n"::S]$Lisp,["clamda"::S,["+"::S,["+"::S,"nclin"::S,"ncnln"::S]$Lisp,"n"::S]$Lisp]$Lisp_
 	,["r"::S,"nrowr"::S,"n"::S]$Lisp,["x"::S,"n"::S]$Lisp,["work"::S,"lwork"::S]$Lisp_
-	,["user"::S,1$Lisp]$Lisp,"confun"::S,"objfun"::S]$Lisp_
+	,["user"::S,1@..._
 	,["integer"::S,"n"::S,"nclin"::S,"ncnln"::S_
 	,"nrowa"::S,"nrowj"::S,"nrowr"::S,"liwork"::S,"lwork"::S,"der"::S,"maji"::S,"majp"::S,"mini"::S,"minp"::S,"mon"::S,"stao"::S_
 	,"stac"::S,"stoo"::S,"stoc"::S,"ve"::S,"iter"::S,["istate"::S,["+"::S,["+"::S,"nclin"::S,"ncnln"::S]$Lisp,"n"::S]$Lisp]$Lisp_
-	,"ifail"::S,["iwork"::S,"liwork"::S]$Lisp,["iuser"::S,1$Lisp]$Lisp]$Lisp_
+	,"ifail"::S,["iwork"::S,"liwork"::S]$Lisp,["iuser"::S,1@..._
 	,["logical"::S,"sta"::S,"hes"::S,"list"::S]$Lisp_
 	]$Lisp,_
 	["iter"::S,"c"::S,"objf"::S,"objgrd"::S,"istate"::S,"cjac"::S,"clamda"::S,"r"::S,"x"::S,"ifail"::S]$Lisp,_

Modified: trunk/src/algebra/integer.spad.pamphlet
===================================================================
--- trunk/src/algebra/integer.spad.pamphlet	2010-07-26 06:54:30 UTC (rev 1712)
+++ trunk/src/algebra/integer.spad.pamphlet	2010-07-26 16:33:38 UTC (rev 1713)
@@ -82,17 +82,29 @@
  == add
       ZP ==> SparseUnivariatePolynomial %
       ZZP ==> SparseUnivariatePolynomial Integer
+      import %icst0: %                 from Foreign Builtin
+      import %icst1: %                 from Foreign Builtin
       import %ineg: % -> %             from Foreign Builtin
+      import %iabs: % -> %             from Foreign Builtin
+      import %iodd?: % -> Boolean      from Foreign Builtin
       import %hash: % -> SingleInteger from Foreign Builtin
       import %iadd: (%,%) -> %         from Foreign Builtin
       import %isub: (%,%) -> %         from Foreign Builtin
       import %imul: (%,%) -> %         from Foreign Builtin
+      import %imax: (%,%) -> %         from Foreign Builtin
+      import %imin: (%,%) -> %         from Foreign Builtin
+      import %igcd: (%,%) -> %         from Foreign Builtin
+      import %ieq: (%,%) -> Boolean    from Foreign Builtin
+      import %ilt: (%,%) -> Boolean    from Foreign Builtin
+      import %ile: (%,%) -> Boolean    from Foreign Builtin
+      import %igt: (%,%) -> Boolean    from Foreign Builtin
+      import %ige: (%,%) -> Boolean    from Foreign Builtin
 
       x,y: %
       n: NonNegativeInteger
 
       writeOMInt(dev: OpenMathDevice, x: %): Void ==
-        if x < 0 then
+        if negative? x then
           OMputApp(dev)
           OMputSymbol(dev, "arith1", "unary__minus")
           OMputInteger(dev, (-x) pretend Integer)
@@ -102,27 +114,25 @@
 
       OMwrite(x: %): String ==
         s: String := ""
-        sp := OM_-STRINGTOSTRINGPTR(s)$Lisp
-        dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML())
+        sp: String := OM_-STRINGTOSTRINGPTR(s)$Lisp
+        dev: OpenMathDevice := OMopenString(sp, OMencodingXML())
         OMputObject(dev)
         writeOMInt(dev, x)
         OMputEndObject(dev)
         OMclose(dev)
-        s := OM_-STRINGPTRTOSTRING(sp)$Lisp pretend String
-        s
+        OM_-STRINGPTRTOSTRING(sp)$Lisp
 
       OMwrite(x: %, wholeObj: Boolean): String ==
         s: String := ""
-        sp := OM_-STRINGTOSTRINGPTR(s)$Lisp
-        dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML())
+        sp: String := OM_-STRINGTOSTRINGPTR(s)$Lisp
+        dev: OpenMathDevice := OMopenString(sp, OMencodingXML())
         if wholeObj then
           OMputObject(dev)
         writeOMInt(dev, x)
         if wholeObj then
           OMputEndObject(dev)
         OMclose(dev)
-        s := OM_-STRINGPTRTOSTRING(sp)$Lisp pretend String
-        s
+        OM_-STRINGPTRTOSTRING(sp)$Lisp
 
       OMwrite(dev: OpenMathDevice, x: %): Void ==
         OMputObject(dev)
@@ -136,34 +146,36 @@
         if wholeObj then
           OMputEndObject(dev)
 
-      zero? x == ZEROP(x)$Lisp
-      one? x == x = 1
-      0 == 0$Lisp
-      1 == 1$Lisp
-      base()  == 2$Lisp
+      zero? x == x = 0@%
+      one? x == x = 1@%
+      0 == %icst0
+      1 == %icst1
+      base()  == 2 pretend %
       copy x  == x
-      inc  x  == x + 1
-      dec  x  == x - 1
+      inc  x  == x + 1@%
+      dec  x  == x - 1@%
       hash x == %hash x
-      negative? x == x < 0
+      negative? x == x < 0@%
       coerce(x):OutputForm == outputForm(x pretend Integer)
       coerce(m:Integer):% == m pretend %
       convert(x:%):Integer == x pretend Integer
       length a == INTEGER_-LENGTH(a)$Lisp
       addmod(a, b, p) ==
-         (c := %iadd(a,b)) >= p => c - p
+         c := %iadd(a,b)
+         c >= p => c - p
          c
       submod(a, b, p) ==
-         (c := %isub(a,b)) < 0 => c + p
+         c := %isub(a,b)
+         negative? c => c + p
          c
       mulmod(a, b, p) == %imul(a,b) rem p
-      convert(x:%):Float       == coerce(x pretend Integer)$Float
-      convert(x:%):DoubleFloat  == coerce(x pretend Integer)$DoubleFloat
-      convert(x:%):InputForm   == convert(x pretend Integer)$InputForm
-      convert(x:%):String      == string(x pretend Integer)$String
+      convert(x:%):Float       == coerce(x)$Float
+      convert(x:%):DoubleFloat  == coerce(x)$DoubleFloat
+      convert(x:%):InputForm   == convert(x)$InputForm
+      convert(x:%):String      == string(x)$String
 
       latex(x:%):String ==
-        s : String := string(x pretend Integer)$String
+        s : String := string(x)$String
         (-1 < (x pretend Integer)) and ((x  pretend Integer) < 10) => s
         concat("{", concat(s, "}")$String)$String
 
@@ -180,33 +192,33 @@
        Record(mat:Matrix(Integer), vec:Vector(Integer)) ==
         [m pretend Matrix(Integer), vec pretend Vector(Integer)]
 
-      abs(x) == %iabs(x)$Foreign(Builtin)
+      abs(x) == %iabs x
       random() == random()$Lisp
       random(x) == RANDOM(x)$Lisp
-      x = y == %ieq(x,y)$Foreign(Builtin)
-      x < y == %ilt(x,y)$Foreign(Builtin)
-      x > y == %igt(x,y)$Foreign(Builtin)
-      x <= y == %ile(x,y)$Foreign(Builtin)
-      x >= y == %ige(x,y)$Foreign(Builtin)
+      x = y == %ieq(x,y)
+      x < y == %ilt(x,y)
+      x > y == %igt(x,y)
+      x <= y == %ile(x,y)
+      x >= y == %ige(x,y)
       - x == %ineg x
       x + y == %iadd(x,y)
       x - y == %isub(x,y)
       x * y == %imul(x,y)
       (m:Integer) * (y:%) == %imul(m,y) -- for subsumption problem
       x ** n == %ipow(x,n)$Foreign(Builtin)
-      odd? x == %iodd?(x)$Foreign(Builtin)
-      max(x,y) == %imax(x,y)$Foreign(Builtin)
-      min(x,y) == %imin(x,y)$Foreign(Builtin)
+      odd? x == %iodd? x
+      max(x,y) == %imax(x,y)
+      min(x,y) == %imin(x,y)
       divide(x,y) == DIVIDE2(x,y)$Lisp
       x quo y == QUOTIENT2(x,y)$Lisp
       x rem y == REMAINDER2(x,y)$Lisp
       shift(x, y) == ASH(x,y)$Lisp
       recip(x) == if one? x or x=-1 then x else "failed"
-      gcd(x,y) == %igcd(x,y)$Foreign(Builtin)
+      gcd(x,y) == %igcd(x,y)
       UCA ==> Record(unit:%,canonical:%,associate:%)
       unitNormal x ==
-         x < 0 => [-1,-x,-1]$UCA
-         [1,x,1]$UCA
+         negative? x => [-1@...
+         [1@...
       unitCanonical x == abs x
       solveLinearPolynomialEquation(lp:List ZP,p:ZP):Union(List ZP,"failed") ==
          solveLinearPolynomialEquation(lp pretend List ZZP,

Modified: trunk/src/algebra/si.spad.pamphlet
===================================================================
--- trunk/src/algebra/si.spad.pamphlet	2010-07-26 06:54:30 UTC (rev 1712)
+++ trunk/src/algebra/si.spad.pamphlet	2010-07-26 16:33:38 UTC (rev 1713)
@@ -210,13 +210,6 @@
 
  == SubDomain(Integer, SMINTP(#1)$Lisp) add
 
-   seed : % := 1$Lisp               -- for random()
-   MAXINT ==> _$ShortMaximum$Lisp
-   MININT ==> _$ShortMinimum$Lisp
-   BASE ==> 67108864$Lisp           -- 2**26
-   MULTIPLIER ==> 314159269$Lisp    -- from Knuth's table
-   MODULUS ==> 2147483647$Lisp      -- 2**31-1
-
    import %icst0: %                 from Foreign Builtin
    import %icst1: %                 from Foreign Builtin
    import %iadd: (%,%) -> %         from Foreign Builtin
@@ -235,6 +228,13 @@
    import %igt: (%,%) -> Boolean    from Foreign Builtin
    import %ige: (%,%) -> Boolean    from Foreign Builtin
 
+   seed : % := %icst1               -- for random()
+   MAXINT ==> _$ShortMaximum$Lisp
+   MININT ==> _$ShortMinimum$Lisp
+   BASE ==> 67108864$Lisp           -- 2**26
+   MULTIPLIER ==> 314159269$Lisp    -- from Knuth's table
+   MODULUS ==> 2147483647$Lisp      -- 2**31-1
+
    writeOMSingleInt(dev: OpenMathDevice, x: %): Void ==
     if negative? x then
       OMputApp(dev)

Modified: trunk/src/algebra/strap/CHAR.lsp
===================================================================
--- trunk/src/algebra/strap/CHAR.lsp	2010-07-26 06:54:30 UTC (rev 1712)
+++ trunk/src/algebra/strap/CHAR.lsp	2010-07-26 16:33:38 UTC (rev 1713)
@@ -51,15 +51,15 @@
 
 (DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Char|) |CHAR;space;$;12|)) 
 
-(PUT '|CHAR;space;$;12| '|SPADreplace| '(XLAM NIL (CHAR "   " 0))) 
+(PUT '|CHAR;space;$;12| '|SPADreplace| '(XLAM NIL (|%ccst| " "))) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Char|) |CHAR;quote;$;13|)) 
 
-(PUT '|CHAR;quote;$;13| '|SPADreplace| '(XLAM NIL (CHAR "\" " 0))) 
+(PUT '|CHAR;quote;$;13| '|SPADreplace| '(XLAM NIL (|%ccst| "\""))) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Char|) |CHAR;escape;$;14|)) 
 
-(PUT '|CHAR;escape;$;14| '|SPADreplace| '(XLAM NIL (CHAR "_ " 0))) 
+(PUT '|CHAR;escape;$;14| '|SPADreplace| '(XLAM NIL (|%ccst| "_"))) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) |%Thing|)
                 |CHAR;coerce;$Of;15|)) 
@@ -141,11 +141,11 @@
 
 (DEFUN |CHAR;random;$;11| ($) (CODE-CHAR (RANDOM 256))) 
 
-(DEFUN |CHAR;space;$;12| ($) (DECLARE (IGNORE $)) (CHAR "   " 0)) 
+(DEFUN |CHAR;space;$;12| ($) (DECLARE (IGNORE $)) #\Space) 
 
-(DEFUN |CHAR;quote;$;13| ($) (DECLARE (IGNORE $)) (CHAR "\" " 0)) 
+(DEFUN |CHAR;quote;$;13| ($) (DECLARE (IGNORE $)) #\") 
 
-(DEFUN |CHAR;escape;$;14| ($) (DECLARE (IGNORE $)) (CHAR "_ " 0)) 
+(DEFUN |CHAR;escape;$;14| ($) (DECLARE (IGNORE $)) #\_) 
 
 (DEFUN |CHAR;coerce;$Of;15| (|c| $) (DECLARE (IGNORE $)) |c|) 
 

Modified: trunk/src/algebra/strap/INT.lsp
===================================================================
--- trunk/src/algebra/strap/INT.lsp	2010-07-26 06:54:30 UTC (rev 1712)
+++ trunk/src/algebra/strap/INT.lsp	2010-07-26 16:33:38 UTC (rev 1713)
@@ -20,8 +20,6 @@
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Boolean|)
                 |INT;zero?;$B;6|)) 
 
-(PUT '|INT;zero?;$B;6| '|SPADreplace| 'ZEROP) 
-
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Boolean|)
                 |INT;one?;$B;7|)) 
 
@@ -255,6 +253,8 @@
 (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
                 |INT;gcdPolynomial;3Sup;60|)) 
 
+(PUT '|INT;zero?;$B;6| '|SPADreplace| '(XLAM (|x|) (|%ieq| |x| 0))) 
+
 (PUT '|INT;one?;$B;7| '|SPADreplace| '(XLAM (|x|) (|%ieq| |x| 1))) 
 
 (PUT '|INT;inc;2$;12| '|SPADreplace| '(XLAM (|x|) (|%iadd| |x| 1))) 
@@ -269,43 +269,43 @@
 (DEFUN |INT;writeOMInt| (|dev| |x| $)
   (SEQ (COND
          ((MINUSP |x|)
-          (SEQ (SPADCALL |dev| (|getShellEntry| $ 13))
+          (SEQ (SPADCALL |dev| (|getShellEntry| $ 10))
                (SPADCALL |dev| "arith1" "unary_minus"
-                   (|getShellEntry| $ 15))
-               (SPADCALL |dev| (- |x|) (|getShellEntry| $ 18))
-               (EXIT (SPADCALL |dev| (|getShellEntry| $ 19)))))
-         (T (SPADCALL |dev| |x| (|getShellEntry| $ 18)))))) 
+                   (|getShellEntry| $ 12))
+               (SPADCALL |dev| (- |x|) (|getShellEntry| $ 15))
+               (EXIT (SPADCALL |dev| (|getShellEntry| $ 16)))))
+         (T (SPADCALL |dev| |x| (|getShellEntry| $ 15)))))) 
 
 (DEFUN |INT;OMwrite;$S;2| (|x| $)
   (LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
-         (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 21))
-                    (|getShellEntry| $ 22))))
-    (SEQ (SPADCALL |dev| (|getShellEntry| $ 23))
+         (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 18))
+                    (|getShellEntry| $ 19))))
+    (SEQ (SPADCALL |dev| (|getShellEntry| $ 20))
          (|INT;writeOMInt| |dev| |x| $)
-         (SPADCALL |dev| (|getShellEntry| $ 24))
-         (SPADCALL |dev| (|getShellEntry| $ 25))
-         (SETQ |s| (OM-STRINGPTRTOSTRING |sp|)) (EXIT |s|)))) 
+         (SPADCALL |dev| (|getShellEntry| $ 21))
+         (SPADCALL |dev| (|getShellEntry| $ 22))
+         (EXIT (OM-STRINGPTRTOSTRING |sp|))))) 
 
 (DEFUN |INT;OMwrite;$BS;3| (|x| |wholeObj| $)
   (LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
-         (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 21))
-                    (|getShellEntry| $ 22))))
-    (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23))))
+         (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 18))
+                    (|getShellEntry| $ 19))))
+    (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 20))))
          (|INT;writeOMInt| |dev| |x| $)
-         (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 24))))
-         (SPADCALL |dev| (|getShellEntry| $ 25))
-         (SETQ |s| (OM-STRINGPTRTOSTRING |sp|)) (EXIT |s|)))) 
+         (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 21))))
+         (SPADCALL |dev| (|getShellEntry| $ 22))
+         (EXIT (OM-STRINGPTRTOSTRING |sp|))))) 
 
 (DEFUN |INT;OMwrite;Omd$V;4| (|dev| |x| $)
-  (SEQ (SPADCALL |dev| (|getShellEntry| $ 23))
+  (SEQ (SPADCALL |dev| (|getShellEntry| $ 20))
        (|INT;writeOMInt| |dev| |x| $)
-       (EXIT (SPADCALL |dev| (|getShellEntry| $ 24))))) 
+       (EXIT (SPADCALL |dev| (|getShellEntry| $ 21))))) 
 
 (DEFUN |INT;OMwrite;Omd$BV;5| (|dev| |x| |wholeObj| $)
-  (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23))))
+  (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 20))))
        (|INT;writeOMInt| |dev| |x| $)
        (EXIT (COND
-               (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 24))))))) 
+               (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 21))))))) 
 
 (DEFUN |INT;zero?;$B;6| (|x| $) (DECLARE (IGNORE $)) (ZEROP |x|)) 
 
@@ -330,7 +330,7 @@
   (MINUSP |x|)) 
 
 (DEFUN |INT;coerce;$Of;16| (|x| $)
-  (SPADCALL |x| (|getShellEntry| $ 45))) 
+  (SPADCALL |x| (|getShellEntry| $ 42))) 
 
 (DEFUN |INT;coerce;2$;17| (|m| $) (DECLARE (IGNORE $)) |m|) 
 
@@ -351,14 +351,14 @@
   (REMAINDER2 (* |a| |b|) |p|)) 
 
 (DEFUN |INT;convert;$F;23| (|x| $)
-  (SPADCALL |x| (|getShellEntry| $ 56))) 
+  (SPADCALL |x| (|getShellEntry| $ 53))) 
 
 (DEFUN |INT;convert;$Df;24| (|x| $)
   (DECLARE (IGNORE $))
   (FLOAT |x| |$DoubleFloatMaximum|)) 
 
 (DEFUN |INT;convert;$If;25| (|x| $)
-  (SPADCALL |x| (|getShellEntry| $ 62))) 
+  (SPADCALL |x| (|getShellEntry| $ 59))) 
 
 (DEFUN |INT;convert;$S;26| (|x| $)
   (DECLARE (IGNORE $))
@@ -457,50 +457,50 @@
   (ABS |x|)) 
 
 (DEFUN |INT;solveLinearPolynomialEquation| (|lp| |p| $)
-  (SPADCALL |lp| |p| (|getShellEntry| $ 102))) 
+  (SPADCALL |lp| |p| (|getShellEntry| $ 101))) 
 
 (DEFUN |INT;squareFreePolynomial| (|p| $)
-  (SPADCALL |p| (|getShellEntry| $ 106))) 
+  (SPADCALL |p| (|getShellEntry| $ 105))) 
 
 (DEFUN |INT;factorPolynomial| (|p| $)
-  (LET ((|pp| (SPADCALL |p| (|getShellEntry| $ 107))))
+  (LET ((|pp| (SPADCALL |p| (|getShellEntry| $ 106))))
     (COND
-      ((EQL (SPADCALL |pp| (|getShellEntry| $ 108))
-            (SPADCALL |p| (|getShellEntry| $ 108)))
-       (SPADCALL |p| (|getShellEntry| $ 110)))
-      (T (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 110))
+      ((EQL (SPADCALL |pp| (|getShellEntry| $ 107))
+            (SPADCALL |p| (|getShellEntry| $ 107)))
+       (SPADCALL |p| (|getShellEntry| $ 109)))
+      (T (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 109))
              (SPADCALL (CONS #'|INT;factorPolynomial!0| $)
                  (SPADCALL
-                     (LET ((#0=#:G1499
+                     (LET ((#0=#:G1504
                                (SPADCALL
                                    (SPADCALL |p|
-                                    (|getShellEntry| $ 108))
+                                    (|getShellEntry| $ 107))
                                    (SPADCALL |pp|
-                                    (|getShellEntry| $ 108))
-                                   (|getShellEntry| $ 112))))
+                                    (|getShellEntry| $ 107))
+                                   (|getShellEntry| $ 111))))
                        (|check-union| (ZEROP (CAR #0#)) $ #0#)
                        (CDR #0#))
-                     (|getShellEntry| $ 114))
-                 (|getShellEntry| $ 118))
-             (|getShellEntry| $ 120)))))) 
+                     (|getShellEntry| $ 113))
+                 (|getShellEntry| $ 117))
+             (|getShellEntry| $ 119)))))) 
 
 (DEFUN |INT;factorPolynomial!0| (|#1| $)
-  (SPADCALL |#1| (|getShellEntry| $ 111))) 
+  (SPADCALL |#1| (|getShellEntry| $ 110))) 
 
 (DEFUN |INT;factorSquareFreePolynomial| (|p| $)
-  (SPADCALL |p| (|getShellEntry| $ 121))) 
+  (SPADCALL |p| (|getShellEntry| $ 120))) 
 
 (DEFUN |INT;gcdPolynomial;3Sup;60| (|p| |q| $)
   (COND
-    ((SPADCALL |p| (|getShellEntry| $ 122))
-     (SPADCALL |q| (|getShellEntry| $ 123)))
-    ((SPADCALL |q| (|getShellEntry| $ 122))
-     (SPADCALL |p| (|getShellEntry| $ 123)))
-    (T (SPADCALL (LIST |p| |q|) (|getShellEntry| $ 126))))) 
+    ((SPADCALL |p| (|getShellEntry| $ 121))
+     (SPADCALL |q| (|getShellEntry| $ 122)))
+    ((SPADCALL |q| (|getShellEntry| $ 121))
+     (SPADCALL |p| (|getShellEntry| $ 122)))
+    (T (SPADCALL (LIST |p| |q|) (|getShellEntry| $ 125))))) 
 
 (DEFUN |Integer| ()
   (DECLARE (SPECIAL |$ConstructorCache|))
-  (PROG (#0=#:G1528)
+  (PROG (#0=#:G1536)
     (RETURN
       (COND
         ((SETQ #0# (HGET |$ConstructorCache| '|Integer|))
@@ -512,50 +512,49 @@
              (COND ((NOT #0#) (HREM |$ConstructorCache| '|Integer|))))))))) 
 
 (DEFUN |Integer;| ()
-  (LET ((|dv$| (LIST '|Integer|)) ($ (|newShell| 141))
+  (LET ((|dv$| (LIST '|Integer|)) ($ (|newShell| 140))
         (|pv$| (|buildPredVector| 0 0 NIL)))
     (DECLARE (SPECIAL |$ConstructorCache|))
     (|setShellEntry| $ 0 |dv$|)
     (|setShellEntry| $ 3 |pv$|)
     (|haddProp| |$ConstructorCache| '|Integer| NIL (CONS 1 $))
     (|stuffDomainSlots| $)
-    (|setShellEntry| $ 83
-        (|setShellEntry| $ 82
+    (|setShellEntry| $ 82
+        (|setShellEntry| $ 81
             (CONS (|dispatchFunction| |INT;*;3$;43|) $)))
     $)) 
 
 (MAKEPROP '|Integer| '|infovec|
-    (LIST '#(NIL NIL NIL NIL NIL NIL
+    (LIST '#(NIL NIL NIL NIL NIL NIL (|Boolean|) |INT;negative?;$B;15|
+             (|Void|) (|OpenMathDevice|) (0 . |OMputApp|) (|String|)
+             (5 . |OMputSymbol|) |INT;-;2$;39| (|Integer|)
+             (12 . |OMputInteger|) (18 . |OMputEndApp|)
+             (|OpenMathEncoding|) (23 . |OMencodingXML|)
+             (27 . |OMopenString|) (33 . |OMputObject|)
+             (38 . |OMputEndObject|) (43 . |OMclose|)
+             |INT;OMwrite;$S;2| |INT;OMwrite;$BS;3|
+             |INT;OMwrite;Omd$V;4| |INT;OMwrite;Omd$BV;5|
              (CONS IDENTITY
                    (FUNCALL (|dispatchFunction| |INT;Zero;$;8|) $))
-             (|NonNegativeInteger|) (0 . |Zero|) (|Boolean|)
-             |INT;<;2$B;35| (|Void|) (|OpenMathDevice|)
-             (4 . |OMputApp|) (|String|) (9 . |OMputSymbol|)
-             |INT;-;2$;39| (|Integer|) (16 . |OMputInteger|)
-             (22 . |OMputEndApp|) (|OpenMathEncoding|)
-             (27 . |OMencodingXML|) (31 . |OMopenString|)
-             (37 . |OMputObject|) (42 . |OMputEndObject|)
-             (47 . |OMclose|) |INT;OMwrite;$S;2| |INT;OMwrite;$BS;3|
-             |INT;OMwrite;Omd$V;4| |INT;OMwrite;Omd$BV;5|
-             |INT;zero?;$B;6|
+             |INT;=;2$B;34| |INT;zero?;$B;6|
              (CONS IDENTITY
                    (FUNCALL (|dispatchFunction| |INT;One;$;9|) $))
-             (52 . |One|) |INT;=;2$B;34| |INT;one?;$B;7|
-             |INT;base;$;10| |INT;copy;2$;11| |INT;+;3$;40|
-             |INT;inc;2$;12| |INT;-;3$;41| |INT;dec;2$;13|
-             (|SingleInteger|) |INT;hash;$Si;14| |INT;negative?;$B;15|
-             (|OutputForm|) (56 . |outputForm|) |INT;coerce;$Of;16|
-             |INT;coerce;2$;17| |INT;convert;2$;18| |INT;length;2$;19|
-             |INT;>=;2$B;38| |INT;addmod;4$;20| |INT;submod;4$;21|
-             |INT;rem;3$;50| |INT;mulmod;4$;22| (|Float|)
-             (61 . |coerce|) |INT;convert;$F;23| (|DoubleFloat|)
-             (66 . |coerce|) |INT;convert;$Df;24| (|InputForm|)
-             (71 . |convert|) |INT;convert;$If;25| (76 . |string|)
-             |INT;convert;$S;26| (81 . <) (87 . |concat|)
-             |INT;latex;$S;27| |INT;positiveRemainder;3$;28|
-             (|Matrix| 17) (|Matrix| $) |INT;reducedSystem;2M;29|
-             (|Vector| 17) (|Record| (|:| |mat| 70) (|:| |vec| 73))
-             (|Vector| $) |INT;reducedSystem;MVR;30| |INT;abs;2$;31|
+             |INT;one?;$B;7| |INT;base;$;10| |INT;copy;2$;11|
+             |INT;+;3$;40| |INT;inc;2$;12| |INT;-;3$;41|
+             |INT;dec;2$;13| (|SingleInteger|) |INT;hash;$Si;14|
+             |INT;<;2$B;35| (|OutputForm|) (48 . |outputForm|)
+             |INT;coerce;$Of;16| |INT;coerce;2$;17| |INT;convert;2$;18|
+             |INT;length;2$;19| |INT;>=;2$B;38| |INT;addmod;4$;20|
+             |INT;submod;4$;21| |INT;rem;3$;50| |INT;mulmod;4$;22|
+             (|Float|) (53 . |coerce|) |INT;convert;$F;23|
+             (|DoubleFloat|) (58 . |coerce|) |INT;convert;$Df;24|
+             (|InputForm|) (63 . |convert|) |INT;convert;$If;25|
+             (68 . |string|) |INT;convert;$S;26| (|NonNegativeInteger|)
+             (73 . |One|) (77 . <) (83 . |concat|) |INT;latex;$S;27|
+             |INT;positiveRemainder;3$;28| (|Matrix| 14) (|Matrix| $)
+             |INT;reducedSystem;2M;29| (|Vector| 14)
+             (|Record| (|:| |mat| 69) (|:| |vec| 72)) (|Vector| $)
+             |INT;reducedSystem;MVR;30| |INT;abs;2$;31|
              |INT;random;$;32| |INT;random;2$;33| |INT;>;2$B;36|
              |INT;<=;2$B;37| NIL NIL |INT;**;$Nni$;44| |INT;odd?;$B;45|
              |INT;max;3$;46| |INT;min;3$;47|
@@ -565,52 +564,52 @@
              (|Record| (|:| |unit| $) (|:| |canonical| $)
                  (|:| |associate| $))
              |INT;unitNormal;$R;54| |INT;unitCanonical;2$;55|
-             (|SparseUnivariatePolynomial| 17) (|List| 98)
-             (|Union| 99 '"failed")
+             (|SparseUnivariatePolynomial| 14) (|List| 97)
+             (|Union| 98 '"failed")
              (|IntegerSolveLinearPolynomialEquation|)
-             (93 . |solveLinearPolynomialEquation|)
-             (|SparseUnivariatePolynomial| $$) (|Factored| 103)
-             (|UnivariatePolynomialSquareFree| $$ 103)
-             (99 . |squareFree|) (104 . |primitivePart|)
-             (109 . |leadingCoefficient|) (|GaloisGroupFactorizer| 103)
-             (114 . |factor|) (119 . |coerce|) (124 . |exquo|)
-             (|Factored| $) (130 . |factor|) (|Mapping| 103 $$)
-             (|Factored| $$) (|FactoredFunctions2| $$ 103)
-             (135 . |map|) (|FactoredFunctionUtilities| 103)
-             (141 . |mergeFactors|) (147 . |factorSquareFree|)
-             (152 . |zero?|) (157 . |unitCanonical|) (|List| 103)
-             (|HeuGcd| 103) (162 . |gcd|)
+             (89 . |solveLinearPolynomialEquation|)
+             (|SparseUnivariatePolynomial| $$) (|Factored| 102)
+             (|UnivariatePolynomialSquareFree| $$ 102)
+             (95 . |squareFree|) (100 . |primitivePart|)
+             (105 . |leadingCoefficient|) (|GaloisGroupFactorizer| 102)
+             (110 . |factor|) (115 . |coerce|) (120 . |exquo|)
+             (|Factored| $) (126 . |factor|) (|Mapping| 102 $$)
+             (|Factored| $$) (|FactoredFunctions2| $$ 102)
+             (131 . |map|) (|FactoredFunctionUtilities| 102)
+             (137 . |mergeFactors|) (143 . |factorSquareFree|)
+             (148 . |zero?|) (153 . |unitCanonical|) (|List| 102)
+             (|HeuGcd| 102) (158 . |gcd|)
              (|SparseUnivariatePolynomial| $)
-             |INT;gcdPolynomial;3Sup;60| (|Fraction| 17)
-             (|Union| 129 '"failed") (|Pattern| 17)
-             (|PatternMatchResult| 17 $) (|Union| 17 '"failed")
-             (|List| $) (|Record| (|:| |coef| 134) (|:| |generator| $))
-             (|Union| 134 '"failed")
+             |INT;gcdPolynomial;3Sup;60| (|Fraction| 14)
+             (|Union| 128 '"failed") (|Pattern| 14)
+             (|PatternMatchResult| 14 $) (|Union| 14 '"failed")
+             (|List| $) (|Record| (|:| |coef| 133) (|:| |generator| $))
+             (|Union| 133 '"failed")
              (|Record| (|:| |coef1| $) (|:| |coef2| $)
                  (|:| |generator| $))
              (|Record| (|:| |coef1| $) (|:| |coef2| $))
-             (|Union| 138 '"failed") (|PositiveInteger|))
-          '#(~= 167 |zero?| 173 |unitNormal| 178 |unitCanonical| 183
-             |unit?| 188 |symmetricRemainder| 193 |subtractIfCan| 199
-             |submod| 205 |squareFreePart| 212 |squareFree| 217
-             |sizeLess?| 222 |sign| 228 |shift| 233 |sample| 239
-             |retractIfCan| 243 |retract| 248 |rem| 253 |reducedSystem|
-             259 |recip| 270 |rationalIfCan| 275 |rational?| 280
-             |rational| 285 |random| 290 |quo| 299 |principalIdeal| 305
-             |prime?| 310 |powmod| 315 |positiveRemainder| 322
-             |positive?| 328 |permutation| 333 |patternMatch| 339
-             |one?| 346 |odd?| 351 |nextItem| 356 |negative?| 361
-             |multiEuclidean| 366 |mulmod| 372 |min| 379 |max| 385
-             |mask| 391 |length| 396 |leftReducedSystem| 401 |lcm| 412
-             |latex| 423 |invmod| 428 |init| 434 |inc| 438 |hash| 443
-             |gcdPolynomial| 448 |gcd| 454 |factorial| 465 |factor| 470
-             |extendedEuclidean| 475 |exquo| 488 |expressIdealMember|
-             494 |even?| 500 |euclideanSize| 505 |divide| 510
-             |differentiate| 516 |dec| 527 |copy| 532 |convert| 537
-             |coerce| 567 |characteristic| 587 |bit?| 591 |binomial|
-             597 |before?| 603 |base| 609 |associates?| 613 |addmod|
-             619 |abs| 626 |Zero| 631 |One| 635 |OMwrite| 639 D 663 >=
-             674 > 680 = 686 <= 692 < 698 - 704 + 715 ** 721 * 733)
+             (|Union| 137 '"failed") (|PositiveInteger|))
+          '#(~= 163 |zero?| 169 |unitNormal| 174 |unitCanonical| 179
+             |unit?| 184 |symmetricRemainder| 189 |subtractIfCan| 195
+             |submod| 201 |squareFreePart| 208 |squareFree| 213
+             |sizeLess?| 218 |sign| 224 |shift| 229 |sample| 235
+             |retractIfCan| 239 |retract| 244 |rem| 249 |reducedSystem|
+             255 |recip| 266 |rationalIfCan| 271 |rational?| 276
+             |rational| 281 |random| 286 |quo| 295 |principalIdeal| 301
+             |prime?| 306 |powmod| 311 |positiveRemainder| 318
+             |positive?| 324 |permutation| 329 |patternMatch| 335
+             |one?| 342 |odd?| 347 |nextItem| 352 |negative?| 357
+             |multiEuclidean| 362 |mulmod| 368 |min| 375 |max| 381
+             |mask| 387 |length| 392 |leftReducedSystem| 397 |lcm| 408
+             |latex| 419 |invmod| 424 |init| 430 |inc| 434 |hash| 439
+             |gcdPolynomial| 444 |gcd| 450 |factorial| 461 |factor| 466
+             |extendedEuclidean| 471 |exquo| 484 |expressIdealMember|
+             490 |even?| 496 |euclideanSize| 501 |divide| 506
+             |differentiate| 512 |dec| 523 |copy| 528 |convert| 533
+             |coerce| 563 |characteristic| 583 |bit?| 587 |binomial|
+             593 |before?| 599 |base| 605 |associates?| 609 |addmod|
+             615 |abs| 622 |Zero| 627 |One| 631 |OMwrite| 635 D 659 >=
+             670 > 676 = 682 <= 688 < 694 - 700 + 711 ** 717 * 729)
           '((|infinite| . 0) (|noetherian| . 0)
             (|canonicalsClosed| . 0) (|canonical| . 0)
             (|canonicalUnitNormal| . 0) (|multiplicativeValuation| . 0)
@@ -643,9 +642,9 @@
                                (|DifferentialRing|) (|OrderedRing|)
                                (|CommutativeRing|) (|EntireRing|)
                                (|Module| $$)
-                               (|LinearlyExplicitRingOver| 17)
+                               (|LinearlyExplicitRingOver| 14)
                                (|BiModule| $$ $$) (|Ring|)
-                               (|LeftModule| 17)
+                               (|LeftModule| 14)
                                (|OrderedAbelianGroup|)
                                (|LeftModule| $$) (|Rng|)
                                (|RightModule| $$)
@@ -656,75 +655,75 @@
                                (|OrderedAbelianSemiGroup|)
                                (|LinearSet| $$) (|AbelianMonoid|)
                                (|Monoid|) (|StepThrough|)
-                               (|PatternMatchable| 17) (|OrderedSet|)
+                               (|PatternMatchable| 14) (|OrderedSet|)
                                (|LeftLinearSet| $$)
                                (|RightLinearSet| $$)
                                (|AbelianSemiGroup|) (|SemiGroup|)
-                               (|LeftLinearSet| 17)
+                               (|LeftLinearSet| 14)
                                (|DifferentialSpace|) (|OrderedType|)
                                (|SetCategory|) (|RealConstant|)
-                               (|RetractableTo| 17)
+                               (|RetractableTo| 14)
                                (|DifferentialDomain| $$) (|BasicType|)
-                               (|OpenMath|) (|ConvertibleTo| 14)
+                               (|OpenMath|) (|ConvertibleTo| 11)
+                               (|ConvertibleTo| 52)
                                (|ConvertibleTo| 55)
-                               (|ConvertibleTo| 58)
                                (|CombinatorialFunctionCategory|)
-                               (|ConvertibleTo| 131)
-                               (|ConvertibleTo| 61)
-                               (|ConvertibleTo| 17)
+                               (|ConvertibleTo| 130)
+                               (|ConvertibleTo| 58)
+                               (|ConvertibleTo| 14)
                                (|CoercibleFrom| $$)
-                               (|CoercibleFrom| 17) (|Type|)
-                               (|CoercibleTo| 44))
-                            (|makeByteWordVec2| 140
-                                '(0 7 0 8 1 12 11 0 13 3 12 11 0 14 14
-                                  15 2 12 11 0 17 18 1 12 11 0 19 0 20
-                                  0 21 2 12 0 14 20 22 1 12 11 0 23 1
-                                  12 11 0 24 1 12 11 0 25 0 7 0 32 1 44
-                                  0 17 45 1 55 0 17 56 1 58 0 17 59 1
-                                  61 0 17 62 1 14 0 17 64 2 17 9 0 0 66
-                                  2 14 0 0 0 67 2 101 100 99 98 102 1
-                                  105 104 103 106 1 103 0 0 107 1 103 2
-                                  0 108 1 109 104 103 110 1 103 0 2 111
-                                  2 0 92 0 0 112 1 0 113 0 114 2 117
-                                  104 115 116 118 2 119 104 104 104 120
-                                  1 109 104 103 121 1 103 9 0 122 1 103
-                                  0 0 123 1 125 103 124 126 2 0 9 0 0 1
-                                  1 0 9 0 30 1 0 95 0 96 1 0 0 0 97 1 0
-                                  9 0 1 2 0 0 0 0 1 2 0 92 0 0 1 3 0 0
-                                  0 0 0 52 1 0 0 0 1 1 0 113 0 1 2 0 9
-                                  0 0 1 1 0 17 0 1 2 0 0 0 0 91 0 0 0 1
-                                  1 0 133 0 1 1 0 17 0 1 2 0 0 0 0 53 1
-                                  0 70 71 72 2 0 74 71 75 76 1 0 92 0
-                                  93 1 0 130 0 1 1 0 9 0 1 1 0 129 0 1
-                                  0 0 0 78 1 0 0 0 79 2 0 0 0 0 90 1 0
-                                  135 134 1 1 0 9 0 1 3 0 0 0 0 0 1 2 0
-                                  0 0 0 69 1 0 9 0 1 2 0 0 0 0 1 3 0
-                                  132 0 131 132 1 1 0 9 0 34 1 0 9 0 85
-                                  1 0 92 0 1 1 0 9 0 43 2 0 136 134 0 1
-                                  3 0 0 0 0 0 54 2 0 0 0 0 87 2 0 0 0 0
-                                  86 1 0 0 0 1 1 0 0 0 49 2 0 74 75 0 1
-                                  1 0 70 75 1 2 0 0 0 0 1 1 0 0 134 1 1
-                                  0 14 0 68 2 0 0 0 0 1 0 0 0 1 1 0 0 0
-                                  38 1 0 41 0 42 2 0 127 127 127 128 2
-                                  0 0 0 0 94 1 0 0 134 1 1 0 0 0 1 1 0
-                                  113 0 114 2 0 137 0 0 1 3 0 139 0 0 0
-                                  1 2 0 92 0 0 112 2 0 136 134 0 1 1 0
-                                  9 0 1 1 0 7 0 1 2 0 88 0 0 89 2 0 0 0
-                                  7 1 1 0 0 0 1 1 0 0 0 40 1 0 0 0 36 1
-                                  0 14 0 65 1 0 58 0 60 1 0 55 0 57 1 0
-                                  131 0 1 1 0 61 0 63 1 0 17 0 48 1 0 0
-                                  17 47 1 0 0 0 1 1 0 0 17 47 1 0 44 0
-                                  46 0 0 7 1 2 0 9 0 0 1 2 0 0 0 0 1 2
-                                  0 9 0 0 1 0 0 0 35 2 0 9 0 0 1 3 0 0
-                                  0 0 0 51 1 0 0 0 77 0 0 0 6 0 0 0 31
-                                  3 0 11 12 0 9 29 2 0 14 0 9 27 2 0 11
-                                  12 0 28 1 0 14 0 26 2 0 0 0 7 1 1 0 0
-                                  0 1 2 0 9 0 0 50 2 0 9 0 0 80 2 0 9 0
-                                  0 33 2 0 9 0 0 81 2 0 9 0 0 10 1 0 0
-                                  0 16 2 0 0 0 0 39 2 0 0 0 0 37 2 0 0
-                                  0 7 84 2 0 0 0 140 1 2 0 0 17 0 83 2
-                                  0 0 0 0 82 2 0 0 17 0 83 2 0 0 7 0 1
-                                  2 0 0 140 0 1)))))
+                               (|CoercibleFrom| 14) (|Type|)
+                               (|CoercibleTo| 41))
+                            (|makeByteWordVec2| 139
+                                '(1 9 8 0 10 3 9 8 0 11 11 12 2 9 8 0
+                                  14 15 1 9 8 0 16 0 17 0 18 2 9 0 11
+                                  17 19 1 9 8 0 20 1 9 8 0 21 1 9 8 0
+                                  22 1 41 0 14 42 1 52 0 14 53 1 55 0
+                                  14 56 1 58 0 14 59 1 11 0 14 61 0 63
+                                  0 64 2 14 6 0 0 65 2 11 0 0 0 66 2
+                                  100 99 98 97 101 1 104 103 102 105 1
+                                  102 0 0 106 1 102 2 0 107 1 108 103
+                                  102 109 1 102 0 2 110 2 0 91 0 0 111
+                                  1 0 112 0 113 2 116 103 114 115 117 2
+                                  118 103 103 103 119 1 108 103 102 120
+                                  1 102 6 0 121 1 102 0 0 122 1 124 102
+                                  123 125 2 0 6 0 0 1 1 0 6 0 29 1 0 94
+                                  0 95 1 0 0 0 96 1 0 6 0 1 2 0 0 0 0 1
+                                  2 0 91 0 0 1 3 0 0 0 0 0 49 1 0 0 0 1
+                                  1 0 112 0 1 2 0 6 0 0 1 1 0 14 0 1 2
+                                  0 0 0 0 90 0 0 0 1 1 0 132 0 1 1 0 14
+                                  0 1 2 0 0 0 0 50 1 0 69 70 71 2 0 73
+                                  70 74 75 1 0 91 0 92 1 0 129 0 1 1 0
+                                  6 0 1 1 0 128 0 1 0 0 0 77 1 0 0 0 78
+                                  2 0 0 0 0 89 1 0 134 133 1 1 0 6 0 1
+                                  3 0 0 0 0 0 1 2 0 0 0 0 68 1 0 6 0 1
+                                  2 0 0 0 0 1 3 0 131 0 130 131 1 1 0 6
+                                  0 31 1 0 6 0 84 1 0 91 0 1 1 0 6 0 7
+                                  2 0 135 133 0 1 3 0 0 0 0 0 51 2 0 0
+                                  0 0 86 2 0 0 0 0 85 1 0 0 0 1 1 0 0 0
+                                  46 2 0 73 74 0 1 1 0 69 74 1 2 0 0 0
+                                  0 1 1 0 0 133 1 1 0 11 0 67 2 0 0 0 0
+                                  1 0 0 0 1 1 0 0 0 35 1 0 38 0 39 2 0
+                                  126 126 126 127 2 0 0 0 0 93 1 0 0
+                                  133 1 1 0 0 0 1 1 0 112 0 113 2 0 136
+                                  0 0 1 3 0 138 0 0 0 1 2 0 91 0 0 111
+                                  2 0 135 133 0 1 1 0 6 0 1 1 0 63 0 1
+                                  2 0 87 0 0 88 2 0 0 0 63 1 1 0 0 0 1
+                                  1 0 0 0 37 1 0 0 0 33 1 0 11 0 62 1 0
+                                  55 0 57 1 0 52 0 54 1 0 130 0 1 1 0
+                                  58 0 60 1 0 14 0 45 1 0 0 14 44 1 0 0
+                                  0 1 1 0 0 14 44 1 0 41 0 43 0 0 63 1
+                                  2 0 6 0 0 1 2 0 0 0 0 1 2 0 6 0 0 1 0
+                                  0 0 32 2 0 6 0 0 1 3 0 0 0 0 0 48 1 0
+                                  0 0 76 0 0 0 27 0 0 0 30 3 0 8 9 0 6
+                                  26 2 0 11 0 6 24 2 0 8 9 0 25 1 0 11
+                                  0 23 2 0 0 0 63 1 1 0 0 0 1 2 0 6 0 0
+                                  47 2 0 6 0 0 79 2 0 6 0 0 28 2 0 6 0
+                                  0 80 2 0 6 0 0 40 1 0 0 0 13 2 0 0 0
+                                  0 36 2 0 0 0 0 34 2 0 0 0 63 83 2 0 0
+                                  0 139 1 2 0 0 14 0 82 2 0 0 0 0 81 2
+                                  0 0 14 0 82 2 0 0 63 0 1 2 0 0 139 0
+                                  1)))))
           '|lookupComplete|)) 
 
 (MAKEPROP '|Integer| 'NILADIC T) 

Modified: trunk/src/algebra/strap/ISTRING.lsp
===================================================================
--- trunk/src/algebra/strap/ISTRING.lsp	2010-07-26 06:54:30 UTC (rev 1712)
+++ trunk/src/algebra/strap/ISTRING.lsp	2010-07-26 16:33:38 UTC (rev 1713)
@@ -715,11 +715,11 @@
 (MAKEPROP '|IndexedString| '|infovec|
     (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|)
              (|NonNegativeInteger|) (|Character|) |ISTRING;new;NniC$;1|
-             |ISTRING;empty;$;2| (|Integer|) (0 . |Zero|) (|Boolean|)
+             (|Integer|) (0 . |Zero|) |ISTRING;empty;$;2| (|Boolean|)
              (4 . =) |ISTRING;empty?;$B;3| |ISTRING;#;$Nni;4|
              |ISTRING;=;2$B;5| |ISTRING;<;2$B;6| |ISTRING;concat;3$;7|
              |ISTRING;copy;2$;8| (10 . |One|) (14 . -)
-             (|UniversalSegment| 11) (20 . SEGMENT)
+             (|UniversalSegment| 10) (20 . SEGMENT)
              |ISTRING;elt;$Us$;31| (26 . SEGMENT)
              |ISTRING;insert;2$I$;9| (|String|) (|OutputForm|)
              (31 . |outputForm|) |ISTRING;coerce;$Of;10|
@@ -748,7 +748,7 @@
              |ISTRING;match?;2$CB;34| (|List| 8) (|Equation| 8)
              (|List| 91) (|Mapping| 8 8 8) (|InputForm|)
              (|Mapping| 13 8) (|Mapping| 13 8 8) (|Void|)
-             (|Union| 8 '"failed") (|List| 11))
+             (|Union| 8 '"failed") (|List| 10))
           '#(~= 185 |upperCase!| 191 |upperCase| 196 |trim| 201 |swap!|
              213 |suffix?| 220 |substring?| 226 |split| 233 |sorted?|
              245 |sort!| 256 |sort| 267 |size?| 278 |setelt| 284
@@ -783,61 +783,61 @@
                                (|OneDimensionalArrayAggregate| 8)
                                (|FiniteLinearAggregate| 8)
                                (|LinearAggregate| 8)
-                               (|IndexedAggregate| 11 8)
+                               (|IndexedAggregate| 10 8)
                                (|Collection| 8)
                                (|HomogeneousAggregate| 8)
-                               (|OrderedSet|) (|EltableAggregate| 11 8)
+                               (|OrderedSet|) (|EltableAggregate| 10 8)
                                (|SetCategory|) (|OrderedType|)
                                (|Eltable| 23 $$) (|Aggregate|)
-                               (|Eltable| 11 8) (|Evalable| 8)
+                               (|Eltable| 10 8) (|Evalable| 8)
                                (|BasicType|) (|Type|)
                                (|InnerEvalable| 8 8) (|CoercibleTo| 29)
                                (|ConvertibleTo| 94))
                             (|makeByteWordVec2| 99
-                                '(0 11 0 12 2 11 13 0 0 14 0 11 0 21 2
-                                  11 0 0 0 22 2 23 0 11 11 24 1 23 0 11
+                                '(0 10 0 11 2 10 13 0 0 14 0 10 0 21 2
+                                  10 0 0 0 22 2 23 0 10 10 24 1 23 0 10
                                   26 1 29 0 28 30 0 33 0 34 1 8 0 0 35
                                   2 0 0 36 0 37 0 33 0 39 1 8 0 0 40 2
-                                  28 0 0 0 42 1 23 11 0 44 1 23 13 0 45
-                                  1 23 11 0 46 1 0 11 0 47 0 7 0 48 2
-                                  11 13 0 0 49 2 11 13 0 0 50 0 7 0 51
-                                  2 11 0 0 0 52 0 8 0 53 0 54 0 55 2 7
-                                  0 0 0 56 2 11 13 0 0 58 0 13 0 60 0
+                                  28 0 0 0 42 1 23 10 0 44 1 23 13 0 45
+                                  1 23 10 0 46 1 0 10 0 47 0 7 0 48 2
+                                  10 13 0 0 49 2 10 13 0 0 50 0 7 0 51
+                                  2 10 0 0 0 52 0 8 0 53 0 54 0 55 2 7
+                                  0 0 0 56 2 10 13 0 0 58 0 13 0 60 0
                                   13 0 61 2 33 13 8 0 65 2 8 13 0 0 69
                                   0 70 0 71 2 70 0 2 0 72 1 70 0 0 73 2
-                                  11 0 0 0 83 2 11 13 0 0 87 2 0 13 0 0
+                                  10 0 0 0 83 2 10 13 0 0 87 2 0 13 0 0
                                   88 2 10 13 0 0 1 1 0 0 0 38 1 0 0 0 1
-                                  2 0 0 0 8 1 2 0 0 0 33 1 3 0 97 0 11
-                                  11 1 2 0 13 0 0 67 3 0 13 0 0 11 62 2
+                                  2 0 0 0 8 1 2 0 0 0 33 1 3 0 97 0 10
+                                  10 1 2 0 13 0 0 67 3 0 13 0 0 10 62 2
                                   0 74 0 33 76 2 0 74 0 8 75 1 5 13 0 1
                                   2 0 13 96 0 1 1 5 0 0 1 2 0 0 96 0 1
                                   1 5 0 0 1 2 0 0 96 0 1 2 0 13 0 7 1 3
-                                  0 8 0 23 8 1 3 0 8 0 11 8 59 2 0 0 95
+                                  0 8 0 23 8 1 3 0 8 0 10 8 59 2 0 0 95
                                   0 1 0 0 0 1 2 0 0 0 8 79 2 0 0 0 33
                                   80 1 0 0 0 1 1 0 0 0 1 3 0 0 0 23 0
                                   57 1 8 0 0 1 2 8 0 8 0 1 2 0 0 95 0 1
                                   4 8 8 93 0 8 8 1 3 0 8 93 0 8 1 2 0 8
-                                  93 0 1 3 0 8 0 11 8 1 2 0 8 0 11 1 2
-                                  0 13 0 0 88 3 8 11 8 0 11 64 2 8 11 8
-                                  0 1 3 0 11 33 0 11 66 3 0 11 0 0 11
-                                  63 2 0 11 95 0 1 1 0 90 0 1 2 0 0 7 8
-                                  9 2 0 13 0 7 1 1 7 11 0 32 2 5 0 0 0
+                                  93 0 1 3 0 8 0 10 8 1 2 0 8 0 10 1 2
+                                  0 13 0 0 88 3 8 10 8 0 10 64 2 8 10 8
+                                  0 1 3 0 10 33 0 10 66 3 0 10 0 0 10
+                                  63 2 0 10 95 0 1 1 0 90 0 1 2 0 0 7 8
+                                  9 2 0 13 0 7 1 1 7 10 0 32 2 5 0 0 0
                                   1 2 5 0 0 0 1 3 0 0 96 0 0 1 1 0 90 0
-                                  1 2 8 13 8 0 1 1 7 11 0 47 2 5 0 0 0
+                                  1 2 8 13 8 0 1 1 7 10 0 47 2 5 0 0 0
                                   1 3 0 13 0 0 8 89 3 0 7 0 0 8 86 2 0
                                   0 36 0 37 3 0 0 93 0 0 1 2 0 0 36 0 1
                                   1 0 0 0 41 1 0 0 0 1 2 0 13 0 7 1 2 0
                                   0 0 8 77 2 0 0 0 33 78 1 8 28 0 43 3
-                                  0 0 8 0 11 1 3 0 0 0 0 11 27 1 0 99 0
-                                  1 2 0 13 11 0 1 1 8 84 0 85 1 7 8 0 1
+                                  0 0 8 0 10 1 3 0 0 0 0 10 27 1 0 99 0
+                                  1 2 0 13 10 0 1 1 8 84 0 85 1 7 8 0 1
                                   2 0 98 95 0 1 2 0 0 0 8 1 2 0 13 95 0
                                   1 3 11 0 0 90 90 1 3 11 0 0 8 8 1 2
                                   11 0 0 92 1 2 11 0 0 91 1 2 0 13 0 0
                                   1 2 8 13 8 0 1 1 0 90 0 1 1 0 13 0 15
-                                  0 0 0 10 2 0 0 0 0 1 2 0 0 0 23 25 2
-                                  0 8 0 11 68 3 0 8 0 11 8 1 2 0 0 0 11
+                                  0 0 0 12 2 0 0 0 0 1 2 0 0 0 23 25 2
+                                  0 8 0 10 68 3 0 8 0 10 8 1 2 0 0 0 10
                                   1 2 0 0 0 23 1 2 8 7 8 0 1 2 0 7 95 0
-                                  1 3 0 0 0 0 11 81 1 0 0 0 20 1 3 94 0
+                                  1 3 0 0 0 0 10 81 1 0 0 0 20 1 3 94 0
                                   1 1 0 0 90 1 2 0 0 0 0 19 1 0 0 74 82
                                   2 0 0 8 0 1 2 0 0 0 8 1 1 9 29 0 31 1
                                   0 0 8 1 2 10 13 0 0 1 2 0 13 95 0 1 2

Modified: trunk/src/algebra/string.spad.pamphlet
===================================================================
--- trunk/src/algebra/string.spad.pamphlet	2010-07-26 06:54:30 UTC (rev 1712)
+++ trunk/src/algebra/string.spad.pamphlet	2010-07-26 16:33:38 UTC (rev 1713)
@@ -82,6 +82,7 @@
         import %cge: (%,%) -> Boolean from Foreign Builtin
         import %c2i: % -> NNI         from Foreign Builtin
         import %i2c: NNI -> %         from Foreign Builtin
+        import %ccst: String -> %     from Foreign Builtin
 
 	a = b		       == %ceq(a,b)
 	a < b		       == %clt(a,b)
@@ -94,9 +95,9 @@
 	char(n: NNI)	       == %i2c n
 	ord c		       == %c2i c
 	random()	       == char(random(size())$NNI)
-	space		       == CHAR("   ", 0$Lisp)$Lisp
-	quote		       == CHAR("_" ", 0$Lisp)$Lisp
-	escape		       == CHAR("__ ", 0$Lisp)$Lisp
+	space		       == %ccst " "
+	quote		       == %ccst "_""
+	escape		       == %ccst "__"
 	coerce(c:%):OutputForm == c : OutputForm
 	digit? c	       == member?(c, digit())
 	hexDigit? c	       == member?(c, hexDigit())
@@ -272,7 +273,7 @@
 
 --  new n		   == MAKE_-FULL_-CVEC(n, space$C)$Lisp
     new(n, c)		   == MAKE_-FULL_-CVEC(n, c)$Lisp
-    empty()		   == MAKE_-FULL_-CVEC(0$Lisp)$Lisp
+    empty()		   == MAKE_-FULL_-CVEC(0@...
     empty?(s)		   == Qsize(s) = 0
     #s			   == Qsize(s)
     s = t		   == Qequal(s, t)

Modified: trunk/src/interp/g-opt.boot
===================================================================
--- trunk/src/interp/g-opt.boot	2010-07-26 06:54:30 UTC (rev 1712)
+++ trunk/src/interp/g-opt.boot	2010-07-26 16:33:38 UTC (rev 1713)
@@ -439,17 +439,17 @@
     SPADfirst QVELT _+ _- _* _< _= _<_= _> _>_= ASH INTEGER_-LENGTH
      QEQCAR QCDR QCAR IDENTP SYMBOLP
       GREATERP ZEROP ODDP FLOAT_-RADIX FLOAT FLOAT_-SIGN
-       CGREATERP GGREATERP CHAR GET BVEC_-GREATER %false %true
+       CGREATERP GGREATERP CHAR GET BVEC_-GREATER %when %false %true
         %and %or %not %peq %ieq %ilt %ile %igt %ige %head %tail %integer?
-         %beq %blt %ble %bgt %bge %bitand %bitior %bitnot %bcompl
-         %icst0 %icst1
-          %imul %iadd %isub %igcd %ilcm %ipow %imin %imax %ieven? %iodd? %iinc
-           %feq %flt %fle %fgt %fge %fmul %fadd %fsub %fexp %fmin %fmax %float?
-            %fpow %fdiv %fneg %i2f %fminval %fmaxval %fbase %fprec %ftrunc
-             %nil %pair? %lconcat %llength %lfirst %lsecond %lthird
-              %lreverse %lempty? %hash %ismall? %string? %f2s
-               %ceq %clt %cle %cgt %cge %c2i %i2c %sname
-                %vref %vlength %before?)
+        %beq %blt %ble %bgt %bge %bitand %bitior %bitnot %bcompl
+        %icst0 %icst1
+        %imul %iadd %isub %igcd %ilcm %ipow %imin %imax %ieven? %iodd? %iinc
+        %feq %flt %fle %fgt %fge %fmul %fadd %fsub %fexp %fmin %fmax %float?
+        %fpow %fdiv %fneg %i2f %fminval %fmaxval %fbase %fprec %ftrunc
+        %nil %pair? %lconcat %llength %lfirst %lsecond %lthird
+        %lreverse %lempty? %hash %ismall? %string? %f2s
+        %ccst %ceq %clt %cle %cgt %cge %c2i %i2c %sname
+        %vref %vlength %before?)
 
 ++ List of simple VM operators
 $simpleVMoperators == 

Modified: trunk/src/interp/g-util.boot
===================================================================
--- trunk/src/interp/g-util.boot	2010-07-26 06:54:30 UTC (rev 1712)
+++ trunk/src/interp/g-util.boot	2010-07-26 16:33:38 UTC (rev 1713)
@@ -251,6 +251,12 @@
   integer? x => 255 - x
   ['_+,256,['LOGNOT,expandToVMForm x]]
 
+-- Character operations
+expandCcst ['%ccst,s] ==
+  not string? s => error "operand is not a string constant"
+  #s ~= 1 => error "string constant must contain exactly one character"
+  char s
+
 -- Integer operations
 expandIneg ['%ineg,x] ==
   x := expandToVMForm x
@@ -449,6 +455,8 @@
 
    ['%bcompl,  :function expandBcompl],
 
+   ['%ccst,    :function expandCcst],
+
    ['%ieq,     :function expandIeq],
    ['%igt,     :function expandIgt],
    ['%ilt,     :function expandIlt],


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1715
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1715&view=rev
Author:   dos-reis
Date:     2010-07-26 21:31:57 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
	* interp/g-opt.boot (optCond): Work harder at denesting nested
	if-expressions. 

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/interp/g-opt.boot

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-26 20:00:26 UTC (rev 1714)
+++ trunk/src/ChangeLog	2010-07-26 21:31:57 UTC (rev 1715)
@@ -1,5 +1,10 @@
 2010-07-26  Gabriel Dos Reis  <gdr@...>
 
+	* interp/g-opt.boot (optCond): Work harder at denesting nested
+	if-expressions. 
+
+2010-07-26  Gabriel Dos Reis  <gdr@...>
+
 	* interp/g-opt.boot ($VMsideEffectFreeOperators): Include new
 	opcodes %icst0,	%icst1, %when, and %ccst.
 	* interp/g-util.boot: Expand %ccst.

Modified: trunk/src/interp/g-opt.boot
===================================================================
--- trunk/src/interp/g-opt.boot	2010-07-26 20:00:26 UTC (rev 1714)
+++ trunk/src/interp/g-opt.boot	2010-07-26 21:31:57 UTC (rev 1715)
@@ -301,23 +301,22 @@
   ["VECTOR",:u]
  
 optCond (x is ['COND,:l]) ==
-  if l is [a,[aa,b]] and aa = '%true and b is ["COND",:c] then
+  if l is [a,[aa,b]] and aa = '%true and b is ['COND,:c] then
     x.rest.rest := c
   if l is [[p1,:c1],[p2,:c2],:.] then
     if (p1 is ['%not,=p2]) or (p2 is ['%not,=p1]) then
       l:=[[p1,:c1],['%true,:c2]]
       x.rest := l
     c1 is ['NIL] and p2 = '%true and first c2 = '%true =>
-      p1 is ['%not,p1']=> return p1'
-      return ['%not,p1]
+      return optNot ['%not,p1]
   l is [[p1,:c1],[p2,:c2],[p3,:c3]] and p3 = '%true =>
     EqualBarGensym(c1,c3) =>
-      ["COND",[['%or,p1,['%not,p2]],:c1],['%true,:c2]]
-    EqualBarGensym(c1,c2) => ["COND",[['%or,p1,p2],:c1],['%true,:c3]]
+      optCond ['COND,[['%or,p1,['%not,p2]],:c1],['%true,:c2]]
+    EqualBarGensym(c1,c2) => optCond ['COND,[['%or,p1,p2],:c1],['%true,:c3]]
     x
   for y in tails l repeat
     while y is [[a1,c1],[a2,c2],:y'] and EqualBarGensym(c1,c2) repeat
-      a:=['%or,a1,a2]
+      a := ['%or,a1,a2]
       first(y).first := a
       y.rest := y'
   x


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1717
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1717&view=rev
Author:   dos-reis
Date:     2010-07-27 14:42:33 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
	* interp/types.boot (%Code): Include %Char.
	* interp/c-util.boot (middleEndExpand): Temporarilty Comment out
	signature.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/interp/c-util.boot
    trunk/src/interp/types.boot

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-27 12:24:31 UTC (rev 1716)
+++ trunk/src/ChangeLog	2010-07-27 14:42:33 UTC (rev 1717)
@@ -1,3 +1,9 @@
+2010-07-27  Gabriel Dos Reis  <gdr@...>
+
+	* interp/types.boot (%Code): Include %Char.
+	* interp/c-util.boot (middleEndExpand): Temporarilty Comment out
+	signature.
+
 2010-07-26  Gabriel Dos Reis  <gdr@...>
 
 	* interp/g-opt.boot (optCond): Work harder at denesting nested

Modified: trunk/src/interp/c-util.boot
===================================================================
--- trunk/src/interp/c-util.boot	2010-07-27 12:24:31 UTC (rev 1716)
+++ trunk/src/interp/c-util.boot	2010-07-27 14:42:33 UTC (rev 1717)
@@ -1092,7 +1092,7 @@
 $middleEndMacroList == 
   '(COLLECT REPEAT SUCHTHATCLAUSE THETA THETA1 SPADREDUCE SPADDO)
 
-middleEndExpand: %Form -> %Form
+--middleEndExpand: %Form -> %Code
 middleEndExpand x ==
   x = '%false or x = '%nil => 'NIL
   IDENTP x and (x' := x has %Rename) => x'
@@ -1519,8 +1519,8 @@
 --%
 
 ++ Replace every middle end sub-forms in `x' with Lisp code.
-mutateToBackendCode: %Form -> %Void
-mutateToBackendCode x ==
+massageBackendCode: %Code -> %Void
+massageBackendCode x ==
   IDENTP x and isLispSpecialVariable x => noteSpecialVariable x
   atomic? x => nil
   -- temporarily have TRACELET report MAKEPROPs.
@@ -1533,7 +1533,7 @@
         x.first := "LETT"
       $TRACELETFLAG => x.first := "/TRACE-LET"
       u = "%LET" => x.first := "SPADLET"
-    mutateToBackendCode CDDR x
+    massageBackendCode CDDR x
     if not (u in '(SETQ RELET)) then
       IDENTP second x => pushLocalVariable second x
       second x is ["FLUID",:.] =>
@@ -1542,15 +1542,15 @@
       MAPC(function pushLocalVariable, LISTOFATOMS second x)
   IDENTP u and GET(u,"ILAM") ~= nil =>
     x.first := eval u
-    mutateToBackendCode x
+    massageBackendCode x
   u in '(LET LET_*) =>
     oldVars := $LocalVars
     vars := nil
     for [var,init] in second x repeat
-      mutateToBackendCode init
+      massageBackendCode init
       $LocalVars := [var,:$LocalVars]
       vars := [var,:vars]
-    mutateToBackendCode x.rest.rest
+    massageBackendCode x.rest.rest
     newVars := setDifference($LocalVars,setUnion(vars,oldVars))
     $LocalVars := setUnion(oldVars,newVars)
   u in '(PROG LAMBDA) =>
@@ -1559,13 +1559,13 @@
       not (y in $LocalVars) =>
         $LocalVars := [y,:$LocalVars]
         newBindings := [y,:newBindings]
-    res := mutateToBackendCode CDDR x
+    res := massageBackendCode CDDR x
     $LocalVars := REMOVE_-IF(function (y +-> y in newBindings), 
                      $LocalVars)
     [u,second x,:res]
   u = "DECLARE" => nil       -- there is nothing to do convert there
-  mutateToBackendCode u
-  mutateToBackendCode rest x
+  massageBackendCode u
+  massageBackendCode rest x
 
 
 skipDeclarations: %List -> %List
@@ -1611,7 +1611,7 @@
   $LocalVars: fluid := nil
   $SpecialVars: fluid := nil
   x := middleEndExpand x
-  mutateToBackendCode CDDR x
+  massageBackendCode CDDR x
   body := skipDeclarations CDDR x
   -- Make it explicitly a sequence of statements if it is not a one liner.
   body := 

Modified: trunk/src/interp/types.boot
===================================================================
--- trunk/src/interp/types.boot	2010-07-27 12:24:31 UTC (rev 1716)
+++ trunk/src/interp/types.boot	2010-07-27 14:42:33 UTC (rev 1717)
@@ -129,7 +129,7 @@
 %Instantiation <=> [%Constructor,:%Form]       -- constructor instance
 %Env <=> %List                                 -- compiling env
 %Mode <=> %Symbol or %String or %List          -- type of forms
-%Code <=> %Form                                -- generated code
+%Code <=> %Form or %Char                       -- generated code
 %Triple <=>                                    -- form + type + env
   [%Code,:[%Mode,:[%Env,:null]]]
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1719
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1719&view=rev
Author:   dos-reis
Date:     2010-07-27 19:21:08 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
	* interp/i-analy.boot (bottomUpCompile): Use massageBackendCode in
	lieu of mutateToBackendCode.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/interp/i-analy.boot

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-27 15:18:41 UTC (rev 1718)
+++ trunk/src/ChangeLog	2010-07-27 19:21:08 UTC (rev 1719)
@@ -1,5 +1,10 @@
 2010-07-27  Gabriel Dos Reis  <gdr@...>
 
+	* interp/i-analy.boot (bottomUpCompile): Use massageBackendCode in
+	lieu of mutateToBackendCode.
+
+2010-07-27  Gabriel Dos Reis  <gdr@...>
+
 	* interp/types.boot (%Code): Include %Char.
 	* interp/c-util.boot (middleEndExpand): Temporarilty Comment out
 	signature.

Modified: trunk/src/interp/i-analy.boot
===================================================================
--- trunk/src/interp/i-analy.boot	2010-07-27 15:18:41 UTC (rev 1718)
+++ trunk/src/interp/i-analy.boot	2010-07-27 19:21:08 UTC (rev 1719)
@@ -296,7 +296,7 @@
 bottomUpCompile t ==
   $genValue:local := false
   ms := bottomUp t
-  mutateToBackendCode objVal getValue t
+  massageBackendCode objVal getValue t
   ms
 
 bottomUpUseSubdomain t ==


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1720
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1720&view=rev
Author:   dos-reis
Date:     2010-07-27 21:50:57 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
	* boot/tokens.boot: quo and rem are now keywords and infix operators.
	* boot/parser.boot (bpEuclid): New.  Parse integer quotient and
	remainder expressions.
	(bpMinus): Now build on bpEuclid instead of bpTimes.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/boot/parser.boot
    trunk/src/boot/strap/parser.clisp
    trunk/src/boot/strap/tokens.clisp
    trunk/src/boot/tokens.boot

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-27 19:21:08 UTC (rev 1719)
+++ trunk/src/ChangeLog	2010-07-27 21:50:57 UTC (rev 1720)
@@ -1,5 +1,12 @@
 2010-07-27  Gabriel Dos Reis  <gdr@...>
 
+	* boot/tokens.boot: quo and rem are now keywords and infix operators.
+	* boot/parser.boot (bpEuclid): New.  Parse integer quotient and
+	remainder expressions.
+	(bpMinus): Now build on bpEuclid instead of bpTimes.
+
+2010-07-27  Gabriel Dos Reis  <gdr@...>
+
 	* interp/i-analy.boot (bottomUpCompile): Use massageBackendCode in
 	lieu of mutateToBackendCode.
 

Modified: trunk/src/boot/parser.boot
===================================================================
--- trunk/src/boot/parser.boot	2010-07-27 19:21:08 UTC (rev 1719)
+++ trunk/src/boot/parser.boot	2010-07-27 21:50:57 UTC (rev 1720)
@@ -651,11 +651,14 @@
  
 bpTimes()==
     bpReduce() or bpLeftAssoc('(TIMES  SLASH),function bpExpt)
+
+bpEuclid() ==
+  bpLeftAssoc('(QUO REM),function bpTimes)
  
 bpMinus()==
-  bpInfGeneric '(MINUS) and (bpTimes() or bpTrap())
+  bpInfGeneric '(MINUS) and (bpEuclid() or bpTrap())
     and bpPush(bfApplication(bpPop2(),bpPop1()))
-      or bpTimes()
+      or bpEuclid()
  
 bpArith()==bpLeftAssoc('(PLUS MINUS),function bpMinus)
  

Modified: trunk/src/boot/strap/parser.clisp
===================================================================
--- trunk/src/boot/strap/parser.clisp	2010-07-27 19:21:08 UTC (rev 1719)
+++ trunk/src/boot/strap/parser.clisp	2010-07-27 21:50:57 UTC (rev 1720)
@@ -697,10 +697,12 @@
 (DEFUN |bpTimes| ()
   (OR (|bpReduce|) (|bpLeftAssoc| '(TIMES SLASH) #'|bpExpt|)))
 
+(DEFUN |bpEuclid| () (|bpLeftAssoc| '(QUO REM) #'|bpTimes|))
+
 (DEFUN |bpMinus| ()
-  (OR (AND (|bpInfGeneric| '(MINUS)) (OR (|bpTimes|) (|bpTrap|))
+  (OR (AND (|bpInfGeneric| '(MINUS)) (OR (|bpEuclid|) (|bpTrap|))
            (|bpPush| (|bfApplication| (|bpPop2|) (|bpPop1|))))
-      (|bpTimes|)))
+      (|bpEuclid|)))
 
 (DEFUN |bpArith| () (|bpLeftAssoc| '(PLUS MINUS) #'|bpMinus|))
 

Modified: trunk/src/boot/strap/tokens.clisp
===================================================================
--- trunk/src/boot/strap/tokens.clisp	2010-07-27 19:21:08 UTC (rev 1719)
+++ trunk/src/boot/strap/tokens.clisp	2010-07-27 21:50:57 UTC (rev 1720)
@@ -12,8 +12,9 @@
           (LIST "if" 'IF) (LIST "import" 'IMPORT) (LIST "in" 'IN)
           (LIST "is" 'IS) (LIST "isnt" 'ISNT) (LIST "leave" 'LEAVE)
           (LIST "module" 'MODULE) (LIST "namespace" 'NAMESPACE)
-          (LIST "of" 'OF) (LIST "or" 'OR) (LIST "repeat" 'REPEAT)
-          (LIST "return" 'RETURN) (LIST "structure" 'STRUCTURE)
+          (LIST "of" 'OF) (LIST "or" 'OR) (LIST "rem" 'REM)
+          (LIST "repeat" 'REPEAT) (LIST "return" 'RETURN)
+          (LIST "quo" 'QUO) (LIST "structure" 'STRUCTURE)
           (LIST "then" 'THEN) (LIST "throw" 'THROW) (LIST "try" 'TRY)
           (LIST "until" 'UNTIL) (LIST "where" 'WHERE)
           (LIST "while" 'WHILE) (LIST "." 'DOT) (LIST ":" 'COLON)
@@ -165,6 +166,7 @@
 
 (EVAL-WHEN (:EXECUTE :LOAD-TOPLEVEL)
   (LET ((|bfVar#7| (LIST (LIST 'SHOEEQ '=) (LIST 'TIMES '*)
+                         (LIST 'REM '|rem|) (LIST 'QUO '|quo|)
                          (LIST 'PLUS '+) (LIST 'IS '|is|)
                          (LIST 'ISNT '|isnt|) (LIST 'AND '|and|)
                          (LIST 'OR '|or|) (LIST 'SLASH '/)
@@ -237,6 +239,7 @@
                   (LIST '|writeByte| 'WRITE-BYTE)
                   (LIST '|writeLine| 'WRITE-LINE) (LIST 'PLUS '+)
                   (LIST 'MINUS '-) (LIST 'TIMES '*) (LIST 'POWER 'EXPT)
+                  (LIST 'REM 'REM) (LIST 'QUO 'TRUNCATE)
                   (LIST 'SLASH '/) (LIST 'LT '<) (LIST 'GT '>)
                   (LIST 'LE '<=) (LIST 'GE '>=) (LIST 'SHOEEQ 'EQUAL)
                   (LIST 'SHOENE '/=) (LIST 'T 'T$)))

Modified: trunk/src/boot/tokens.boot
===================================================================
--- trunk/src/boot/tokens.boot	2010-07-27 19:21:08 UTC (rev 1719)
+++ trunk/src/boot/tokens.boot	2010-07-27 21:50:57 UTC (rev 1720)
@@ -56,8 +56,10 @@
             ['"namespace", "NAMESPACE"], _
             ['"of",   "OF"] , _
             ['"or",   "OR"] , _
+            ['"rem",  "REM"], _
             ['"repeat", "REPEAT"] , _
             ['"return", "RETURN"], _
+            ['"quo",     "QUO"], _
             ['"structure", "STRUCTURE"], _
             ['"then",  "THEN"], _
             ['"throw", "THROW"], _
@@ -187,6 +189,8 @@
 for i in [      _
         ["SHOEEQ"    ,"="], _
         ["TIMES"    ,"*"], _
+        ["REM",    "rem"],_
+        ["QUO",    "quo"],_
         ["PLUS" ,"+"], _
         ["IS"   ,"is"], _
         ["ISNT" ,"isnt"], _
@@ -294,6 +298,8 @@
   ["MINUS",     "-"]  , _
   ["TIMES",          "*"]  , _
   ["POWER",          "EXPT"]  , _
+  ['REM,          'REM],_
+  ['QUO,     'TRUNCATE],_
   ["SLASH",       "/"]  , _
   ["LT",              "<"], _
   ["GT",              ">"] , _


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1721
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1721&view=rev
Author:   dos-reis
Date:     2010-07-28 03:02:17 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
	* interp/g-opt.boot: Transform %iquo and %irem expressions.
	($VMsideEffectFreeOperators): Include %irem and %iquo.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/interp/g-opt.boot

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-27 21:50:57 UTC (rev 1720)
+++ trunk/src/ChangeLog	2010-07-28 03:02:17 UTC (rev 1721)
@@ -1,5 +1,10 @@
 2010-07-27  Gabriel Dos Reis  <gdr@...>
 
+	* interp/g-opt.boot: Transform %iquo and %irem expressions.
+	($VMsideEffectFreeOperators): Include %irem and %iquo.
+
+2010-07-27  Gabriel Dos Reis  <gdr@...>
+
 	* boot/tokens.boot: quo and rem are now keywords and infix operators.
 	* boot/parser.boot (bpEuclid): New.  Parse integer quotient and
 	remainder expressions.

Modified: trunk/src/interp/g-opt.boot
===================================================================
--- trunk/src/interp/g-opt.boot	2010-07-27 21:50:57 UTC (rev 1720)
+++ trunk/src/interp/g-opt.boot	2010-07-28 03:02:17 UTC (rev 1721)
@@ -443,6 +443,7 @@
         %beq %blt %ble %bgt %bge %bitand %bitior %bitnot %bcompl
         %icst0 %icst1
         %imul %iadd %isub %igcd %ilcm %ipow %imin %imax %ieven? %iodd? %iinc
+        %irem %iquo
         %feq %flt %fle %fgt %fge %fmul %fadd %fsub %fexp %fmin %fmax %float?
         %fpow %fdiv %fneg %i2f %fminval %fmaxval %fbase %fprec %ftrunc
         %nil %pair? %lconcat %llength %lfirst %lsecond %lthird
@@ -732,6 +733,14 @@
   integer? a => -a
   x
 
+optIrem(x is ['%irem,a,b]) ==
+  integer? a and integer? b => a rem b
+  x
+
+optIquo(x is ['%iquo,a,b]) ==
+  integer? a and integer? b => a quo b
+  x
+
 --%  
 --% optimizer hash table
 --%
@@ -755,6 +764,8 @@
            (%ineg        optIneg)_
            (%iadd        optIadd)_
            (%isub        optIsub)_
+           (%irem        optIrem)_
+           (%iquo        optIquo)_
            (%imul        optImul)_
            (LIST         optLIST)_
            (QSMINUS      optQSMINUS)_


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1722
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1722&view=rev
Author:   dos-reis
Date:     2010-07-28 08:21:13 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
	* algebra/integer.spad.pamphlet (Integer): Use builtin functions
	%irem and %iquo.
	* algebra/si.spad.pamphlet (SingleInteger): Likewise.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/algebra/integer.spad.pamphlet
    trunk/src/algebra/si.spad.pamphlet
    trunk/src/algebra/strap/INT.lsp
    trunk/src/algebra/strap/SINT.lsp
    trunk/src/interp/g-util.boot
    trunk/src/share/algebra/browse.daase
    trunk/src/share/algebra/category.daase
    trunk/src/share/algebra/compress.daase
    trunk/src/share/algebra/interp.daase
    trunk/src/share/algebra/operation.daase

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-28 03:02:17 UTC (rev 1721)
+++ trunk/src/ChangeLog	2010-07-28 08:21:13 UTC (rev 1722)
@@ -1,3 +1,9 @@
+2010-07-28  Gabriel Dos Reis  <gdr@...>
+
+	* algebra/integer.spad.pamphlet (Integer): Use builtin functions
+	%irem and %iquo.
+	* algebra/si.spad.pamphlet (SingleInteger): Likewise.
+
 2010-07-27  Gabriel Dos Reis  <gdr@...>
 
 	* interp/g-opt.boot: Transform %iquo and %irem expressions.

Modified: trunk/src/algebra/integer.spad.pamphlet
===================================================================
--- trunk/src/algebra/integer.spad.pamphlet	2010-07-28 03:02:17 UTC (rev 1721)
+++ trunk/src/algebra/integer.spad.pamphlet	2010-07-28 08:21:13 UTC (rev 1722)
@@ -91,6 +91,8 @@
       import %iadd: (%,%) -> %         from Foreign Builtin
       import %isub: (%,%) -> %         from Foreign Builtin
       import %imul: (%,%) -> %         from Foreign Builtin
+      import %irem: (%,%) -> %         from Foreign Builtin
+      import %iquo: (%,%) -> %         from Foreign Builtin
       import %imax: (%,%) -> %         from Foreign Builtin
       import %imin: (%,%) -> %         from Foreign Builtin
       import %igcd: (%,%) -> %         from Foreign Builtin
@@ -210,8 +212,8 @@
       max(x,y) == %imax(x,y)
       min(x,y) == %imin(x,y)
       divide(x,y) == DIVIDE2(x,y)$Lisp
-      x quo y == QUOTIENT2(x,y)$Lisp
-      x rem y == REMAINDER2(x,y)$Lisp
+      x quo y == %iquo(x,y)
+      x rem y == %irem(x,y)
       shift(x, y) == ASH(x,y)$Lisp
       recip(x) == if one? x or x=-1 then x else "failed"
       gcd(x,y) == %igcd(x,y)

Modified: trunk/src/algebra/si.spad.pamphlet
===================================================================
--- trunk/src/algebra/si.spad.pamphlet	2010-07-28 03:02:17 UTC (rev 1721)
+++ trunk/src/algebra/si.spad.pamphlet	2010-07-28 08:21:13 UTC (rev 1722)
@@ -181,9 +181,9 @@
 
 
 -- Lisp dependencies
--- EQ, ABSVAL, TIMES, INTEGER-LENGTH, HASHEQ, REMAINDER
+-- EQ, ABSVAL, TIMES, INTEGER-LENGTH, HASHEQ, 
 -- QSLESSP, QSGREATERP, QSADD1, QSSUB1, QSMINUS, QSPLUS, QSDIFFERENCE
--- QSTIMES, QSREMAINDER, QSODDP, QSZEROP, QSMAX, QSMIN, QSNOT, QSAND
+-- QSTIMES,, QSODDP, QSZEROP, QSMAX, QSMIN, QSNOT, QSAND
 -- QSOR, QSXOR, QSLEFTSHIFT, QSADDMOD, QSDIFMOD, QSMULTMOD
 
 
@@ -215,6 +215,8 @@
    import %iadd: (%,%) -> %         from Foreign Builtin
    import %isub: (%,%) -> %         from Foreign Builtin
    import %imul: (%,%) -> %         from Foreign Builtin
+   import %irem: (%,%) -> %         from Foreign Builtin
+   import %iquo: (%,%) -> %         from Foreign Builtin
    import %ineg: % -> %             from Foreign Builtin
    import %iabs: % -> %             from Foreign Builtin
    import %imax: (%,%) -> %         from Foreign Builtin
@@ -312,8 +314,8 @@
    x:% * y:% == %imul(x,y)
    x:% ** n:NonNegativeInteger == 
       (%ipow(x, n)$Foreign(Builtin) pretend Integer)::%
-   x quo y   == QSQUOTIENT(x,y)$Lisp
-   x rem y   == QSREMAINDER(x,y)$Lisp
+   x quo y   == %iquo(x,y)
+   x rem y   == %irem(x,y)
    divide(x, y)   == CONS(QSQUOTIENT(x,y)$Lisp,QSREMAINDER(x,y)$Lisp)$Lisp
    gcd(x,y)  == %igcd(x,y)
    abs(x)    == %iabs x
@@ -339,7 +341,7 @@
         [m pretend Matrix(Integer), v pretend Vector(Integer)]
 
    positiveRemainder(x,n) ==
-      r := QSREMAINDER(x,n)$Lisp
+      r := %irem(x,n)
       negative? r =>
         negative? n => x - n 
         r + n
@@ -348,8 +350,8 @@
    coerce(x:Integer):% == per x
 
    random() ==
-      seed := REMAINDER(TIMES(MULTIPLIER,seed)$Lisp,MODULUS)$Lisp
-      REMAINDER(seed,BASE)$Lisp
+      seed := TIMES(MULTIPLIER,seed)$Lisp rem MODULUS
+      seed rem BASE
 
    random(n) == RANDOM(n)$Lisp
 

Modified: trunk/src/algebra/strap/INT.lsp
===================================================================
--- trunk/src/algebra/strap/INT.lsp	2010-07-28 03:02:17 UTC (rev 1721)
+++ trunk/src/algebra/strap/INT.lsp	2010-07-28 08:21:13 UTC (rev 1722)
@@ -212,12 +212,12 @@
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
                 |INT;quo;3$;49|)) 
 
-(PUT '|INT;quo;3$;49| '|SPADreplace| 'QUOTIENT2) 
+(PUT '|INT;quo;3$;49| '|SPADreplace| '|%iquo|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
                 |INT;rem;3$;50|)) 
 
-(PUT '|INT;rem;3$;50| '|SPADreplace| 'REMAINDER2) 
+(PUT '|INT;rem;3$;50| '|SPADreplace| '|%irem|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
                 |INT;shift;3$;51|)) 
@@ -264,6 +264,9 @@
 (PUT '|INT;negative?;$B;15| '|SPADreplace|
      '(XLAM (|x|) (|%ilt| |x| 0))) 
 
+(PUT '|INT;mulmod;4$;22| '|SPADreplace|
+     '(XLAM (|a| |b| |p|) (|%irem| (|%imul| |a| |b|) |p|))) 
+
 (PUT '|INT;unitCanonical;2$;55| '|SPADreplace| '|%iabs|) 
 
 (DEFUN |INT;writeOMInt| (|dev| |x| $)
@@ -348,7 +351,8 @@
   (LET ((|c| (- |a| |b|))) (COND ((MINUSP |c|) (+ |c| |p|)) (T |c|)))) 
 
 (DEFUN |INT;mulmod;4$;22| (|a| |b| |p| $)
-  (REMAINDER2 (* |a| |b|) |p|)) 
+  (DECLARE (IGNORE $))
+  (REM (* |a| |b|) |p|)) 
 
 (DEFUN |INT;convert;$F;23| (|x| $)
   (SPADCALL |x| (|getShellEntry| $ 53))) 
@@ -374,9 +378,7 @@
     (RETURN
       (COND
         ((|INT;negative?;$B;15|
-             (LETT |r| (REMAINDER2 |a| |b|)
-                   |INT;positiveRemainder;3$;28|)
-             $)
+             (LETT |r| (REM |a| |b|) |INT;positiveRemainder;3$;28|) $)
          (COND ((MINUSP |b|) (- |r| |b|)) (T (+ |r| |b|))))
         (T |r|))))) 
 
@@ -432,11 +434,9 @@
 
 (DEFUN |INT;quo;3$;49| (|x| |y| $)
   (DECLARE (IGNORE $))
-  (QUOTIENT2 |x| |y|)) 
+  (TRUNCATE |x| |y|)) 
 
-(DEFUN |INT;rem;3$;50| (|x| |y| $)
-  (DECLARE (IGNORE $))
-  (REMAINDER2 |x| |y|)) 
+(DEFUN |INT;rem;3$;50| (|x| |y| $) (DECLARE (IGNORE $)) (REM |x| |y|)) 
 
 (DEFUN |INT;shift;3$;51| (|x| |y| $)
   (DECLARE (IGNORE $))

Modified: trunk/src/algebra/strap/SINT.lsp
===================================================================
--- trunk/src/algebra/strap/SINT.lsp	2010-07-28 03:02:17 UTC (rev 1721)
+++ trunk/src/algebra/strap/SINT.lsp	2010-07-28 08:21:13 UTC (rev 1722)
@@ -164,12 +164,12 @@
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;quo;3$;37|)) 
 
-(PUT '|SINT;quo;3$;37| '|SPADreplace| 'QSQUOTIENT) 
+(PUT '|SINT;quo;3$;37| '|SPADreplace| '|%iquo|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;rem;3$;38|)) 
 
-(PUT '|SINT;rem;3$;38| '|SPADreplace| 'QSREMAINDER) 
+(PUT '|SINT;rem;3$;38| '|SPADreplace| '|%irem|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Pair|)
                 |SINT;divide;2$R;39|)) 
@@ -413,11 +413,11 @@
 
 (DEFUN |SINT;quo;3$;37| (|x| |y| $)
   (DECLARE (IGNORE $))
-  (QSQUOTIENT |x| |y|)) 
+  (TRUNCATE |x| |y|)) 
 
 (DEFUN |SINT;rem;3$;38| (|x| |y| $)
   (DECLARE (IGNORE $))
-  (QSREMAINDER |x| |y|)) 
+  (REM |x| |y|)) 
 
 (DEFUN |SINT;divide;2$R;39| (|x| |y| $)
   (CONS (QSQUOTIENT |x| |y|) (QSREMAINDER |x| |y|))) 
@@ -485,7 +485,7 @@
   (CONS |m| |v|)) 
 
 (DEFUN |SINT;positiveRemainder;3$;58| (|x| |n| $)
-  (LET ((|r| (QSREMAINDER |x| |n|)))
+  (LET ((|r| (REM |x| |n|)))
     (COND
       ((QSMINUSP |r|)
        (COND ((QSMINUSP |n|) (- |x| |n|)) (T (+ |r| |n|))))
@@ -496,9 +496,8 @@
 
 (DEFUN |SINT;random;$;60| ($)
   (SEQ (|setShellEntry| $ 6
-           (REMAINDER (TIMES 314159269 (|getShellEntry| $ 6))
-               2147483647))
-       (EXIT (REMAINDER (|getShellEntry| $ 6) 67108864)))) 
+           (REM (TIMES 314159269 (|getShellEntry| $ 6)) 2147483647))
+       (EXIT (REM (|getShellEntry| $ 6) 67108864)))) 
 
 (DEFUN |SINT;random;2$;61| (|n| $) (DECLARE (IGNORE $)) (RANDOM |n|)) 
 

Modified: trunk/src/interp/g-util.boot
===================================================================
--- trunk/src/interp/g-util.boot	2010-07-28 03:02:17 UTC (rev 1721)
+++ trunk/src/interp/g-util.boot	2010-07-28 08:21:13 UTC (rev 1722)
@@ -380,17 +380,19 @@
     ['%iodd?,   :'ODDP],
     ['%ismall?, :'FIXNUMP],
     -- binary integer operations.
-    ['%iadd,:"+"],
-    ['%igcd,:'GCD],
-    ['%ige, :">="],
-    ['%iinc,:"1+"],
-    ['%ilcm,:'LCM],
-    ['%ile, :"<="],
-    ['%imax,:'MAX],
-    ['%imin,:'MIN],
-    ['%imul,:"*"],
-    ['%ipow,:'EXPT],
-    ['%isub,:"-"],
+    ['%iadd,    :"+"],
+    ['%igcd,    :'GCD],
+    ['%ige,     :">="],
+    ['%iinc,    :"1+"],
+    ['%ilcm,    :'LCM],
+    ['%ile,     :"<="],
+    ['%imax,    :'MAX],
+    ['%imin,    :'MIN],
+    ['%imul,    :"*"],
+    ['%irem,    :'REM],
+    ['%iquo,    :'TRUNCATE],
+    ['%ipow,    :'EXPT],
+    ['%isub,    :"-"],
 
     -- unary float operations.
     ['%fabs,  :'ABS],

Modified: trunk/src/share/algebra/browse.daase
===================================================================
--- trunk/src/share/algebra/browse.daase	2010-07-28 03:02:17 UTC (rev 1721)
+++ trunk/src/share/algebra/browse.daase	2010-07-28 08:21:13 UTC (rev 1722)
@@ -1,5 +1,5 @@
 
-(2299819 . 3488813772)       
+(2299819 . 3489277357)       
 (-18 A S) 
 ((|constructor| (NIL "One-dimensional-array aggregates serves as models for one-dimensional arrays. Categorically,{} these aggregates are finite linear aggregates with the \\spadatt{shallowlyMutable} property,{} that is,{} any component of the array may be changed without affecting the identity of the overall array. Array data structures are typically represented by a fixed area in storage and therefore cannot efficiently grow or shrink on demand as can list structures (see however \\spadtype{FlexibleArray} for a data structure which is a cross between a list and an array). Iteration over,{} and access to,{} elements of arrays is extremely fast (and often can be optimized to open-code). Insertion and deletion however is generally slow since an entirely new data structure must be created for the result."))) 
 NIL 
@@ -56,7 +56,7 @@
 ((|constructor| (NIL "This domain represents the syntax for an add-expression.")) (|body| (((|SpadAst|) $) "base(\\spad{d}) returns the actual body of the add-domain expression \\spad{`d'}.")) (|base| (((|SpadAst|) $) "\\spad{base(d)} returns the base domain(\\spad{s}) of the add-domain expression."))) 
 NIL 
 NIL 
-(-32 R -2068) 
+(-32 R -2933) 
 ((|constructor| (NIL "This package provides algebraic functions over an integral domain.")) (|iroot| ((|#2| |#1| (|Integer|)) "\\spad{iroot(p, n)} should be a non-exported function.")) (|definingPolynomial| ((|#2| |#2|) "\\spad{definingPolynomial(f)} returns the defining polynomial of \\spad{f} as an element of \\spad{F}. Error: if \\spad{f} is not a kernel.")) (|minPoly| (((|SparseUnivariatePolynomial| |#2|) (|Kernel| |#2|)) "\\spad{minPoly(k)} returns the defining polynomial of \\spad{k}.")) (** ((|#2| |#2| (|Fraction| (|Integer|))) "\\spad{x ** q} is \\spad{x} raised to the rational power \\spad{q}.")) (|droot| (((|OutputForm|) (|List| |#2|)) "\\spad{droot(l)} should be a non-exported function.")) (|inrootof| ((|#2| (|SparseUnivariatePolynomial| |#2|) |#2|) "\\spad{inrootof(p, x)} should be a non-exported function.")) (|belong?| (((|Boolean|) (|BasicOperator|)) "\\spad{belong?(op)} is \\spad{true} if \\spad{op} is an algebraic operator,{} that is,{} an \\spad{n}th root or implicit algebraic operator.")) (|operator| (((|BasicOperator|) (|BasicOperator|)) "\\spad{operator(op)} returns a copy of \\spad{op} with the domain-dependent properties appropriate for \\spad{F}. Error: if \\spad{op} is not an algebraic operator,{} that is,{} an \\spad{n}th root or implicit algebraic operator.")) (|rootOf| ((|#2| (|SparseUnivariatePolynomial| |#2|) (|Symbol|)) "\\spad{rootOf(p, y)} returns \\spad{y} such that \\spad{p(y) = 0}. The object returned displays as \\spad{'y}."))) 
 NIL 
 ((|HasCategory| |#1| (LIST (QUOTE -1068) (QUOTE (-577))))) 
@@ -88,11 +88,11 @@
 ((|constructor| (NIL "Factorization of univariate polynomials with coefficients in \\spadtype{AlgebraicNumber}.")) (|doublyTransitive?| (((|Boolean|) |#1|) "\\spad{doublyTransitive?(p)} is \\spad{true} if \\spad{p} is irreducible over over the field \\spad{K} generated by its coefficients,{} and if \\spad{p(X) / (X - a)} is irreducible over \\spad{K(a)} where \\spad{p(a) = 0}.")) (|split| (((|Factored| |#1|) |#1|) "\\spad{split(p)} returns a prime factorisation of \\spad{p} over its splitting field.")) (|factor| (((|Factored| |#1|) |#1|) "\\spad{factor(p)} returns a prime factorisation of \\spad{p} over the field generated by its coefficients.") (((|Factored| |#1|) |#1| (|List| (|AlgebraicNumber|))) "\\spad{factor(p, [a1,...,an])} returns a prime factorisation of \\spad{p} over the field generated by its coefficients and a1,{}...,{}an."))) 
 NIL 
 NIL 
-(-40 -2068 UP UPUP -3700) 
+(-40 -2933 UP UPUP -1406) 
 ((|constructor| (NIL "Function field defined by \\spad{f}(\\spad{x},{} \\spad{y}) = 0.")) (|knownInfBasis| (((|Void|) (|NonNegativeInteger|)) "\\spad{knownInfBasis(n)} \\undocumented{}"))) 
 ((-4492 |has| (-420 |#2|) (-375)) (-4497 |has| (-420 |#2|) (-375)) (-4491 |has| (-420 |#2|) (-375)) ((-4501 "*") . T) (-4493 . T) (-4494 . T) (-4496 . T)) 
-((|HasCategory| (-420 |#2|) (QUOTE (-146))) (|HasCategory| (-420 |#2|) (QUOTE (-148))) (|HasCategory| (-420 |#2|) (QUOTE (-361))) (-2816 (|HasCategory| (-420 |#2|) (QUOTE (-375))) (|HasCategory| (-420 |#2|) (QUOTE (-361)))) (|HasCategory| (-420 |#2|) (QUOTE (-375))) (|HasCategory| (-420 |#2|) (QUOTE (-380))) (-2816 (-12 (|HasCategory| (-420 |#2|) (QUOTE (-239))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (|HasCategory| (-420 |#2|) (QUOTE (-361)))) (-2816 (-12 (|HasCategory| (-420 |#2|) (QUOTE (-239))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (-12 (|HasCategory| (-420 |#2|) (QUOTE (-238))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (|HasCategory| (-420 |#2|) (QUOTE (-361)))) (-2816 (-12 (|HasCategory| (-420 |#2|) (LIST (QUOTE -926) (QUOTE (-1206)))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (-12 (|HasCategory| (-420 |#2|) (LIST (QUOTE -926) (QUOTE (-1206)))) (|HasCategory| (-420 |#2|) (QUOTE (-361))))) (-2816 (-12 (|HasCategory| (-420 |#2|) (LIST (QUOTE -926) (QUOTE (-1206)))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (-12 (|HasCategory| (-420 |#2|) (LIST (QUOTE -928) (QUOTE (-1206)))) (|HasCategory| (-420 |#2|) (QUOTE (-375))))) (|HasCategory| (-420 |#2|) (LIST (QUOTE -659) (QUOTE (-577)))) (-2816 (|HasCategory| (-420 |#2|) (LIST (QUOTE -1068) (LIST (QUOTE -420) (QUOTE (-577))))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (|HasCategory| (-420 |#2|) (LIST (QUOTE -1068) (LIST (QUOTE -420) (QUOTE (-577))))) (|HasCategory| (-420 |#2|) (LIST (QUOTE -1068) (QUOTE (-577)))) (|HasCategory| |#1| (QUOTE (-375))) (|HasCategory| |#1| (QUOTE (-380))) (-12 (|HasCategory| (-420 |#2|) (QUOTE (-238))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (-12 (|HasCategory| (-420 |#2|) (LIST (QUOTE -928) (QUOTE (-1206)))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (-12 (|HasCategory| (-420 |#2|) (QUOTE (-239))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (-12 (|HasCategory| (-420 |#2|) (LIST (QUOTE -926) (QUOTE (-1206)))) (|HasCategory| (-420 |#2|) (QUOTE (-375))))) 
-(-41 R -2068) 
+((|HasCategory| (-420 |#2|) (QUOTE (-146))) (|HasCategory| (-420 |#2|) (QUOTE (-148))) (|HasCategory| (-420 |#2|) (QUOTE (-361))) (-3688 (|HasCategory| (-420 |#2|) (QUOTE (-375))) (|HasCategory| (-420 |#2|) (QUOTE (-361)))) (|HasCategory| (-420 |#2|) (QUOTE (-375))) (|HasCategory| (-420 |#2|) (QUOTE (-380))) (-3688 (-12 (|HasCategory| (-420 |#2|) (QUOTE (-239))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (|HasCategory| (-420 |#2|) (QUOTE (-361)))) (-3688 (-12 (|HasCategory| (-420 |#2|) (QUOTE (-239))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (-12 (|HasCategory| (-420 |#2|) (QUOTE (-238))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (|HasCategory| (-420 |#2|) (QUOTE (-361)))) (-3688 (-12 (|HasCategory| (-420 |#2|) (LIST (QUOTE -926) (QUOTE (-1206)))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (-12 (|HasCategory| (-420 |#2|) (LIST (QUOTE -926) (QUOTE (-1206)))) (|HasCategory| (-420 |#2|) (QUOTE (-361))))) (-3688 (-12 (|HasCategory| (-420 |#2|) (LIST (QUOTE -926) (QUOTE (-1206)))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (-12 (|HasCategory| (-420 |#2|) (LIST (QUOTE -928) (QUOTE (-1206)))) (|HasCategory| (-420 |#2|) (QUOTE (-375))))) (|HasCategory| (-420 |#2|) (LIST (QUOTE -659) (QUOTE (-577)))) (-3688 (|HasCategory| (-420 |#2|) (LIST (QUOTE -1068) (LIST (QUOTE -420) (QUOTE (-577))))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (|HasCategory| (-420 |#2|) (LIST (QUOTE -1068) (LIST (QUOTE -420) (QUOTE (-577))))) (|HasCategory| (-420 |#2|) (LIST (QUOTE -1068) (QUOTE (-577)))) (|HasCategory| |#1| (QUOTE (-375))) (|HasCategory| |#1| (QUOTE (-380))) (-12 (|HasCategory| (-420 |#2|) (QUOTE (-238))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (-12 (|HasCategory| (-420 |#2|) (LIST (QUOTE -928) (QUOTE (-1206)))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (-12 (|HasCategory| (-420 |#2|) (QUOTE (-239))) (|HasCategory| (-420 |#2|) (QUOTE (-375)))) (-12 (|HasCategory| (-420 |#2|) (LIST (QUOTE -926) (QUOTE (-1206)))) (|HasCategory| (-420 |#2|) (QUOTE (-375))))) 
+(-41 R -2933) 
 ((|constructor| (NIL "AlgebraicManipulations provides functions to simplify and expand expressions involving algebraic operators.")) (|rootKerSimp| ((|#2| (|BasicOperator|) |#2| (|NonNegativeInteger|)) "\\spad{rootKerSimp(op,f,n)} should be local but conditional.")) (|rootSimp| ((|#2| |#2|) "\\spad{rootSimp(f)} transforms every radical of the form \\spad{(a * b**(q*n+r))**(1/n)} appearing in \\spad{f} into \\spad{b**q * (a * b**r)**(1/n)}. This transformation is not in general valid for all complex numbers \\spad{b}.")) (|rootProduct| ((|#2| |#2|) "\\spad{rootProduct(f)} combines every product of the form \\spad{(a**(1/n))**m * (a**(1/s))**t} into a single power of a root of \\spad{a},{} and transforms every radical power of the form \\spad{(a**(1/n))**m} into a simpler form.")) (|rootPower| ((|#2| |#2|) "\\spad{rootPower(f)} transforms every radical power of the form \\spad{(a**(1/n))**m} into a simpler form if \\spad{m} and \\spad{n} have a common factor.")) (|ratPoly| (((|SparseUnivariatePolynomial| |#2|) |#2|) "\\spad{ratPoly(f)} returns a polynomial \\spad{p} such that \\spad{p} has no algebraic coefficients,{} and \\spad{p(f) = 0}.")) (|ratDenom| ((|#2| |#2| (|List| (|Kernel| |#2|))) "\\spad{ratDenom(f, [a1,...,an])} removes the \\spad{ai}\\spad{'s} which are algebraic from the denominators in \\spad{f}.") ((|#2| |#2| (|List| |#2|)) "\\spad{ratDenom(f, [a1,...,an])} removes the \\spad{ai}\\spad{'s} which are algebraic kernels from the denominators in \\spad{f}.") ((|#2| |#2| |#2|) "\\spad{ratDenom(f, a)} removes \\spad{a} from the denominators in \\spad{f} if \\spad{a} is an algebraic kernel.") ((|#2| |#2|) "\\spad{ratDenom(f)} rationalizes the denominators appearing in \\spad{f} by moving all the algebraic quantities into the numerators.")) (|rootSplit| ((|#2| |#2|) "\\spad{rootSplit(f)} transforms every radical of the form \\spad{(a/b)**(1/n)} appearing in \\spad{f} into \\spad{a**(1/n) / b**(1/n)}. This transformation is not in general valid for all complex numbers \\spad{a} and \\spad{b}.")) (|coerce| (($ (|SparseMultivariatePolynomial| |#1| (|Kernel| $))) "\\spad{coerce(x)} \\undocumented")) (|denom| (((|SparseMultivariatePolynomial| |#1| (|Kernel| $)) $) "\\spad{denom(x)} \\undocumented")) (|numer| (((|SparseMultivariatePolynomial| |#1| (|Kernel| $)) $) "\\spad{numer(x)} \\undocumented"))) 
 NIL 
 ((-12 (|HasCategory| |#1| (QUOTE (-465))) (|HasCategory| |#1| (LIST (QUOTE -1068) (QUOTE (-577)))) (|HasCategory| |#2| (LIST (QUOTE -443) (|devaluate| |#1|))))) 
@@ -111,7 +111,7 @@
 (-45 |Key| |Entry|) 
 ((|constructor| (NIL "\\spadtype{AssociationList} implements association lists. These may be viewed as lists of pairs where the first part is a key and the second is the stored value. For example,{} the key might be a string with a persons employee identification number and the value might be a record with personnel data."))) 
 ((-4499 . T) (-4500 . T)) 
-((-2816 (-12 (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-870))) (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (LIST (QUOTE -320) (LIST (QUOTE -2) (LIST (QUOTE |:|) (QUOTE -4375) (|devaluate| |#1|)) (LIST (QUOTE |:|) (QUOTE -3988) (|devaluate| |#2|)))))) (-12 (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-1130))) (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (LIST (QUOTE -320) (LIST (QUOTE -2) (LIST (QUOTE |:|) (QUOTE -4375) (|devaluate| |#1|)) (LIST (QUOTE |:|) (QUOTE -3988) (|devaluate| |#2|))))))) (-2816 (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-870))) (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-1130))) (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#2| (QUOTE (-1130))) (|HasCategory| |#2| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (LIST (QUOTE -632) (QUOTE (-549)))) (-12 (|HasCategory| |#2| (QUOTE (-1130))) (|HasCategory| |#2| (LIST (QUOTE -320) (|devaluate| |#2|)))) (-2816 (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-870))) (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-1130))) (|HasCategory| |#2| (QUOTE (-1130)))) (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-870))) (-2816 (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-102))) (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-870))) (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-1130))) (|HasCategory| |#2| (QUOTE (-102))) (|HasCategory| |#2| (QUOTE (-1130)))) (|HasCategory| |#1| (QUOTE (-870))) (|HasCategory| |#2| (QUOTE (-1130))) (|HasCategory| (-577) (QUOTE (-870))) (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-1130))) (-2816 (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-1130))) (|HasCategory| |#2| (QUOTE (-1130)))) (-2816 (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#2| (LIST (QUOTE -631) (QUOTE (-885))))) (-2816 (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-102))) (|HasCategory| |#2| (QUOTE (-102)))) (|HasCategory| |#2| (QUOTE (-102))) (|HasCategory| |#2| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-102))) (-12 (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (QUOTE (-1130))) (|HasCategory| (-2 (|:| -4375 |#1|) (|:| -3988 |#2|)) (LIST (QUOTE -320) (LIST (QUOTE -2) (LIST (QUOTE |:|) (QUOTE -4375) (|devaluate| |#1|)) (LIST (QUOTE |:|) (QUOTE -3988) (|devaluate| |#2|))))))) 
+((-3688 (-12 (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-870))) (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (LIST (QUOTE -320) (LIST (QUOTE -2) (LIST (QUOTE |:|) (QUOTE -2313) (|devaluate| |#1|)) (LIST (QUOTE |:|) (QUOTE -2612) (|devaluate| |#2|)))))) (-12 (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-1130))) (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (LIST (QUOTE -320) (LIST (QUOTE -2) (LIST (QUOTE |:|) (QUOTE -2313) (|devaluate| |#1|)) (LIST (QUOTE |:|) (QUOTE -2612) (|devaluate| |#2|))))))) (-3688 (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-870))) (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-1130))) (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#2| (QUOTE (-1130))) (|HasCategory| |#2| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (LIST (QUOTE -632) (QUOTE (-549)))) (-12 (|HasCategory| |#2| (QUOTE (-1130))) (|HasCategory| |#2| (LIST (QUOTE -320) (|devaluate| |#2|)))) (-3688 (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-870))) (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-1130))) (|HasCategory| |#2| (QUOTE (-1130)))) (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-870))) (-3688 (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-102))) (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-870))) (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-1130))) (|HasCategory| |#2| (QUOTE (-102))) (|HasCategory| |#2| (QUOTE (-1130)))) (|HasCategory| |#1| (QUOTE (-870))) (|HasCategory| |#2| (QUOTE (-1130))) (|HasCategory| (-577) (QUOTE (-870))) (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-1130))) (-3688 (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-1130))) (|HasCategory| |#2| (QUOTE (-1130)))) (-3688 (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#2| (LIST (QUOTE -631) (QUOTE (-885))))) (-3688 (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-102))) (|HasCategory| |#2| (QUOTE (-102)))) (|HasCategory| |#2| (QUOTE (-102))) (|HasCategory| |#2| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-102))) (-12 (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (QUOTE (-1130))) (|HasCategory| (-2 (|:| -2313 |#1|) (|:| -2612 |#2|)) (LIST (QUOTE -320) (LIST (QUOTE -2) (LIST (QUOTE |:|) (QUOTE -2313) (|devaluate| |#1|)) (LIST (QUOTE |:|) (QUOTE -2612) (|devaluate| |#2|))))))) 
 (-46 S R E) 
 ((|constructor| (NIL "Abelian monoid ring elements (not necessarily of finite support) of this ring are of the form formal SUM (r_i * e_i) where the r_i are coefficents and the e_i,{} elements of the ordered abelian monoid,{} are thought of as exponents or monomials. The monomials commute with each other,{} and with the coefficients (which themselves may or may not be commutative). See \\spadtype{FiniteAbelianMonoidRing} for the case of finite support a useful common model for polynomials and power series. Conceptually at least,{} only the non-zero terms are ever operated on.")) (/ (($ $ |#2|) "\\spad{p/c} divides \\spad{p} by the coefficient \\spad{c}.")) (|coefficient| ((|#2| $ |#3|) "\\spad{coefficient(p,e)} extracts the coefficient of the monomial with exponent \\spad{e} from polynomial \\spad{p},{} or returns zero if exponent is not present.")) (|reductum| (($ $) "\\spad{reductum(u)} returns \\spad{u} minus its leading monomial returns zero if handed the zero element.")) (|monomial| (($ |#2| |#3|) "\\spad{monomial(r,e)} makes a term from a coefficient \\spad{r} and an exponent \\spad{e}.")) (|monomial?| (((|Boolean|) $) "\\spad{monomial?(p)} tests if \\spad{p} is a single monomial.")) (|map| (($ (|Mapping| |#2| |#2|) $) "\\spad{map(fn,u)} maps function \\spad{fn} onto the coefficients of the non-zero monomials of \\spad{u}.")) (|degree| ((|#3| $) "\\spad{degree(p)} returns the maximum of the exponents of the terms of \\spad{p}.")) (|leadingMonomial| (($ $) "\\spad{leadingMonomial(p)} returns the monomial of \\spad{p} with the highest degree.")) (|leadingCoefficient| ((|#2| $) "\\spad{leadingCoefficient(p)} returns the coefficient highest degree term of \\spad{p}."))) 
 NIL 
@@ -144,7 +144,7 @@
 ((|constructor| (NIL "\\spad{ApplyUnivariateSkewPolynomial} (internal) allows univariate skew polynomials to be applied to appropriate modules.")) (|apply| ((|#2| |#3| (|Mapping| |#2| |#2|) |#2|) "\\spad{apply(p, f, m)} returns \\spad{p(m)} where the action is given by \\spad{x m = f(m)}. \\spad{f} must be an \\spad{R}-pseudo linear map on \\spad{M}."))) 
 NIL 
 NIL 
-(-54 |Base| R -2068) 
+(-54 |Base| R -2933) 
 ((|constructor| (NIL "This package apply rewrite rules to expressions,{} calling the pattern matcher.")) (|localUnquote| ((|#3| |#3| (|List| (|Symbol|))) "\\spad{localUnquote(f,ls)} is a local function.")) (|applyRules| ((|#3| (|List| (|RewriteRule| |#1| |#2| |#3|)) |#3| (|PositiveInteger|)) "\\spad{applyRules([r1,...,rn], expr, n)} applies the rules \\spad{r1},{}...,{}\\spad{rn} to \\spad{f} a most \\spad{n} times.") ((|#3| (|List| (|RewriteRule| |#1| |#2| |#3|)) |#3|) "\\spad{applyRules([r1,...,rn], expr)} applies the rules \\spad{r1},{}...,{}\\spad{rn} to \\spad{f} an unlimited number of times,{} \\spadignore{i.e.} until none of \\spad{r1},{}...,{}\\spad{rn} is applicable to the expression."))) 
 NIL 
 NIL 
@@ -167,64 +167,64 @@
 (-59 S) 
 ((|constructor| (NIL "This is the domain of 1-based one dimensional arrays")) (|oneDimensionalArray| (($ (|NonNegativeInteger|) |#1|) "\\spad{oneDimensionalArray(n,s)} creates an array from \\spad{n} copies of element \\spad{s}") (($ (|List| |#1|)) "\\spad{oneDimensionalArray(l)} creates an array from a list of elements \\spad{l}"))) 
 ((-4500 . T) (-4499 . T)) 
-((-2816 (-12 (|HasCategory| |#1| (QUOTE (-870))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|))))) (-2816 (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| |#1| (LIST (QUOTE -632) (QUOTE (-549)))) (-2816 (|HasCategory| |#1| (QUOTE (-870))) (|HasCategory| |#1| (QUOTE (-1130)))) (|HasCategory| |#1| (QUOTE (-870))) (-2816 (|HasCategory| |#1| (QUOTE (-102))) (|HasCategory| |#1| (QUOTE (-870))) (|HasCategory| |#1| (QUOTE (-1130)))) (|HasCategory| (-577) (QUOTE (-870))) (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#1| (QUOTE (-102))) (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|))))) 
+((-3688 (-12 (|HasCategory| |#1| (QUOTE (-870))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|))))) (-3688 (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| |#1| (LIST (QUOTE -632) (QUOTE (-549)))) (-3688 (|HasCategory| |#1| (QUOTE (-870))) (|HasCategory| |#1| (QUOTE (-1130)))) (|HasCategory| |#1| (QUOTE (-870))) (-3688 (|HasCategory| |#1| (QUOTE (-102))) (|HasCategory| |#1| (QUOTE (-870))) (|HasCategory| |#1| (QUOTE (-1130)))) (|HasCategory| (-577) (QUOTE (-870))) (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#1| (QUOTE (-102))) (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|))))) 
 (-60 R) 
 ((|constructor| (NIL "\\indented{1}{A TwoDimensionalArray is a two dimensional array with} 1-based indexing for both rows and columns.")) (|shallowlyMutable| ((|attribute|) "One may destructively alter TwoDimensionalArray\\spad{'s}."))) 
 ((-4499 . T) (-4500 . T)) 
-((-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (QUOTE (-1130))) (-2816 (|HasCategory| |#1| (QUOTE (-102))) (|HasCategory| |#1| (QUOTE (-1130)))) (-2816 (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#1| (QUOTE (-102)))) 
-(-61 -2721) 
+((-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (QUOTE (-1130))) (-3688 (|HasCategory| |#1| (QUOTE (-102))) (|HasCategory| |#1| (QUOTE (-1130)))) (-3688 (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#1| (QUOTE (-102)))) 
+(-61 -4146) 
 ((|constructor| (NIL "\\spadtype{ASP10} produces Fortran for Type 10 ASPs,{} needed for NAG routine \\axiomOpFrom{d02kef}{d02Package}. This ASP computes the values of a set of functions,{} for example:\\begin{verbatim}      SUBROUTINE COEFFN(P,Q,DQDL,X,ELAM,JINT)      DOUBLE PRECISION ELAM,P,Q,X,DQDL      INTEGER JINT      P=1.0D0      Q=((-1.0D0*X**3)+ELAM*X*X-2.0D0)/(X*X)      DQDL=1.0D0      RETURN      END\\end{verbatim}")) (|coerce| (($ (|Vector| (|FortranExpression| (|construct| (QUOTE JINT) (QUOTE X) (QUOTE ELAM)) (|construct|) (|MachineFloat|)))) "\\spad{coerce(f)} takes objects from the appropriate instantiation of \\spadtype{FortranExpression} and turns them into an ASP."))) 
 NIL 
 NIL 
-(-62 -2721) 
+(-62 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp12} produces Fortran for Type 12 ASPs,{} needed for NAG routine \\axiomOpFrom{d02kef}{d02Package} etc.,{} for example:\\begin{verbatim}      SUBROUTINE MONIT (MAXIT,IFLAG,ELAM,FINFO)      DOUBLE PRECISION ELAM,FINFO(15)      INTEGER MAXIT,IFLAG      IF(MAXIT.EQ.-1)THEN        PRINT*,\"Output from Monit\"      ENDIF      PRINT*,MAXIT,IFLAG,ELAM,(FINFO(I),I=1,4)      RETURN      END\\end{verbatim}")) (|outputAsFortran| (((|Void|)) "\\spad{outputAsFortran()} generates the default code for \\spadtype{ASP12}."))) 
 NIL 
 NIL 
-(-63 -2721) 
+(-63 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp19} produces Fortran for Type 19 ASPs,{} evaluating a set of functions and their jacobian at a given point,{} for example:\\begin{verbatim}      SUBROUTINE LSFUN2(M,N,XC,FVECC,FJACC,LJC)      DOUBLE PRECISION FVECC(M),FJACC(LJC,N),XC(N)      INTEGER M,N,LJC      INTEGER I,J      DO 25003 I=1,LJC        DO 25004 J=1,N          FJACC(I,J)=0.0D025004   CONTINUE25003 CONTINUE      FVECC(1)=((XC(1)-0.14D0)*XC(3)+(15.0D0*XC(1)-2.1D0)*XC(2)+1.0D0)/(     &XC(3)+15.0D0*XC(2))      FVECC(2)=((XC(1)-0.18D0)*XC(3)+(7.0D0*XC(1)-1.26D0)*XC(2)+1.0D0)/(     &XC(3)+7.0D0*XC(2))      FVECC(3)=((XC(1)-0.22D0)*XC(3)+(4.333333333333333D0*XC(1)-0.953333     &3333333333D0)*XC(2)+1.0D0)/(XC(3)+4.333333333333333D0*XC(2))      FVECC(4)=((XC(1)-0.25D0)*XC(3)+(3.0D0*XC(1)-0.75D0)*XC(2)+1.0D0)/(     &XC(3)+3.0D0*XC(2))      FVECC(5)=((XC(1)-0.29D0)*XC(3)+(2.2D0*XC(1)-0.6379999999999999D0)*     &XC(2)+1.0D0)/(XC(3)+2.2D0*XC(2))      FVECC(6)=((XC(1)-0.32D0)*XC(3)+(1.666666666666667D0*XC(1)-0.533333     &3333333333D0)*XC(2)+1.0D0)/(XC(3)+1.666666666666667D0*XC(2))      FVECC(7)=((XC(1)-0.35D0)*XC(3)+(1.285714285714286D0*XC(1)-0.45D0)*     &XC(2)+1.0D0)/(XC(3)+1.285714285714286D0*XC(2))      FVECC(8)=((XC(1)-0.39D0)*XC(3)+(XC(1)-0.39D0)*XC(2)+1.0D0)/(XC(3)+     &XC(2))      FVECC(9)=((XC(1)-0.37D0)*XC(3)+(XC(1)-0.37D0)*XC(2)+1.285714285714     &286D0)/(XC(3)+XC(2))      FVECC(10)=((XC(1)-0.58D0)*XC(3)+(XC(1)-0.58D0)*XC(2)+1.66666666666     &6667D0)/(XC(3)+XC(2))      FVECC(11)=((XC(1)-0.73D0)*XC(3)+(XC(1)-0.73D0)*XC(2)+2.2D0)/(XC(3)     &+XC(2))      FVECC(12)=((XC(1)-0.96D0)*XC(3)+(XC(1)-0.96D0)*XC(2)+3.0D0)/(XC(3)     &+XC(2))      FVECC(13)=((XC(1)-1.34D0)*XC(3)+(XC(1)-1.34D0)*XC(2)+4.33333333333     &3333D0)/(XC(3)+XC(2))      FVECC(14)=((XC(1)-2.1D0)*XC(3)+(XC(1)-2.1D0)*XC(2)+7.0D0)/(XC(3)+X     &C(2))      FVECC(15)=((XC(1)-4.39D0)*XC(3)+(XC(1)-4.39D0)*XC(2)+15.0D0)/(XC(3     &)+XC(2))      FJACC(1,1)=1.0D0      FJACC(1,2)=-15.0D0/(XC(3)**2+30.0D0*XC(2)*XC(3)+225.0D0*XC(2)**2)      FJACC(1,3)=-1.0D0/(XC(3)**2+30.0D0*XC(2)*XC(3)+225.0D0*XC(2)**2)      FJACC(2,1)=1.0D0      FJACC(2,2)=-7.0D0/(XC(3)**2+14.0D0*XC(2)*XC(3)+49.0D0*XC(2)**2)      FJACC(2,3)=-1.0D0/(XC(3)**2+14.0D0*XC(2)*XC(3)+49.0D0*XC(2)**2)      FJACC(3,1)=1.0D0      FJACC(3,2)=((-0.1110223024625157D-15*XC(3))-4.333333333333333D0)/(     &XC(3)**2+8.666666666666666D0*XC(2)*XC(3)+18.77777777777778D0*XC(2)     &**2)      FJACC(3,3)=(0.1110223024625157D-15*XC(2)-1.0D0)/(XC(3)**2+8.666666     &666666666D0*XC(2)*XC(3)+18.77777777777778D0*XC(2)**2)      FJACC(4,1)=1.0D0      FJACC(4,2)=-3.0D0/(XC(3)**2+6.0D0*XC(2)*XC(3)+9.0D0*XC(2)**2)      FJACC(4,3)=-1.0D0/(XC(3)**2+6.0D0*XC(2)*XC(3)+9.0D0*XC(2)**2)      FJACC(5,1)=1.0D0      FJACC(5,2)=((-0.1110223024625157D-15*XC(3))-2.2D0)/(XC(3)**2+4.399     &999999999999D0*XC(2)*XC(3)+4.839999999999998D0*XC(2)**2)      FJACC(5,3)=(0.1110223024625157D-15*XC(2)-1.0D0)/(XC(3)**2+4.399999     &999999999D0*XC(2)*XC(3)+4.839999999999998D0*XC(2)**2)      FJACC(6,1)=1.0D0      FJACC(6,2)=((-0.2220446049250313D-15*XC(3))-1.666666666666667D0)/(     &XC(3)**2+3.333333333333333D0*XC(2)*XC(3)+2.777777777777777D0*XC(2)     &**2)      FJACC(6,3)=(0.2220446049250313D-15*XC(2)-1.0D0)/(XC(3)**2+3.333333     &333333333D0*XC(2)*XC(3)+2.777777777777777D0*XC(2)**2)      FJACC(7,1)=1.0D0      FJACC(7,2)=((-0.5551115123125783D-16*XC(3))-1.285714285714286D0)/(     &XC(3)**2+2.571428571428571D0*XC(2)*XC(3)+1.653061224489796D0*XC(2)     &**2)      FJACC(7,3)=(0.5551115123125783D-16*XC(2)-1.0D0)/(XC(3)**2+2.571428     &571428571D0*XC(2)*XC(3)+1.653061224489796D0*XC(2)**2)      FJACC(8,1)=1.0D0      FJACC(8,2)=-1.0D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)**2)      FJACC(8,3)=-1.0D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)**2)      FJACC(9,1)=1.0D0      FJACC(9,2)=-1.285714285714286D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)*     &*2)      FJACC(9,3)=-1.285714285714286D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)*     &*2)      FJACC(10,1)=1.0D0      FJACC(10,2)=-1.666666666666667D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)     &**2)      FJACC(10,3)=-1.666666666666667D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)     &**2)      FJACC(11,1)=1.0D0      FJACC(11,2)=-2.2D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)**2)      FJACC(11,3)=-2.2D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)**2)      FJACC(12,1)=1.0D0      FJACC(12,2)=-3.0D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)**2)      FJACC(12,3)=-3.0D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)**2)      FJACC(13,1)=1.0D0      FJACC(13,2)=-4.333333333333333D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)     &**2)      FJACC(13,3)=-4.333333333333333D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)     &**2)      FJACC(14,1)=1.0D0      FJACC(14,2)=-7.0D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)**2)      FJACC(14,3)=-7.0D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)**2)      FJACC(15,1)=1.0D0      FJACC(15,2)=-15.0D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)**2)      FJACC(15,3)=-15.0D0/(XC(3)**2+2.0D0*XC(2)*XC(3)+XC(2)**2)      RETURN      END\\end{verbatim}")) (|coerce| (($ (|Vector| (|FortranExpression| (|construct|) (|construct| (QUOTE XC)) (|MachineFloat|)))) "\\spad{coerce(f)} takes objects from the appropriate instantiation of \\spadtype{FortranExpression} and turns them into an ASP."))) 
 NIL 
 NIL 
-(-64 -2721) 
+(-64 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp1} produces Fortran for Type 1 ASPs,{} needed for various NAG routines. Type 1 ASPs take a univariate expression (in the symbol \\spad{X}) and turn it into a Fortran Function like the following:\\begin{verbatim}      DOUBLE PRECISION FUNCTION F(X)      DOUBLE PRECISION X      F=DSIN(X)      RETURN      END\\end{verbatim}")) (|coerce| (($ (|FortranExpression| (|construct| (QUOTE X)) (|construct|) (|MachineFloat|))) "\\spad{coerce(f)} takes an object from the appropriate instantiation of \\spadtype{FortranExpression} and turns it into an ASP."))) 
 NIL 
 NIL 
-(-65 -2721) 
+(-65 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp20} produces Fortran for Type 20 ASPs,{} for example:\\begin{verbatim}      SUBROUTINE QPHESS(N,NROWH,NCOLH,JTHCOL,HESS,X,HX)      DOUBLE PRECISION HX(N),X(N),HESS(NROWH,NCOLH)      INTEGER JTHCOL,N,NROWH,NCOLH      HX(1)=2.0D0*X(1)      HX(2)=2.0D0*X(2)      HX(3)=2.0D0*X(4)+2.0D0*X(3)      HX(4)=2.0D0*X(4)+2.0D0*X(3)      HX(5)=2.0D0*X(5)      HX(6)=(-2.0D0*X(7))+(-2.0D0*X(6))      HX(7)=(-2.0D0*X(7))+(-2.0D0*X(6))      RETURN      END\\end{verbatim}"))) 
 NIL 
 NIL 
-(-66 -2721) 
+(-66 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp24} produces Fortran for Type 24 ASPs which evaluate a multivariate function at a point (needed for NAG routine \\axiomOpFrom{e04jaf}{e04Package}),{} for example:\\begin{verbatim}      SUBROUTINE FUNCT1(N,XC,FC)      DOUBLE PRECISION FC,XC(N)      INTEGER N      FC=10.0D0*XC(4)**4+(-40.0D0*XC(1)*XC(4)**3)+(60.0D0*XC(1)**2+5     &.0D0)*XC(4)**2+((-10.0D0*XC(3))+(-40.0D0*XC(1)**3))*XC(4)+16.0D0*X     &C(3)**4+(-32.0D0*XC(2)*XC(3)**3)+(24.0D0*XC(2)**2+5.0D0)*XC(3)**2+     &(-8.0D0*XC(2)**3*XC(3))+XC(2)**4+100.0D0*XC(2)**2+20.0D0*XC(1)*XC(     &2)+10.0D0*XC(1)**4+XC(1)**2      RETURN      END\\end{verbatim}")) (|coerce| (($ (|FortranExpression| (|construct|) (|construct| (QUOTE XC)) (|MachineFloat|))) "\\spad{coerce(f)} takes an object from the appropriate instantiation of \\spadtype{FortranExpression} and turns it into an ASP."))) 
 NIL 
 NIL 
-(-67 -2721) 
+(-67 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp27} produces Fortran for Type 27 ASPs,{} needed for NAG routine \\axiomOpFrom{f02fjf}{f02Package} ,{}for example:\\begin{verbatim}      FUNCTION DOT(IFLAG,N,Z,W,RWORK,LRWORK,IWORK,LIWORK)      DOUBLE PRECISION W(N),Z(N),RWORK(LRWORK)      INTEGER N,LIWORK,IFLAG,LRWORK,IWORK(LIWORK)      DOT=(W(16)+(-0.5D0*W(15)))*Z(16)+((-0.5D0*W(16))+W(15)+(-0.5D0*W(1     &4)))*Z(15)+((-0.5D0*W(15))+W(14)+(-0.5D0*W(13)))*Z(14)+((-0.5D0*W(     &14))+W(13)+(-0.5D0*W(12)))*Z(13)+((-0.5D0*W(13))+W(12)+(-0.5D0*W(1     &1)))*Z(12)+((-0.5D0*W(12))+W(11)+(-0.5D0*W(10)))*Z(11)+((-0.5D0*W(     &11))+W(10)+(-0.5D0*W(9)))*Z(10)+((-0.5D0*W(10))+W(9)+(-0.5D0*W(8))     &)*Z(9)+((-0.5D0*W(9))+W(8)+(-0.5D0*W(7)))*Z(8)+((-0.5D0*W(8))+W(7)     &+(-0.5D0*W(6)))*Z(7)+((-0.5D0*W(7))+W(6)+(-0.5D0*W(5)))*Z(6)+((-0.     &5D0*W(6))+W(5)+(-0.5D0*W(4)))*Z(5)+((-0.5D0*W(5))+W(4)+(-0.5D0*W(3     &)))*Z(4)+((-0.5D0*W(4))+W(3)+(-0.5D0*W(2)))*Z(3)+((-0.5D0*W(3))+W(     &2)+(-0.5D0*W(1)))*Z(2)+((-0.5D0*W(2))+W(1))*Z(1)      RETURN      END\\end{verbatim}"))) 
 NIL 
 NIL 
-(-68 -2721) 
+(-68 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp28} produces Fortran for Type 28 ASPs,{} used in NAG routine \\axiomOpFrom{f02fjf}{f02Package},{} for example:\\begin{verbatim}      SUBROUTINE IMAGE(IFLAG,N,Z,W,RWORK,LRWORK,IWORK,LIWORK)      DOUBLE PRECISION Z(N),W(N),IWORK(LRWORK),RWORK(LRWORK)      INTEGER N,LIWORK,IFLAG,LRWORK      W(1)=0.01707454969713436D0*Z(16)+0.001747395874954051D0*Z(15)+0.00     &2106973900813502D0*Z(14)+0.002957434991769087D0*Z(13)+(-0.00700554     &0882865317D0*Z(12))+(-0.01219194009813166D0*Z(11))+0.0037230647365     &3087D0*Z(10)+0.04932374658377151D0*Z(9)+(-0.03586220812223305D0*Z(     &8))+(-0.04723268012114625D0*Z(7))+(-0.02434652144032987D0*Z(6))+0.     &2264766947290192D0*Z(5)+(-0.1385343580686922D0*Z(4))+(-0.116530050     &8238904D0*Z(3))+(-0.2803531651057233D0*Z(2))+1.019463911841327D0*Z     &(1)      W(2)=0.0227345011107737D0*Z(16)+0.008812321197398072D0*Z(15)+0.010     &94012210519586D0*Z(14)+(-0.01764072463999744D0*Z(13))+(-0.01357136     &72105995D0*Z(12))+0.00157466157362272D0*Z(11)+0.05258889186338282D     &0*Z(10)+(-0.01981532388243379D0*Z(9))+(-0.06095390688679697D0*Z(8)     &)+(-0.04153119955569051D0*Z(7))+0.2176561076571465D0*Z(6)+(-0.0532     &5555586632358D0*Z(5))+(-0.1688977368984641D0*Z(4))+(-0.32440166056     &67343D0*Z(3))+0.9128222941872173D0*Z(2)+(-0.2419652703415429D0*Z(1     &))      W(3)=0.03371198197190302D0*Z(16)+0.02021603150122265D0*Z(15)+(-0.0     &06607305534689702D0*Z(14))+(-0.03032392238968179D0*Z(13))+0.002033     &305231024948D0*Z(12)+0.05375944956767728D0*Z(11)+(-0.0163213312502     &9967D0*Z(10))+(-0.05483186562035512D0*Z(9))+(-0.04901428822579872D     &0*Z(8))+0.2091097927887612D0*Z(7)+(-0.05760560341383113D0*Z(6))+(-     &0.1236679206156403D0*Z(5))+(-0.3523683853026259D0*Z(4))+0.88929961     &32269974D0*Z(3)+(-0.2995429545781457D0*Z(2))+(-0.02986582812574917     &D0*Z(1))      W(4)=0.05141563713660119D0*Z(16)+0.005239165960779299D0*Z(15)+(-0.     &01623427735779699D0*Z(14))+(-0.01965809746040371D0*Z(13))+0.054688     &97337339577D0*Z(12)+(-0.014224695935687D0*Z(11))+(-0.0505181779315     &6355D0*Z(10))+(-0.04353074206076491D0*Z(9))+0.2012230497530726D0*Z     &(8)+(-0.06630874514535952D0*Z(7))+(-0.1280829963720053D0*Z(6))+(-0     &.305169742604165D0*Z(5))+0.8600427128450191D0*Z(4)+(-0.32415033802     &68184D0*Z(3))+(-0.09033531980693314D0*Z(2))+0.09089205517109111D0*     &Z(1)      W(5)=0.04556369767776375D0*Z(16)+(-0.001822737697581869D0*Z(15))+(     &-0.002512226501941856D0*Z(14))+0.02947046460707379D0*Z(13)+(-0.014     &45079632086177D0*Z(12))+(-0.05034242196614937D0*Z(11))+(-0.0376966     &3291725935D0*Z(10))+0.2171103102175198D0*Z(9)+(-0.0824949256021352     &4D0*Z(8))+(-0.1473995209288945D0*Z(7))+(-0.315042193418466D0*Z(6))     &+0.9591623347824002D0*Z(5)+(-0.3852396953763045D0*Z(4))+(-0.141718     &5427288274D0*Z(3))+(-0.03423495461011043D0*Z(2))+0.319820917706851     &6D0*Z(1)      W(6)=0.04015147277405744D0*Z(16)+0.01328585741341559D0*Z(15)+0.048     &26082005465965D0*Z(14)+(-0.04319641116207706D0*Z(13))+(-0.04931323     &319055762D0*Z(12))+(-0.03526886317505474D0*Z(11))+0.22295383396730     &01D0*Z(10)+(-0.07375317649315155D0*Z(9))+(-0.1589391311991561D0*Z(     &8))+(-0.328001910890377D0*Z(7))+0.952576555482747D0*Z(6)+(-0.31583     &09975786731D0*Z(5))+(-0.1846882042225383D0*Z(4))+(-0.0703762046700     &4427D0*Z(3))+0.2311852964327382D0*Z(2)+0.04254083491825025D0*Z(1)      W(7)=0.06069778964023718D0*Z(16)+0.06681263884671322D0*Z(15)+(-0.0     &2113506688615768D0*Z(14))+(-0.083996867458326D0*Z(13))+(-0.0329843     &8523869648D0*Z(12))+0.2276878326327734D0*Z(11)+(-0.067356038933017     &95D0*Z(10))+(-0.1559813965382218D0*Z(9))+(-0.3363262957694705D0*Z(     &8))+0.9442791158560948D0*Z(7)+(-0.3199955249404657D0*Z(6))+(-0.136     &2463839920727D0*Z(5))+(-0.1006185171570586D0*Z(4))+0.2057504515015     &423D0*Z(3)+(-0.02065879269286707D0*Z(2))+0.03160990266745513D0*Z(1     &)      W(8)=0.126386868896738D0*Z(16)+0.002563370039476418D0*Z(15)+(-0.05     &581757739455641D0*Z(14))+(-0.07777893205900685D0*Z(13))+0.23117338     &45834199D0*Z(12)+(-0.06031581134427592D0*Z(11))+(-0.14805474755869     &52D0*Z(10))+(-0.3364014128402243D0*Z(9))+0.9364014128402244D0*Z(8)     &+(-0.3269452524413048D0*Z(7))+(-0.1396841886557241D0*Z(6))+(-0.056     &1733845834199D0*Z(5))+0.1777789320590069D0*Z(4)+(-0.04418242260544     &359D0*Z(3))+(-0.02756337003947642D0*Z(2))+0.07361313110326199D0*Z(     &1)      W(9)=0.07361313110326199D0*Z(16)+(-0.02756337003947642D0*Z(15))+(-     &0.04418242260544359D0*Z(14))+0.1777789320590069D0*Z(13)+(-0.056173     &3845834199D0*Z(12))+(-0.1396841886557241D0*Z(11))+(-0.326945252441     &3048D0*Z(10))+0.9364014128402244D0*Z(9)+(-0.3364014128402243D0*Z(8     &))+(-0.1480547475586952D0*Z(7))+(-0.06031581134427592D0*Z(6))+0.23     &11733845834199D0*Z(5)+(-0.07777893205900685D0*Z(4))+(-0.0558175773     &9455641D0*Z(3))+0.002563370039476418D0*Z(2)+0.126386868896738D0*Z(     &1)      W(10)=0.03160990266745513D0*Z(16)+(-0.02065879269286707D0*Z(15))+0     &.2057504515015423D0*Z(14)+(-0.1006185171570586D0*Z(13))+(-0.136246     &3839920727D0*Z(12))+(-0.3199955249404657D0*Z(11))+0.94427911585609     &48D0*Z(10)+(-0.3363262957694705D0*Z(9))+(-0.1559813965382218D0*Z(8     &))+(-0.06735603893301795D0*Z(7))+0.2276878326327734D0*Z(6)+(-0.032     &98438523869648D0*Z(5))+(-0.083996867458326D0*Z(4))+(-0.02113506688     &615768D0*Z(3))+0.06681263884671322D0*Z(2)+0.06069778964023718D0*Z(     &1)      W(11)=0.04254083491825025D0*Z(16)+0.2311852964327382D0*Z(15)+(-0.0     &7037620467004427D0*Z(14))+(-0.1846882042225383D0*Z(13))+(-0.315830     &9975786731D0*Z(12))+0.952576555482747D0*Z(11)+(-0.328001910890377D     &0*Z(10))+(-0.1589391311991561D0*Z(9))+(-0.07375317649315155D0*Z(8)     &)+0.2229538339673001D0*Z(7)+(-0.03526886317505474D0*Z(6))+(-0.0493     &1323319055762D0*Z(5))+(-0.04319641116207706D0*Z(4))+0.048260820054     &65965D0*Z(3)+0.01328585741341559D0*Z(2)+0.04015147277405744D0*Z(1)      W(12)=0.3198209177068516D0*Z(16)+(-0.03423495461011043D0*Z(15))+(-     &0.1417185427288274D0*Z(14))+(-0.3852396953763045D0*Z(13))+0.959162     &3347824002D0*Z(12)+(-0.315042193418466D0*Z(11))+(-0.14739952092889     &45D0*Z(10))+(-0.08249492560213524D0*Z(9))+0.2171103102175198D0*Z(8     &)+(-0.03769663291725935D0*Z(7))+(-0.05034242196614937D0*Z(6))+(-0.     &01445079632086177D0*Z(5))+0.02947046460707379D0*Z(4)+(-0.002512226     &501941856D0*Z(3))+(-0.001822737697581869D0*Z(2))+0.045563697677763     &75D0*Z(1)      W(13)=0.09089205517109111D0*Z(16)+(-0.09033531980693314D0*Z(15))+(     &-0.3241503380268184D0*Z(14))+0.8600427128450191D0*Z(13)+(-0.305169     &742604165D0*Z(12))+(-0.1280829963720053D0*Z(11))+(-0.0663087451453     &5952D0*Z(10))+0.2012230497530726D0*Z(9)+(-0.04353074206076491D0*Z(     &8))+(-0.05051817793156355D0*Z(7))+(-0.014224695935687D0*Z(6))+0.05     &468897337339577D0*Z(5)+(-0.01965809746040371D0*Z(4))+(-0.016234277     &35779699D0*Z(3))+0.005239165960779299D0*Z(2)+0.05141563713660119D0     &*Z(1)      W(14)=(-0.02986582812574917D0*Z(16))+(-0.2995429545781457D0*Z(15))     &+0.8892996132269974D0*Z(14)+(-0.3523683853026259D0*Z(13))+(-0.1236     &679206156403D0*Z(12))+(-0.05760560341383113D0*Z(11))+0.20910979278     &87612D0*Z(10)+(-0.04901428822579872D0*Z(9))+(-0.05483186562035512D     &0*Z(8))+(-0.01632133125029967D0*Z(7))+0.05375944956767728D0*Z(6)+0     &.002033305231024948D0*Z(5)+(-0.03032392238968179D0*Z(4))+(-0.00660     &7305534689702D0*Z(3))+0.02021603150122265D0*Z(2)+0.033711981971903     &02D0*Z(1)      W(15)=(-0.2419652703415429D0*Z(16))+0.9128222941872173D0*Z(15)+(-0     &.3244016605667343D0*Z(14))+(-0.1688977368984641D0*Z(13))+(-0.05325     &555586632358D0*Z(12))+0.2176561076571465D0*Z(11)+(-0.0415311995556     &9051D0*Z(10))+(-0.06095390688679697D0*Z(9))+(-0.01981532388243379D     &0*Z(8))+0.05258889186338282D0*Z(7)+0.00157466157362272D0*Z(6)+(-0.     &0135713672105995D0*Z(5))+(-0.01764072463999744D0*Z(4))+0.010940122     &10519586D0*Z(3)+0.008812321197398072D0*Z(2)+0.0227345011107737D0*Z     &(1)      W(16)=1.019463911841327D0*Z(16)+(-0.2803531651057233D0*Z(15))+(-0.     &1165300508238904D0*Z(14))+(-0.1385343580686922D0*Z(13))+0.22647669     &47290192D0*Z(12)+(-0.02434652144032987D0*Z(11))+(-0.04723268012114     &625D0*Z(10))+(-0.03586220812223305D0*Z(9))+0.04932374658377151D0*Z     &(8)+0.00372306473653087D0*Z(7)+(-0.01219194009813166D0*Z(6))+(-0.0     &07005540882865317D0*Z(5))+0.002957434991769087D0*Z(4)+0.0021069739     &00813502D0*Z(3)+0.001747395874954051D0*Z(2)+0.01707454969713436D0*     &Z(1)      RETURN      END\\end{verbatim}"))) 
 NIL 
 NIL 
-(-69 -2721) 
+(-69 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp29} produces Fortran for Type 29 ASPs,{} needed for NAG routine \\axiomOpFrom{f02fjf}{f02Package},{} for example:\\begin{verbatim}      SUBROUTINE MONIT(ISTATE,NEXTIT,NEVALS,NEVECS,K,F,D)      DOUBLE PRECISION D(K),F(K)      INTEGER K,NEXTIT,NEVALS,NVECS,ISTATE      CALL F02FJZ(ISTATE,NEXTIT,NEVALS,NEVECS,K,F,D)      RETURN      END\\end{verbatim}")) (|outputAsFortran| (((|Void|)) "\\spad{outputAsFortran()} generates the default code for \\spadtype{ASP29}."))) 
 NIL 
 NIL 
-(-70 -2721) 
+(-70 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp30} produces Fortran for Type 30 ASPs,{} needed for NAG routine \\axiomOpFrom{f04qaf}{f04Package},{} for example:\\begin{verbatim}      SUBROUTINE APROD(MODE,M,N,X,Y,RWORK,LRWORK,IWORK,LIWORK)      DOUBLE PRECISION X(N),Y(M),RWORK(LRWORK)      INTEGER M,N,LIWORK,IFAIL,LRWORK,IWORK(LIWORK),MODE      DOUBLE PRECISION A(5,5)      EXTERNAL F06PAF      A(1,1)=1.0D0      A(1,2)=0.0D0      A(1,3)=0.0D0      A(1,4)=-1.0D0      A(1,5)=0.0D0      A(2,1)=0.0D0      A(2,2)=1.0D0      A(2,3)=0.0D0      A(2,4)=0.0D0      A(2,5)=-1.0D0      A(3,1)=0.0D0      A(3,2)=0.0D0      A(3,3)=1.0D0      A(3,4)=-1.0D0      A(3,5)=0.0D0      A(4,1)=-1.0D0      A(4,2)=0.0D0      A(4,3)=-1.0D0      A(4,4)=4.0D0      A(4,5)=-1.0D0      A(5,1)=0.0D0      A(5,2)=-1.0D0      A(5,3)=0.0D0      A(5,4)=-1.0D0      A(5,5)=4.0D0      IF(MODE.EQ.1)THEN        CALL F06PAF('N',M,N,1.0D0,A,M,X,1,1.0D0,Y,1)      ELSEIF(MODE.EQ.2)THEN        CALL F06PAF('T',M,N,1.0D0,A,M,Y,1,1.0D0,X,1)      ENDIF      RETURN      END\\end{verbatim}"))) 
 NIL 
 NIL 
-(-71 -2721) 
+(-71 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp31} produces Fortran for Type 31 ASPs,{} needed for NAG routine \\axiomOpFrom{d02ejf}{d02Package},{} for example:\\begin{verbatim}      SUBROUTINE PEDERV(X,Y,PW)      DOUBLE PRECISION X,Y(*)      DOUBLE PRECISION PW(3,3)      PW(1,1)=-0.03999999999999999D0      PW(1,2)=10000.0D0*Y(3)      PW(1,3)=10000.0D0*Y(2)      PW(2,1)=0.03999999999999999D0      PW(2,2)=(-10000.0D0*Y(3))+(-60000000.0D0*Y(2))      PW(2,3)=-10000.0D0*Y(2)      PW(3,1)=0.0D0      PW(3,2)=60000000.0D0*Y(2)      PW(3,3)=0.0D0      RETURN      END\\end{verbatim}")) (|coerce| (($ (|Vector| (|FortranExpression| (|construct| (QUOTE X)) (|construct| (QUOTE Y)) (|MachineFloat|)))) "\\spad{coerce(f)} takes objects from the appropriate instantiation of \\spadtype{FortranExpression} and turns them into an ASP."))) 
 NIL 
 NIL 
-(-72 -2721) 
+(-72 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp33} produces Fortran for Type 33 ASPs,{} needed for NAG routine \\axiomOpFrom{d02kef}{d02Package}. The code is a dummy ASP:\\begin{verbatim}      SUBROUTINE REPORT(X,V,JINT)      DOUBLE PRECISION V(3),X      INTEGER JINT      RETURN      END\\end{verbatim}")) (|outputAsFortran| (((|Void|)) "\\spad{outputAsFortran()} generates the default code for \\spadtype{ASP33}."))) 
 NIL 
 NIL 
-(-73 -2721) 
+(-73 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp34} produces Fortran for Type 34 ASPs,{} needed for NAG routine \\axiomOpFrom{f04mbf}{f04Package},{} for example:\\begin{verbatim}      SUBROUTINE MSOLVE(IFLAG,N,X,Y,RWORK,LRWORK,IWORK,LIWORK)      DOUBLE PRECISION RWORK(LRWORK),X(N),Y(N)      INTEGER I,J,N,LIWORK,IFLAG,LRWORK,IWORK(LIWORK)      DOUBLE PRECISION W1(3),W2(3),MS(3,3)      IFLAG=-1      MS(1,1)=2.0D0      MS(1,2)=1.0D0      MS(1,3)=0.0D0      MS(2,1)=1.0D0      MS(2,2)=2.0D0      MS(2,3)=1.0D0      MS(3,1)=0.0D0      MS(3,2)=1.0D0      MS(3,3)=2.0D0      CALL F04ASF(MS,N,X,N,Y,W1,W2,IFLAG)      IFLAG=-IFLAG      RETURN      END\\end{verbatim}"))) 
 NIL 
 NIL 
-(-74 -2721) 
+(-74 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp35} produces Fortran for Type 35 ASPs,{} needed for NAG routines \\axiomOpFrom{c05pbf}{c05Package},{} \\axiomOpFrom{c05pcf}{c05Package},{} for example:\\begin{verbatim}      SUBROUTINE FCN(N,X,FVEC,FJAC,LDFJAC,IFLAG)      DOUBLE PRECISION X(N),FVEC(N),FJAC(LDFJAC,N)      INTEGER LDFJAC,N,IFLAG      IF(IFLAG.EQ.1)THEN        FVEC(1)=(-1.0D0*X(2))+X(1)        FVEC(2)=(-1.0D0*X(3))+2.0D0*X(2)        FVEC(3)=3.0D0*X(3)      ELSEIF(IFLAG.EQ.2)THEN        FJAC(1,1)=1.0D0        FJAC(1,2)=-1.0D0        FJAC(1,3)=0.0D0        FJAC(2,1)=0.0D0        FJAC(2,2)=2.0D0        FJAC(2,3)=-1.0D0        FJAC(3,1)=0.0D0        FJAC(3,2)=0.0D0        FJAC(3,3)=3.0D0      ENDIF      END\\end{verbatim}")) (|coerce| (($ (|Vector| (|FortranExpression| (|construct|) (|construct| (QUOTE X)) (|MachineFloat|)))) "\\spad{coerce(f)} takes objects from the appropriate instantiation of \\spadtype{FortranExpression} and turns them into an ASP."))) 
 NIL 
 NIL 
@@ -236,55 +236,55 @@
 ((|constructor| (NIL "\\spadtype{Asp42} produces Fortran for Type 42 ASPs,{} needed for NAG routines \\axiomOpFrom{d02raf}{d02Package} and \\axiomOpFrom{d02saf}{d02Package} in particular. These ASPs are in fact three Fortran routines which return a vector of functions,{} and their derivatives \\spad{wrt} \\spad{Y}(\\spad{i}) and also a continuation parameter EPS,{} for example:\\begin{verbatim}      SUBROUTINE G(EPS,YA,YB,BC,N)      DOUBLE PRECISION EPS,YA(N),YB(N),BC(N)      INTEGER N      BC(1)=YA(1)      BC(2)=YA(2)      BC(3)=YB(2)-1.0D0      RETURN      END      SUBROUTINE JACOBG(EPS,YA,YB,AJ,BJ,N)      DOUBLE PRECISION EPS,YA(N),AJ(N,N),BJ(N,N),YB(N)      INTEGER N      AJ(1,1)=1.0D0      AJ(1,2)=0.0D0      AJ(1,3)=0.0D0      AJ(2,1)=0.0D0      AJ(2,2)=1.0D0      AJ(2,3)=0.0D0      AJ(3,1)=0.0D0      AJ(3,2)=0.0D0      AJ(3,3)=0.0D0      BJ(1,1)=0.0D0      BJ(1,2)=0.0D0      BJ(1,3)=0.0D0      BJ(2,1)=0.0D0      BJ(2,2)=0.0D0      BJ(2,3)=0.0D0      BJ(3,1)=0.0D0      BJ(3,2)=1.0D0      BJ(3,3)=0.0D0      RETURN      END      SUBROUTINE JACGEP(EPS,YA,YB,BCEP,N)      DOUBLE PRECISION EPS,YA(N),YB(N),BCEP(N)      INTEGER N      BCEP(1)=0.0D0      BCEP(2)=0.0D0      BCEP(3)=0.0D0      RETURN      END\\end{verbatim}")) (|coerce| (($ (|Vector| (|FortranExpression| (|construct| (QUOTE EPS)) (|construct| (QUOTE YA) (QUOTE YB)) (|MachineFloat|)))) "\\spad{coerce(f)} takes objects from the appropriate instantiation of \\spadtype{FortranExpression} and turns them into an ASP."))) 
 NIL 
 NIL 
-(-77 -2721) 
+(-77 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp49} produces Fortran for Type 49 ASPs,{} needed for NAG routines \\axiomOpFrom{e04dgf}{e04Package},{} \\axiomOpFrom{e04ucf}{e04Package},{} for example:\\begin{verbatim}      SUBROUTINE OBJFUN(MODE,N,X,OBJF,OBJGRD,NSTATE,IUSER,USER)      DOUBLE PRECISION X(N),OBJF,OBJGRD(N),USER(*)      INTEGER N,IUSER(*),MODE,NSTATE      OBJF=X(4)*X(9)+((-1.0D0*X(5))+X(3))*X(8)+((-1.0D0*X(3))+X(1))*X(7)     &+(-1.0D0*X(2)*X(6))      OBJGRD(1)=X(7)      OBJGRD(2)=-1.0D0*X(6)      OBJGRD(3)=X(8)+(-1.0D0*X(7))      OBJGRD(4)=X(9)      OBJGRD(5)=-1.0D0*X(8)      OBJGRD(6)=-1.0D0*X(2)      OBJGRD(7)=(-1.0D0*X(3))+X(1)      OBJGRD(8)=(-1.0D0*X(5))+X(3)      OBJGRD(9)=X(4)      RETURN      END\\end{verbatim}")) (|coerce| (($ (|FortranExpression| (|construct|) (|construct| (QUOTE X)) (|MachineFloat|))) "\\spad{coerce(f)} takes an object from the appropriate instantiation of \\spadtype{FortranExpression} and turns it into an ASP."))) 
 NIL 
 NIL 
-(-78 -2721) 
+(-78 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp4} produces Fortran for Type 4 ASPs,{} which take an expression in \\spad{X}(1) .. \\spad{X}(NDIM) and produce a real function of the form:\\begin{verbatim}      DOUBLE PRECISION FUNCTION FUNCTN(NDIM,X)      DOUBLE PRECISION X(NDIM)      INTEGER NDIM      FUNCTN=(4.0D0*X(1)*X(3)**2*DEXP(2.0D0*X(1)*X(3)))/(X(4)**2+(2.0D0*     &X(2)+2.0D0)*X(4)+X(2)**2+2.0D0*X(2)+1.0D0)      RETURN      END\\end{verbatim}")) (|coerce| (($ (|FortranExpression| (|construct|) (|construct| (QUOTE X)) (|MachineFloat|))) "\\spad{coerce(f)} takes an object from the appropriate instantiation of \\spadtype{FortranExpression} and turns it into an ASP."))) 
 NIL 
 NIL 
-(-79 -2721) 
+(-79 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp50} produces Fortran for Type 50 ASPs,{} needed for NAG routine \\axiomOpFrom{e04fdf}{e04Package},{} for example:\\begin{verbatim}      SUBROUTINE LSFUN1(M,N,XC,FVECC)      DOUBLE PRECISION FVECC(M),XC(N)      INTEGER I,M,N      FVECC(1)=((XC(1)-2.4D0)*XC(3)+(15.0D0*XC(1)-36.0D0)*XC(2)+1.0D0)/(     &XC(3)+15.0D0*XC(2))      FVECC(2)=((XC(1)-2.8D0)*XC(3)+(7.0D0*XC(1)-19.6D0)*XC(2)+1.0D0)/(X     &C(3)+7.0D0*XC(2))      FVECC(3)=((XC(1)-3.2D0)*XC(3)+(4.333333333333333D0*XC(1)-13.866666     &66666667D0)*XC(2)+1.0D0)/(XC(3)+4.333333333333333D0*XC(2))      FVECC(4)=((XC(1)-3.5D0)*XC(3)+(3.0D0*XC(1)-10.5D0)*XC(2)+1.0D0)/(X     &C(3)+3.0D0*XC(2))      FVECC(5)=((XC(1)-3.9D0)*XC(3)+(2.2D0*XC(1)-8.579999999999998D0)*XC     &(2)+1.0D0)/(XC(3)+2.2D0*XC(2))      FVECC(6)=((XC(1)-4.199999999999999D0)*XC(3)+(1.666666666666667D0*X     &C(1)-7.0D0)*XC(2)+1.0D0)/(XC(3)+1.666666666666667D0*XC(2))      FVECC(7)=((XC(1)-4.5D0)*XC(3)+(1.285714285714286D0*XC(1)-5.7857142     &85714286D0)*XC(2)+1.0D0)/(XC(3)+1.285714285714286D0*XC(2))      FVECC(8)=((XC(1)-4.899999999999999D0)*XC(3)+(XC(1)-4.8999999999999     &99D0)*XC(2)+1.0D0)/(XC(3)+XC(2))      FVECC(9)=((XC(1)-4.699999999999999D0)*XC(3)+(XC(1)-4.6999999999999     &99D0)*XC(2)+1.285714285714286D0)/(XC(3)+XC(2))      FVECC(10)=((XC(1)-6.8D0)*XC(3)+(XC(1)-6.8D0)*XC(2)+1.6666666666666     &67D0)/(XC(3)+XC(2))      FVECC(11)=((XC(1)-8.299999999999999D0)*XC(3)+(XC(1)-8.299999999999     &999D0)*XC(2)+2.2D0)/(XC(3)+XC(2))      FVECC(12)=((XC(1)-10.6D0)*XC(3)+(XC(1)-10.6D0)*XC(2)+3.0D0)/(XC(3)     &+XC(2))      FVECC(13)=((XC(1)-1.34D0)*XC(3)+(XC(1)-1.34D0)*XC(2)+4.33333333333     &3333D0)/(XC(3)+XC(2))      FVECC(14)=((XC(1)-2.1D0)*XC(3)+(XC(1)-2.1D0)*XC(2)+7.0D0)/(XC(3)+X     &C(2))      FVECC(15)=((XC(1)-4.39D0)*XC(3)+(XC(1)-4.39D0)*XC(2)+15.0D0)/(XC(3     &)+XC(2))      END\\end{verbatim}")) (|coerce| (($ (|Vector| (|FortranExpression| (|construct|) (|construct| (QUOTE XC)) (|MachineFloat|)))) "\\spad{coerce(f)} takes objects from the appropriate instantiation of \\spadtype{FortranExpression} and turns them into an ASP."))) 
 NIL 
 NIL 
-(-80 -2721) 
+(-80 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp55} produces Fortran for Type 55 ASPs,{} needed for NAG routines \\axiomOpFrom{e04dgf}{e04Package} and \\axiomOpFrom{e04ucf}{e04Package},{} for example:\\begin{verbatim}      SUBROUTINE CONFUN(MODE,NCNLN,N,NROWJ,NEEDC,X,C,CJAC,NSTATE,IUSER     &,USER)      DOUBLE PRECISION C(NCNLN),X(N),CJAC(NROWJ,N),USER(*)      INTEGER N,IUSER(*),NEEDC(NCNLN),NROWJ,MODE,NCNLN,NSTATE      IF(NEEDC(1).GT.0)THEN        C(1)=X(6)**2+X(1)**2        CJAC(1,1)=2.0D0*X(1)        CJAC(1,2)=0.0D0        CJAC(1,3)=0.0D0        CJAC(1,4)=0.0D0        CJAC(1,5)=0.0D0        CJAC(1,6)=2.0D0*X(6)      ENDIF      IF(NEEDC(2).GT.0)THEN        C(2)=X(2)**2+(-2.0D0*X(1)*X(2))+X(1)**2        CJAC(2,1)=(-2.0D0*X(2))+2.0D0*X(1)        CJAC(2,2)=2.0D0*X(2)+(-2.0D0*X(1))        CJAC(2,3)=0.0D0        CJAC(2,4)=0.0D0        CJAC(2,5)=0.0D0        CJAC(2,6)=0.0D0      ENDIF      IF(NEEDC(3).GT.0)THEN        C(3)=X(3)**2+(-2.0D0*X(1)*X(3))+X(2)**2+X(1)**2        CJAC(3,1)=(-2.0D0*X(3))+2.0D0*X(1)        CJAC(3,2)=2.0D0*X(2)        CJAC(3,3)=2.0D0*X(3)+(-2.0D0*X(1))        CJAC(3,4)=0.0D0        CJAC(3,5)=0.0D0        CJAC(3,6)=0.0D0      ENDIF      RETURN      END\\end{verbatim}")) (|coerce| (($ (|Vector| (|FortranExpression| (|construct|) (|construct| (QUOTE X)) (|MachineFloat|)))) "\\spad{coerce(f)} takes objects from the appropriate instantiation of \\spadtype{FortranExpression} and turns them into an ASP."))) 
 NIL 
 NIL 
-(-81 -2721) 
+(-81 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp6} produces Fortran for Type 6 ASPs,{} needed for NAG routines \\axiomOpFrom{c05nbf}{c05Package},{} \\axiomOpFrom{c05ncf}{c05Package}. These represent vectors of functions of \\spad{X}(\\spad{i}) and look like:\\begin{verbatim}      SUBROUTINE FCN(N,X,FVEC,IFLAG)      DOUBLE PRECISION X(N),FVEC(N)      INTEGER N,IFLAG      FVEC(1)=(-2.0D0*X(2))+(-2.0D0*X(1)**2)+3.0D0*X(1)+1.0D0      FVEC(2)=(-2.0D0*X(3))+(-2.0D0*X(2)**2)+3.0D0*X(2)+(-1.0D0*X(1))+1.     &0D0      FVEC(3)=(-2.0D0*X(4))+(-2.0D0*X(3)**2)+3.0D0*X(3)+(-1.0D0*X(2))+1.     &0D0      FVEC(4)=(-2.0D0*X(5))+(-2.0D0*X(4)**2)+3.0D0*X(4)+(-1.0D0*X(3))+1.     &0D0      FVEC(5)=(-2.0D0*X(6))+(-2.0D0*X(5)**2)+3.0D0*X(5)+(-1.0D0*X(4))+1.     &0D0      FVEC(6)=(-2.0D0*X(7))+(-2.0D0*X(6)**2)+3.0D0*X(6)+(-1.0D0*X(5))+1.     &0D0      FVEC(7)=(-2.0D0*X(8))+(-2.0D0*X(7)**2)+3.0D0*X(7)+(-1.0D0*X(6))+1.     &0D0      FVEC(8)=(-2.0D0*X(9))+(-2.0D0*X(8)**2)+3.0D0*X(8)+(-1.0D0*X(7))+1.     &0D0      FVEC(9)=(-2.0D0*X(9)**2)+3.0D0*X(9)+(-1.0D0*X(8))+1.0D0      RETURN      END\\end{verbatim}"))) 
 NIL 
 NIL 
-(-82 -2721) 
+(-82 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp73} produces Fortran for Type 73 ASPs,{} needed for NAG routine \\axiomOpFrom{d03eef}{d03Package},{} for example:\\begin{verbatim}      SUBROUTINE PDEF(X,Y,ALPHA,BETA,GAMMA,DELTA,EPSOLN,PHI,PSI)      DOUBLE PRECISION ALPHA,EPSOLN,PHI,X,Y,BETA,DELTA,GAMMA,PSI      ALPHA=DSIN(X)      BETA=Y      GAMMA=X*Y      DELTA=DCOS(X)*DSIN(Y)      EPSOLN=Y+X      PHI=X      PSI=Y      RETURN      END\\end{verbatim}")) (|coerce| (($ (|Vector| (|FortranExpression| (|construct| (QUOTE X) (QUOTE Y)) (|construct|) (|MachineFloat|)))) "\\spad{coerce(f)} takes objects from the appropriate instantiation of \\spadtype{FortranExpression} and turns them into an ASP."))) 
 NIL 
 NIL 
-(-83 -2721) 
+(-83 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp74} produces Fortran for Type 74 ASPs,{} needed for NAG routine \\axiomOpFrom{d03eef}{d03Package},{} for example:\\begin{verbatim}      SUBROUTINE BNDY(X,Y,A,B,C,IBND)      DOUBLE PRECISION A,B,C,X,Y      INTEGER IBND      IF(IBND.EQ.0)THEN        A=0.0D0        B=1.0D0        C=-1.0D0*DSIN(X)      ELSEIF(IBND.EQ.1)THEN        A=1.0D0        B=0.0D0        C=DSIN(X)*DSIN(Y)      ELSEIF(IBND.EQ.2)THEN        A=1.0D0        B=0.0D0        C=DSIN(X)*DSIN(Y)      ELSEIF(IBND.EQ.3)THEN        A=0.0D0        B=1.0D0        C=-1.0D0*DSIN(Y)      ENDIF      END\\end{verbatim}")) (|coerce| (($ (|Matrix| (|FortranExpression| (|construct| (QUOTE X) (QUOTE Y)) (|construct|) (|MachineFloat|)))) "\\spad{coerce(f)} takes objects from the appropriate instantiation of \\spadtype{FortranExpression} and turns them into an ASP."))) 
 NIL 
 NIL 
-(-84 -2721) 
+(-84 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp77} produces Fortran for Type 77 ASPs,{} needed for NAG routine \\axiomOpFrom{d02gbf}{d02Package},{} for example:\\begin{verbatim}      SUBROUTINE FCNF(X,F)      DOUBLE PRECISION X      DOUBLE PRECISION F(2,2)      F(1,1)=0.0D0      F(1,2)=1.0D0      F(2,1)=0.0D0      F(2,2)=-10.0D0      RETURN      END\\end{verbatim}")) (|coerce| (($ (|Matrix| (|FortranExpression| (|construct| (QUOTE X)) (|construct|) (|MachineFloat|)))) "\\spad{coerce(f)} takes objects from the appropriate instantiation of \\spadtype{FortranExpression} and turns them into an ASP."))) 
 NIL 
 NIL 
-(-85 -2721) 
+(-85 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp78} produces Fortran for Type 78 ASPs,{} needed for NAG routine \\axiomOpFrom{d02gbf}{d02Package},{} for example:\\begin{verbatim}      SUBROUTINE FCNG(X,G)      DOUBLE PRECISION G(*),X      G(1)=0.0D0      G(2)=0.0D0      END\\end{verbatim}")) (|coerce| (($ (|Vector| (|FortranExpression| (|construct| (QUOTE X)) (|construct|) (|MachineFloat|)))) "\\spad{coerce(f)} takes objects from the appropriate instantiation of \\spadtype{FortranExpression} and turns them into an ASP."))) 
 NIL 
 NIL 
-(-86 -2721) 
+(-86 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp7} produces Fortran for Type 7 ASPs,{} needed for NAG routines \\axiomOpFrom{d02bbf}{d02Package},{} \\axiomOpFrom{d02gaf}{d02Package}. These represent a vector of functions of the scalar \\spad{X} and the array \\spad{Z},{} and look like:\\begin{verbatim}      SUBROUTINE FCN(X,Z,F)      DOUBLE PRECISION F(*),X,Z(*)      F(1)=DTAN(Z(3))      F(2)=((-0.03199999999999999D0*DCOS(Z(3))*DTAN(Z(3)))+(-0.02D0*Z(2)     &**2))/(Z(2)*DCOS(Z(3)))      F(3)=-0.03199999999999999D0/(X*Z(2)**2)      RETURN      END\\end{verbatim}")) (|coerce| (($ (|Vector| (|FortranExpression| (|construct| (QUOTE X)) (|construct| (QUOTE Y)) (|MachineFloat|)))) "\\spad{coerce(f)} takes objects from the appropriate instantiation of \\spadtype{FortranExpression} and turns them into an ASP."))) 
 NIL 
 NIL 
-(-87 -2721) 
+(-87 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp80} produces Fortran for Type 80 ASPs,{} needed for NAG routine \\axiomOpFrom{d02kef}{d02Package},{} for example:\\begin{verbatim}      SUBROUTINE BDYVAL(XL,XR,ELAM,YL,YR)      DOUBLE PRECISION ELAM,XL,YL(3),XR,YR(3)      YL(1)=XL      YL(2)=2.0D0      YR(1)=1.0D0      YR(2)=-1.0D0*DSQRT(XR+(-1.0D0*ELAM))      RETURN      END\\end{verbatim}")) (|coerce| (($ (|Matrix| (|FortranExpression| (|construct| (QUOTE XL) (QUOTE XR) (QUOTE ELAM)) (|construct|) (|MachineFloat|)))) "\\spad{coerce(f)} takes objects from the appropriate instantiation of \\spadtype{FortranExpression} and turns them into an ASP."))) 
 NIL 
 NIL 
-(-88 -2721) 
+(-88 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp8} produces Fortran for Type 8 ASPs,{} needed for NAG routine \\axiomOpFrom{d02bbf}{d02Package}. This ASP prints intermediate values of the computed solution of an ODE and might look like:\\begin{verbatim}      SUBROUTINE OUTPUT(XSOL,Y,COUNT,M,N,RESULT,FORWRD)      DOUBLE PRECISION Y(N),RESULT(M,N),XSOL      INTEGER M,N,COUNT      LOGICAL FORWRD      DOUBLE PRECISION X02ALF,POINTS(8)      EXTERNAL X02ALF      INTEGER I      POINTS(1)=1.0D0      POINTS(2)=2.0D0      POINTS(3)=3.0D0      POINTS(4)=4.0D0      POINTS(5)=5.0D0      POINTS(6)=6.0D0      POINTS(7)=7.0D0      POINTS(8)=8.0D0      COUNT=COUNT+1      DO 25001 I=1,N        RESULT(COUNT,I)=Y(I)25001 CONTINUE      IF(COUNT.EQ.M)THEN        IF(FORWRD)THEN          XSOL=X02ALF()        ELSE          XSOL=-X02ALF()        ENDIF      ELSE        XSOL=POINTS(COUNT)      ENDIF      END\\end{verbatim}"))) 
 NIL 
 NIL 
-(-89 -2721) 
+(-89 -4146) 
 ((|constructor| (NIL "\\spadtype{Asp9} produces Fortran for Type 9 ASPs,{} needed for NAG routines \\axiomOpFrom{d02bhf}{d02Package},{} \\axiomOpFrom{d02cjf}{d02Package},{} \\axiomOpFrom{d02ejf}{d02Package}. These ASPs represent a function of a scalar \\spad{X} and a vector \\spad{Y},{} for example:\\begin{verbatim}      DOUBLE PRECISION FUNCTION G(X,Y)      DOUBLE PRECISION X,Y(*)      G=X+Y(1)      RETURN      END\\end{verbatim} If the user provides a constant value for \\spad{G},{} then extra information is added via COMMON blocks used by certain routines. This specifies that the value returned by \\spad{G} in this case is to be ignored.")) (|coerce| (($ (|FortranExpression| (|construct| (QUOTE X)) (|construct| (QUOTE Y)) (|MachineFloat|))) "\\spad{coerce(f)} takes an object from the appropriate instantiation of \\spadtype{FortranExpression} and turns it into an ASP."))) 
 NIL 
 NIL 
@@ -295,7 +295,7 @@
 (-91 S) 
 ((|constructor| (NIL "A stack represented as a flexible array.")) (|arrayStack| (($ (|List| |#1|)) "\\spad{arrayStack([x,y,...,z])} creates an array stack with first (top) element \\spad{x},{} second element \\spad{y},{}...,{}and last element \\spad{z}."))) 
 ((-4499 . T) (-4500 . T)) 
-((-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (QUOTE (-1130))) (-2816 (|HasCategory| |#1| (QUOTE (-102))) (|HasCategory| |#1| (QUOTE (-1130)))) (-2816 (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#1| (QUOTE (-102)))) 
+((-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (QUOTE (-1130))) (-3688 (|HasCategory| |#1| (QUOTE (-102))) (|HasCategory| |#1| (QUOTE (-1130)))) (-3688 (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#1| (QUOTE (-102)))) 
 (-92 S) 
 ((|constructor| (NIL "This is the category of Spad abstract syntax trees."))) 
 NIL 
@@ -343,7 +343,7 @@
 (-103 S) 
 ((|constructor| (NIL "\\spadtype{BalancedBinaryTree(S)} is the domain of balanced binary trees (bbtree). A balanced binary tree of \\spad{2**k} leaves,{} for some \\spad{k > 0},{} is symmetric,{} that is,{} the left and right subtree of each interior node have identical shape. In general,{} the left and right subtree of a given node can differ by at most leaf node.")) (|mapDown!| (($ $ |#1| (|Mapping| (|List| |#1|) |#1| |#1| |#1|)) "\\spad{mapDown!(t,p,f)} returns \\spad{t} after traversing \\spad{t} in \"preorder\" (node then left then right) fashion replacing the successive interior nodes as follows. Let \\spad{l} and \\spad{r} denote the left and right subtrees of \\spad{t}. The root value \\spad{x} of \\spad{t} is replaced by \\spad{p}. Then \\spad{f}(value \\spad{l},{} value \\spad{r},{} \\spad{p}),{} where \\spad{l} and \\spad{r} denote the left and right subtrees of \\spad{t},{} is evaluated producing two values \\spad{pl} and \\spad{pr}. Then \\spad{mapDown!(l,pl,f)} and \\spad{mapDown!(l,pr,f)} are evaluated.") (($ $ |#1| (|Mapping| |#1| |#1| |#1|)) "\\spad{mapDown!(t,p,f)} returns \\spad{t} after traversing \\spad{t} in \"preorder\" (node then left then right) fashion replacing the successive interior nodes as follows. The root value \\spad{x} is replaced by \\spad{q} \\spad{:=} \\spad{f}(\\spad{p},{}\\spad{x}). The mapDown!(\\spad{l},{}\\spad{q},{}\\spad{f}) and mapDown!(\\spad{r},{}\\spad{q},{}\\spad{f}) are evaluated for the left and right subtrees \\spad{l} and \\spad{r} of \\spad{t}.")) (|mapUp!| (($ $ $ (|Mapping| |#1| |#1| |#1| |#1| |#1|)) "\\spad{mapUp!(t,t1,f)} traverses \\spad{t} in an \"endorder\" (left then right then node) fashion returning \\spad{t} with the value at each successive interior node of \\spad{t} replaced by \\spad{f}(\\spad{l},{}\\spad{r},{}\\spad{l1},{}\\spad{r1}) where \\spad{l} and \\spad{r} are the values at the immediate left and right nodes. Values \\spad{l1} and \\spad{r1} are values at the corresponding nodes of a balanced binary tree \\spad{t1},{} of identical shape at \\spad{t}.") ((|#1| $ (|Mapping| |#1| |#1| |#1|)) "\\spad{mapUp!(t,f)} traverses balanced binary tree \\spad{t} in an \"endorder\" (left then right then node) fashion returning \\spad{t} with the value at each successive interior node of \\spad{t} replaced by \\spad{f}(\\spad{l},{}\\spad{r}) where \\spad{l} and \\spad{r} are the values at the immediate left and right nodes.")) (|setleaves!| (($ $ (|List| |#1|)) "\\spad{setleaves!(t, ls)} sets the leaves of \\spad{t} in left-to-right order to the elements of \\spad{ls}.")) (|balancedBinaryTree| (($ (|NonNegativeInteger|) |#1|) "\\spad{balancedBinaryTree(n, s)} creates a balanced binary tree with \\spad{n} nodes each with value \\spad{s}."))) 
 ((-4499 . T) (-4500 . T)) 
-((-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (QUOTE (-1130))) (-2816 (|HasCategory| |#1| (QUOTE (-102))) (|HasCategory| |#1| (QUOTE (-1130)))) (-2816 (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#1| (QUOTE (-102)))) 
+((-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (QUOTE (-1130))) (-3688 (|HasCategory| |#1| (QUOTE (-102))) (|HasCategory| |#1| (QUOTE (-1130)))) (-3688 (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#1| (QUOTE (-102)))) 
 (-104 R UP M |Row| |Col|) 
 ((|constructor| (NIL "\\spadtype{BezoutMatrix} contains functions for computing resultants and discriminants using Bezout matrices.")) (|bezoutDiscriminant| ((|#1| |#2|) "\\spad{bezoutDiscriminant(p)} computes the discriminant of a polynomial \\spad{p} by computing the determinant of a Bezout matrix.")) (|bezoutResultant| ((|#1| |#2| |#2|) "\\spad{bezoutResultant(p,q)} computes the resultant of the two polynomials \\spad{p} and \\spad{q} by computing the determinant of a Bezout matrix.")) (|bezoutMatrix| ((|#3| |#2| |#2|) "\\spad{bezoutMatrix(p,q)} returns the Bezout matrix for the two polynomials \\spad{p} and \\spad{q}.")) (|sylvesterMatrix| ((|#3| |#2| |#2|) "\\spad{sylvesterMatrix(p,q)} returns the Sylvester matrix for the two polynomials \\spad{p} and \\spad{q}."))) 
 NIL 
@@ -363,7 +363,7 @@
 (-108) 
 ((|constructor| (NIL "This domain allows rational numbers to be presented as repeating binary expansions.")) (|binary| (($ (|Fraction| (|Integer|))) "\\spad{binary(r)} converts a rational number to a binary expansion.")) (|fractionPart| (((|Fraction| (|Integer|)) $) "\\spad{fractionPart(b)} returns the fractional part of a binary expansion."))) 
 ((-4491 . T) (-4497 . T) (-4492 . T) ((-4501 "*") . T) (-4493 . T) (-4494 . T) (-4496 . T)) 
-((|HasCategory| (-577) (QUOTE (-937))) (|HasCategory| (-577) (LIST (QUOTE -1068) (QUOTE (-1206)))) (|HasCategory| (-577) (QUOTE (-146))) (|HasCategory| (-577) (QUOTE (-148))) (|HasCategory| (-577) (LIST (QUOTE -632) (QUOTE (-549)))) (|HasCategory| (-577) (QUOTE (-1052))) (|HasCategory| (-577) (QUOTE (-841))) (|HasCategory| (-577) (QUOTE (-870))) (-2816 (|HasCategory| (-577) (QUOTE (-841))) (|HasCategory| (-577) (QUOTE (-870)))) (|HasCategory| (-577) (LIST (QUOTE -1068) (QUOTE (-577)))) (|HasCategory| (-577) (QUOTE (-1182))) (|HasCategory| (-577) (LIST (QUOTE -910) (QUOTE (-391)))) (|HasCategory| (-577) (LIST (QUOTE -910) (QUOTE (-577)))) (|HasCategory| (-577) (LIST (QUOTE -632) (LIST (QUOTE -916) (QUOTE (-391))))) (|HasCategory| (-577) (LIST (QUOTE -632) (LIST (QUOTE -916) (QUOTE (-577))))) (|HasCategory| (-577) (QUOTE (-238))) (|HasCategory| (-577) (LIST (QUOTE -928) (QUOTE (-1206)))) (|HasCategory| (-577) (QUOTE (-239))) (|HasCategory| (-577) (LIST (QUOTE -926) (QUOTE (-1206)))) (|HasCategory| (-577) (LIST (QUOTE -527) (QUOTE (-1206)) (QUOTE (-577)))) (|HasCategory| (-577) (LIST (QUOTE -320) (QUOTE (-577)))) (|HasCategory| (-577) (LIST (QUOTE -297) (QUOTE (-577)) (QUOTE (-577)))) (|HasCategory| (-577) (QUOTE (-318))) (|HasCategory| (-577) (QUOTE (-558))) (|HasCategory| (-577) (LIST (QUOTE -659) (QUOTE (-577)))) (-12 (|HasCategory| $ (QUOTE (-146))) (|HasCategory| (-577) (QUOTE (-937)))) (-2816 (-12 (|HasCategory| $ (QUOTE (-146))) (|HasCategory| (-577) (QUOTE (-937)))) (|HasCategory| (-577) (QUOTE (-146))))) 
+((|HasCategory| (-577) (QUOTE (-937))) (|HasCategory| (-577) (LIST (QUOTE -1068) (QUOTE (-1206)))) (|HasCategory| (-577) (QUOTE (-146))) (|HasCategory| (-577) (QUOTE (-148))) (|HasCategory| (-577) (LIST (QUOTE -632) (QUOTE (-549)))) (|HasCategory| (-577) (QUOTE (-1052))) (|HasCategory| (-577) (QUOTE (-841))) (|HasCategory| (-577) (QUOTE (-870))) (-3688 (|HasCategory| (-577) (QUOTE (-841))) (|HasCategory| (-577) (QUOTE (-870)))) (|HasCategory| (-577) (LIST (QUOTE -1068) (QUOTE (-577)))) (|HasCategory| (-577) (QUOTE (-1182))) (|HasCategory| (-577) (LIST (QUOTE -910) (QUOTE (-391)))) (|HasCategory| (-577) (LIST (QUOTE -910) (QUOTE (-577)))) (|HasCategory| (-577) (LIST (QUOTE -632) (LIST (QUOTE -916) (QUOTE (-391))))) (|HasCategory| (-577) (LIST (QUOTE -632) (LIST (QUOTE -916) (QUOTE (-577))))) (|HasCategory| (-577) (QUOTE (-238))) (|HasCategory| (-577) (LIST (QUOTE -928) (QUOTE (-1206)))) (|HasCategory| (-577) (QUOTE (-239))) (|HasCategory| (-577) (LIST (QUOTE -926) (QUOTE (-1206)))) (|HasCategory| (-577) (LIST (QUOTE -527) (QUOTE (-1206)) (QUOTE (-577)))) (|HasCategory| (-577) (LIST (QUOTE -320) (QUOTE (-577)))) (|HasCategory| (-577) (LIST (QUOTE -297) (QUOTE (-577)) (QUOTE (-577)))) (|HasCategory| (-577) (QUOTE (-318))) (|HasCategory| (-577) (QUOTE (-558))) (|HasCategory| (-577) (LIST (QUOTE -659) (QUOTE (-577)))) (-12 (|HasCategory| $ (QUOTE (-146))) (|HasCategory| (-577) (QUOTE (-937)))) (-3688 (-12 (|HasCategory| $ (QUOTE (-146))) (|HasCategory| (-577) (QUOTE (-937)))) (|HasCategory| (-577) (QUOTE (-146))))) 
 (-109) 
 ((|constructor| (NIL "\\indented{1}{Author: Gabriel Dos Reis} Date Created: October 24,{} 2007 Date Last Modified: January 18,{} 2008. A `Binding' is a name asosciated with a collection of properties.")) (|binding| (($ (|Identifier|) (|List| (|Property|))) "\\spad{binding(n,props)} constructs a binding with name \\spad{`n'} and property list `props'.")) (|properties| (((|List| (|Property|)) $) "\\spad{properties(b)} returns the properties associated with binding \\spad{b}.")) (|name| (((|Identifier|) $) "\\spad{name(b)} returns the name of binding \\spad{b}"))) 
 NIL 
@@ -392,7 +392,7 @@
 ((|constructor| (NIL "A basic operator is an object that can be applied to a list of arguments from a set,{} the result being a kernel over that set.")) (|setProperties| (($ $ (|AssociationList| (|String|) (|None|))) "\\spad{setProperties(op, l)} sets the property list of \\spad{op} to \\spad{l}. Argument \\spad{op} is modified \"in place\",{} \\spadignore{i.e.} no copy is made.")) (|setProperty| (($ $ (|Identifier|) (|None|)) "\\spad{setProperty(op, p, v)} attaches property \\spad{p} to \\spad{op},{} and sets its value to \\spad{v}. Argument \\spad{op} is modified \"in place\",{} \\spadignore{i.e.} no copy is made.") (($ $ (|String|) (|None|)) "\\spad{setProperty(op, s, v)} attaches property \\spad{s} to \\spad{op},{} and sets its value to \\spad{v}. Argument \\spad{op} is modified \"in place\",{} \\spadignore{i.e.} no copy is made.")) (|property| (((|Maybe| (|None|)) $ (|Identifier|)) "\\spad{property(op, p)} returns the value of property \\spad{p} if it is attached to \\spad{op},{} otherwise \\spad{nothing}.") (((|Union| (|None|) "failed") $ (|String|)) "\\spad{property(op, s)} returns the value of property \\spad{s} if it is attached to \\spad{op},{} and \"failed\" otherwise.")) (|deleteProperty!| (($ $ (|Identifier|)) "\\spad{deleteProperty!(op, p)} unattaches property \\spad{p} from \\spad{op}. Argument \\spad{op} is modified \"in place\",{} \\spadignore{i.e.} no copy is made.") (($ $ (|String|)) "\\spad{deleteProperty!(op, s)} unattaches property \\spad{s} from \\spad{op}. Argument \\spad{op} is modified \"in place\",{} \\spadignore{i.e.} no copy is made.")) (|assert| (($ $ (|Identifier|)) "\\spad{assert(op, p)} attaches property \\spad{p} to \\spad{op}. Argument \\spad{op} is modified \"in place\",{} \\spadignore{i.e.} no copy is made.")) (|has?| (((|Boolean|) $ (|Identifier|)) "\\spad{has?(op,p)} tests if property \\spad{s} is attached to \\spad{op}.")) (|input| (((|Union| (|Mapping| (|InputForm|) (|List| (|InputForm|))) "failed") $) "\\spad{input(op)} returns the \"\\%input\" property of \\spad{op} if it has one attached,{} \"failed\" otherwise.") (($ $ (|Mapping| (|InputForm|) (|List| (|InputForm|)))) "\\spad{input(op, foo)} attaches foo as the \"\\%input\" property of \\spad{op}. If \\spad{op} has a \"\\%input\" property \\spad{f},{} then \\spad{op(a1,...,an)} gets converted to InputForm as \\spad{f(a1,...,an)}.")) (|display| (($ $ (|Mapping| (|OutputForm|) (|OutputForm|))) "\\spad{display(op, foo)} attaches foo as the \"\\%display\" property of \\spad{op}. If \\spad{op} has a \"\\%display\" property \\spad{f},{} then \\spad{op(a)} gets converted to OutputForm as \\spad{f(a)}. Argument \\spad{op} must be unary.") (($ $ (|Mapping| (|OutputForm|) (|List| (|OutputForm|)))) "\\spad{display(op, foo)} attaches foo as the \"\\%display\" property of \\spad{op}. If \\spad{op} has a \"\\%display\" property \\spad{f},{} then \\spad{op(a1,...,an)} gets converted to OutputForm as \\spad{f(a1,...,an)}.") (((|Union| (|Mapping| (|OutputForm|) (|List| (|OutputForm|))) "failed") $) "\\spad{display(op)} returns the \"\\%display\" property of \\spad{op} if it has one attached,{} and \"failed\" otherwise.")) (|comparison| (($ $ (|Mapping| (|Boolean|) $ $)) "\\spad{comparison(op, foo?)} attaches foo? as the \"\\%less?\" property to \\spad{op}. If op1 and op2 have the same name,{} and one of them has a \"\\%less?\" property \\spad{f},{} then \\spad{f(op1, op2)} is called to decide whether \\spad{op1 < op2}.")) (|equality| (($ $ (|Mapping| (|Boolean|) $ $)) "\\spad{equality(op, foo?)} attaches foo? as the \"\\%equal?\" property to \\spad{op}. If op1 and op2 have the same name,{} and one of them has an \"\\%equal?\" property \\spad{f},{} then \\spad{f(op1, op2)} is called to decide whether op1 and op2 should be considered equal.")) (|weight| (($ $ (|NonNegativeInteger|)) "\\spad{weight(op, n)} attaches the weight \\spad{n} to \\spad{op}.") (((|NonNegativeInteger|) $) "\\spad{weight(op)} returns the weight attached to \\spad{op}.")) (|nary?| (((|Boolean|) $) "\\spad{nary?(op)} tests if \\spad{op} has arbitrary arity.")) (|unary?| (((|Boolean|) $) "\\spad{unary?(op)} tests if \\spad{op} is unary.")) (|nullary?| (((|Boolean|) $) "\\spad{nullary?(op)} tests if \\spad{op} is nullary.")) (|operator| (($ (|Symbol|) (|Arity|)) "\\spad{operator(f, a)} makes \\spad{f} into an operator of arity \\spad{a}.") (($ (|Symbol|) (|NonNegativeInteger|)) "\\spad{operator(f, n)} makes \\spad{f} into an \\spad{n}-ary operator.") (($ (|Symbol|)) "\\spad{operator(f)} makes \\spad{f} into an operator with arbitrary arity.")) (|copy| (($ $) "\\spad{copy(op)} returns a copy of \\spad{op}.")) (|properties| (((|AssociationList| (|String|) (|None|)) $) "\\spad{properties(op)} returns the list of all the properties currently attached to \\spad{op}."))) 
 NIL 
 NIL 
-(-116 -2068 UP) 
+(-116 -2933 UP) 
 ((|constructor| (NIL "\\spadtype{BoundIntegerRoots} provides functions to find lower bounds on the integer roots of a polynomial.")) (|integerBound| (((|Integer|) |#2|) "\\spad{integerBound(p)} returns a lower bound on the negative integer roots of \\spad{p},{} and 0 if \\spad{p} has no negative integer roots."))) 
 NIL 
 NIL 
@@ -403,7 +403,7 @@
 (-118 |p|) 
 ((|constructor| (NIL "Stream-based implementation of \\spad{Qp:} numbers are represented as sum(\\spad{i} = \\spad{k}..,{} a[\\spad{i}] * p^i),{} where the a[\\spad{i}] lie in -(\\spad{p} - 1)\\spad{/2},{}...,{}(\\spad{p} - 1)\\spad{/2}."))) 
 ((-4491 . T) (-4497 . T) (-4492 . T) ((-4501 "*") . T) (-4493 . T) (-4494 . T) (-4496 . T)) 
-((|HasCategory| (-117 |#1|) (QUOTE (-937))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -1068) (QUOTE (-1206)))) (|HasCategory| (-117 |#1|) (QUOTE (-146))) (|HasCategory| (-117 |#1|) (QUOTE (-148))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -632) (QUOTE (-549)))) (|HasCategory| (-117 |#1|) (QUOTE (-1052))) (|HasCategory| (-117 |#1|) (QUOTE (-841))) (|HasCategory| (-117 |#1|) (QUOTE (-870))) (-2816 (|HasCategory| (-117 |#1|) (QUOTE (-841))) (|HasCategory| (-117 |#1|) (QUOTE (-870)))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -1068) (QUOTE (-577)))) (|HasCategory| (-117 |#1|) (QUOTE (-1182))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -910) (QUOTE (-391)))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -910) (QUOTE (-577)))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -632) (LIST (QUOTE -916) (QUOTE (-391))))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -632) (LIST (QUOTE -916) (QUOTE (-577))))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -659) (QUOTE (-577)))) (|HasCategory| (-117 |#1|) (QUOTE (-238))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -928) (QUOTE (-1206)))) (|HasCategory| (-117 |#1|) (QUOTE (-239))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -926) (QUOTE (-1206)))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -527) (QUOTE (-1206)) (LIST (QUOTE -117) (|devaluate| |#1|)))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -320) (LIST (QUOTE -117) (|devaluate| |#1|)))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -297) (LIST (QUOTE -117) (|devaluate| |#1|)) (LIST (QUOTE -117) (|devaluate| |#1|)))) (|HasCategory| (-117 |#1|) (QUOTE (-318))) (|HasCategory| (-117 |#1|) (QUOTE (-558))) (-12 (|HasCategory| $ (QUOTE (-146))) (|HasCategory| (-117 |#1|) (QUOTE (-937)))) (-2816 (-12 (|HasCategory| $ (QUOTE (-146))) (|HasCategory| (-117 |#1|) (QUOTE (-937)))) (|HasCategory| (-117 |#1|) (QUOTE (-146))))) 
+((|HasCategory| (-117 |#1|) (QUOTE (-937))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -1068) (QUOTE (-1206)))) (|HasCategory| (-117 |#1|) (QUOTE (-146))) (|HasCategory| (-117 |#1|) (QUOTE (-148))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -632) (QUOTE (-549)))) (|HasCategory| (-117 |#1|) (QUOTE (-1052))) (|HasCategory| (-117 |#1|) (QUOTE (-841))) (|HasCategory| (-117 |#1|) (QUOTE (-870))) (-3688 (|HasCategory| (-117 |#1|) (QUOTE (-841))) (|HasCategory| (-117 |#1|) (QUOTE (-870)))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -1068) (QUOTE (-577)))) (|HasCategory| (-117 |#1|) (QUOTE (-1182))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -910) (QUOTE (-391)))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -910) (QUOTE (-577)))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -632) (LIST (QUOTE -916) (QUOTE (-391))))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -632) (LIST (QUOTE -916) (QUOTE (-577))))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -659) (QUOTE (-577)))) (|HasCategory| (-117 |#1|) (QUOTE (-238))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -928) (QUOTE (-1206)))) (|HasCategory| (-117 |#1|) (QUOTE (-239))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -926) (QUOTE (-1206)))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -527) (QUOTE (-1206)) (LIST (QUOTE -117) (|devaluate| |#1|)))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -320) (LIST (QUOTE -117) (|devaluate| |#1|)))) (|HasCategory| (-117 |#1|) (LIST (QUOTE -297) (LIST (QUOTE -117) (|devaluate| |#1|)) (LIST (QUOTE -117) (|devaluate| |#1|)))) (|HasCategory| (-117 |#1|) (QUOTE (-318))) (|HasCategory| (-117 |#1|) (QUOTE (-558))) (-12 (|HasCategory| $ (QUOTE (-146))) (|HasCategory| (-117 |#1|) (QUOTE (-937)))) (-3688 (-12 (|HasCategory| $ (QUOTE (-146))) (|HasCategory| (-117 |#1|) (QUOTE (-937)))) (|HasCategory| (-117 |#1|) (QUOTE (-146))))) 
 (-119 A S) 
 ((|constructor| (NIL "A binary-recursive aggregate has 0,{} 1 or 2 children and serves as a model for a binary tree or a doubly-linked aggregate structure")) (|setright!| (($ $ $) "\\spad{setright!(a,x)} sets the right child of \\spad{t} to be \\spad{x}.")) (|setleft!| (($ $ $) "\\spad{setleft!(a,b)} sets the left child of \\axiom{a} to be \\spad{b}.")) (|setelt| (($ $ "right" $) "\\spad{setelt(a,\"right\",b)} (also written \\axiom{\\spad{b} . right \\spad{:=} \\spad{b}}) is equivalent to \\axiom{setright!(a,{}\\spad{b})}.") (($ $ "left" $) "\\spad{setelt(a,\"left\",b)} (also written \\axiom{a . left \\spad{:=} \\spad{b}}) is equivalent to \\axiom{setleft!(a,{}\\spad{b})}.")) (|right| (($ $) "\\spad{right(a)} returns the right child.")) (|elt| (($ $ "right") "\\spad{elt(a,\"right\")} (also written: \\axiom{a . right}) is equivalent to \\axiom{right(a)}.") (($ $ "left") "\\spad{elt(u,\"left\")} (also written: \\axiom{a . left}) is equivalent to \\axiom{left(a)}.")) (|left| (($ $) "\\spad{left(u)} returns the left child."))) 
 NIL 
@@ -419,7 +419,7 @@
 (-122 S) 
 ((|constructor| (NIL "BinarySearchTree(\\spad{S}) is the domain of a binary trees where elements are ordered across the tree. A binary search tree is either empty or has a value which is an \\spad{S},{} and a right and left which are both BinaryTree(\\spad{S}) Elements are ordered across the tree.")) (|split| (((|Record| (|:| |less| $) (|:| |greater| $)) |#1| $) "\\spad{split(x,b)} splits binary tree \\spad{b} into two trees,{} one with elements greater than \\spad{x},{} the other with elements less than \\spad{x}.")) (|insertRoot!| (($ |#1| $) "\\spad{insertRoot!(x,b)} inserts element \\spad{x} as a root of binary search tree \\spad{b}.")) (|insert!| (($ |#1| $) "\\spad{insert!(x,b)} inserts element \\spad{x} as leaves into binary search tree \\spad{b}.")) (|binarySearchTree| (($ (|List| |#1|)) "\\spad{binarySearchTree(l)} \\undocumented"))) 
 ((-4499 . T) (-4500 . T)) 
-((-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (QUOTE (-1130))) (-2816 (|HasCategory| |#1| (QUOTE (-102))) (|HasCategory| |#1| (QUOTE (-1130)))) (-2816 (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#1| (QUOTE (-102)))) 
+((-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (QUOTE (-1130))) (-3688 (|HasCategory| |#1| (QUOTE (-102))) (|HasCategory| |#1| (QUOTE (-1130)))) (-3688 (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#1| (QUOTE (-102)))) 
 (-123 S) 
 ((|constructor| (NIL "The bit aggregate category models aggregates representing large quantities of Boolean data.")) (|xor| (($ $ $) "\\spad{xor(a,b)} returns the logical {\\em exclusive-or} of bit aggregates \\axiom{a} and \\axiom{\\spad{b}}.")) (|nor| (($ $ $) "\\spad{nor(a,b)} returns the logical {\\em nor} of bit aggregates \\axiom{a} and \\axiom{\\spad{b}}.")) (|nand| (($ $ $) "\\spad{nand(a,b)} returns the logical {\\em nand} of bit aggregates \\axiom{a} and \\axiom{\\spad{b}}."))) 
 NIL 
@@ -439,15 +439,15 @@
 (-127 S) 
 ((|constructor| (NIL "\\spadtype{BinaryTournament(S)} is the domain of binary trees where elements are ordered down the tree. A binary search tree is either empty or is a node containing a \\spadfun{value} of type \\spad{S},{} and a \\spadfun{right} and a \\spadfun{left} which are both \\spadtype{BinaryTree(S)}")) (|insert!| (($ |#1| $) "\\spad{insert!(x,b)} inserts element \\spad{x} as leaves into binary tournament \\spad{b}.")) (|binaryTournament| (($ (|List| |#1|)) "\\spad{binaryTournament(ls)} creates a binary tournament with the elements of \\spad{ls} as values at the nodes."))) 
 ((-4499 . T) (-4500 . T)) 
-((-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (QUOTE (-1130))) (-2816 (|HasCategory| |#1| (QUOTE (-102))) (|HasCategory| |#1| (QUOTE (-1130)))) (-2816 (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#1| (QUOTE (-102)))) 
+((-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (QUOTE (-1130))) (-3688 (|HasCategory| |#1| (QUOTE (-102))) (|HasCategory| |#1| (QUOTE (-1130)))) (-3688 (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#1| (QUOTE (-102)))) 
 (-128 S) 
 ((|constructor| (NIL "\\spadtype{BinaryTree(S)} is the domain of all binary trees. A binary tree over \\spad{S} is either empty or has a \\spadfun{value} which is an \\spad{S} and a \\spadfun{right} and \\spadfun{left} which are both binary trees.")) (|binaryTree| (($ $ |#1| $) "\\spad{binaryTree(l,v,r)} creates a binary tree with value \\spad{v} with left subtree \\spad{l} and right subtree \\spad{r}.") (($ |#1|) "\\spad{binaryTree(v)} is an non-empty binary tree with value \\spad{v},{} and left and right empty."))) 
 ((-4499 . T) (-4500 . T)) 
-((-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (QUOTE (-1130))) (-2816 (|HasCategory| |#1| (QUOTE (-102))) (|HasCategory| |#1| (QUOTE (-1130)))) (-2816 (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#1| (QUOTE (-102)))) 
+((-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (QUOTE (-1130))) (-3688 (|HasCategory| |#1| (QUOTE (-102))) (|HasCategory| |#1| (QUOTE (-1130)))) (-3688 (-12 (|HasCategory| |#1| (QUOTE (-1130))) (|HasCategory| |#1| (LIST (QUOTE -320) (|devaluate| |#1|)))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| |#1| (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| |#1| (QUOTE (-102)))) 
 (-129) 
 ((|constructor| (NIL "ByteBuffer provides datatype for buffers of bytes. This domain differs from PrimitiveArray Byte in that it is not as rigid as PrimitiveArray Byte. That is,{} the typical use of ByteBuffer is to pre-allocate a vector of Byte of some capacity \\spad{`n'}. The array can then store up to \\spad{`n'} bytes. The actual interesting bytes count (the length of the buffer) is therefore different from the capacity. The length is no more than the capacity,{} but it can be set dynamically as needed. This functionality is used for example when reading bytes from input/output devices where we use buffers to transfer data in and out of the system. Note: a value of type ByteBuffer is 0-based indexed,{} as opposed \\indented{6}{Vector,{} but not unlike PrimitiveArray Byte.}")) (|finiteAggregate| ((|attribute|) "A ByteBuffer object is a finite aggregate")) (|setLength!| (((|NonNegativeInteger|) $ (|NonNegativeInteger|)) "\\spad{setLength!(buf,n)} sets the number of active bytes in the `buf'. Error if \\spad{`n'} is more than the capacity.")) (|capacity| (((|NonNegativeInteger|) $) "\\spad{capacity(buf)} returns the pre-allocated maximum size of `buf'.")) (|byteBuffer| (($ (|NonNegativeInteger|)) "\\spad{byteBuffer(n)} creates a buffer of capacity \\spad{n},{} and length 0."))) 
 ((-4500 . T) (-4499 . T)) 
-((-2816 (-12 (|HasCategory| (-130) (QUOTE (-870))) (|HasCategory| (-130) (LIST (QUOTE -320) (QUOTE (-130))))) (-12 (|HasCategory| (-130) (QUOTE (-1130))) (|HasCategory| (-130) (LIST (QUOTE -320) (QUOTE (-130)))))) (-2816 (-12 (|HasCategory| (-130) (QUOTE (-1130))) (|HasCategory| (-130) (LIST (QUOTE -320) (QUOTE (-130))))) (|HasCategory| (-130) (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| (-130) (LIST (QUOTE -632) (QUOTE (-549)))) (-2816 (|HasCategory| (-130) (QUOTE (-870))) (|HasCategory| (-130) (QUOTE (-1130)))) (|HasCategory| (-130) (QUOTE (-870))) (-2816 (|HasCategory| (-130) (QUOTE (-102))) (|HasCategory| (-130) (QUOTE (-870))) (|HasCategory| (-130) (QUOTE (-1130)))) (|HasCategory| (-577) (QUOTE (-870))) (|HasCategory| (-130) (QUOTE (-1130))) (|HasCategory| (-130) (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| (-130) (QUOTE (-102))) (-12 (|HasCategory| (-130) (QUOTE (-1130))) (|HasCategory| (-130) (LIST (QUOTE -320) (QUOTE (-130)))))) 
+((-3688 (-12 (|HasCategory| (-130) (QUOTE (-870))) (|HasCategory| (-130) (LIST (QUOTE -320) (QUOTE (-130))))) (-12 (|HasCategory| (-130) (QUOTE (-1130))) (|HasCategory| (-130) (LIST (QUOTE -320) (QUOTE (-130)))))) (-3688 (-12 (|HasCategory| (-130) (QUOTE (-1130))) (|HasCategory| (-130) (LIST (QUOTE -320) (QUOTE (-130))))) (|HasCategory| (-130) (LIST (QUOTE -631) (QUOTE (-885))))) (|HasCategory| (-130) (LIST (QUOTE -632) (QUOTE (-549)))) (-3688 (|HasCategory| (-130) (QUOTE (-870))) (|HasCategory| (-130) (QUOTE (-1130)))) (|HasCategory| (-130) (QUOTE (-870))) (-3688 (|HasCategory| (-130) (QUOTE (-102))) (|HasCategory| (-130) (QUOTE (-870))) (|HasCategory| (-130) (QUOTE (-1130)))) (|HasCategory| (-577) (QUOTE (-870))) (|HasCategory| (-130) (QUOTE (-1130))) (|HasCategory| (-130) (LIST (QUOTE -631) (QUOTE (-885)))) (|HasCategory| (-130) (QUOTE (-102))) (-12 (|HasCategory| (-130) (QUOTE (-1130))) (|HasCategory| (-130) (LIST (QUOTE -320) (QUOTE (-130)))))) 
 (-130) 
 ((|constructor| (NIL "Byte is the datatype of 8-bit sized unsigned integer values.")) (|sample| (($) "\\spad{sample} gives a sample datum of type Byte.")) (|bitior| (($ $ $) "bitor(\\spad{x},{}\\spad{y}) returns the bitwise `inclusive or' of \\spad{`x'} and \\spad{`y'}.")) (|bitand| (($ $ $) "\\spad{bitand(x,y)} returns the bitwise `and' of \\spad{`x'} and \\spad{`y'}.")) (|byte| (($ (|NonNegativeInteger|)) "\\spad{byte(x)} injects the unsigned integer value \\spad{`v'} into the Byte algebra. \\spad{`v'} must be non-negative and less than 256."))) 
 NIL 
@@ -472,11 +472,11 @@

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1723
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1723&view=rev
Author:   dos-reis
Date:     2010-07-28 10:41:18 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
	* interp/sys-globals.boot ($VariableCount): Remove.
	* interp/spad.lisp (QUOTIENT2): Remove.
	(REMAINDER2): Likewise.
	* algebra/integer.spad.pamphlet (Integer): Use builtin  %idivide.
	* algebra/si.spad.pamphlet (SingleInteger): Likewise.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/algebra/integer.spad.pamphlet
    trunk/src/algebra/si.spad.pamphlet
    trunk/src/algebra/strap/DFLOAT.lsp
    trunk/src/algebra/strap/EUCDOM-.lsp
    trunk/src/algebra/strap/FFIELDC-.lsp
    trunk/src/algebra/strap/FPS-.lsp
    trunk/src/algebra/strap/ILIST.lsp
    trunk/src/algebra/strap/INT.lsp
    trunk/src/algebra/strap/LSAGG-.lsp
    trunk/src/algebra/strap/OUTFORM.lsp
    trunk/src/algebra/strap/SINT.lsp
    trunk/src/algebra/strap/SYMBOL.lsp
    trunk/src/interp/g-opt.boot
    trunk/src/interp/g-util.boot
    trunk/src/interp/spad.lisp
    trunk/src/interp/sys-globals.boot

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/ChangeLog	2010-07-28 10:41:18 UTC (rev 1723)
@@ -1,5 +1,13 @@
-2010-07-28  Gabriel Dos Reis  <gdr@...>
+2010-07-28  Gabriel Dos Reis  <gdr@...>
 
+	* interp/sys-globals.boot ($VariableCount): Remove.
+	* interp/spad.lisp (QUOTIENT2): Remove.
+	(REMAINDER2): Likewise.
+	* algebra/integer.spad.pamphlet (Integer): Use builtin  %idivide.
+	* algebra/si.spad.pamphlet (SingleInteger): Likewise.
+
+2010-07-28  Gabriel Dos Reis  <gdr@...>
+
 	* algebra/integer.spad.pamphlet (Integer): Use builtin functions
 	%irem and %iquo.
 	* algebra/si.spad.pamphlet (SingleInteger): Likewise.

Modified: trunk/src/algebra/integer.spad.pamphlet
===================================================================
--- trunk/src/algebra/integer.spad.pamphlet	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/algebra/integer.spad.pamphlet	2010-07-28 10:41:18 UTC (rev 1723)
@@ -211,7 +211,7 @@
       odd? x == %iodd? x
       max(x,y) == %imax(x,y)
       min(x,y) == %imin(x,y)
-      divide(x,y) == DIVIDE2(x,y)$Lisp
+      divide(x,y) == %idivide(x,y)$Foreign(Builtin)
       x quo y == %iquo(x,y)
       x rem y == %irem(x,y)
       shift(x, y) == ASH(x,y)$Lisp

Modified: trunk/src/algebra/si.spad.pamphlet
===================================================================
--- trunk/src/algebra/si.spad.pamphlet	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/algebra/si.spad.pamphlet	2010-07-28 10:41:18 UTC (rev 1723)
@@ -316,7 +316,7 @@
       (%ipow(x, n)$Foreign(Builtin) pretend Integer)::%
    x quo y   == %iquo(x,y)
    x rem y   == %irem(x,y)
-   divide(x, y)   == CONS(QSQUOTIENT(x,y)$Lisp,QSREMAINDER(x,y)$Lisp)$Lisp
+   divide(x, y)   == %idivide(x,y)$Foreign(Builtin)
    gcd(x,y)  == %igcd(x,y)
    abs(x)    == %iabs x
    odd?(x)   == %iodd? x

Modified: trunk/src/algebra/strap/DFLOAT.lsp
===================================================================
--- trunk/src/algebra/strap/DFLOAT.lsp	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/algebra/strap/DFLOAT.lsp	2010-07-28 10:41:18 UTC (rev 1723)
@@ -748,7 +748,9 @@
                                             (T
                                              (SEQ
                                               (LETT |#G107|
-                                               (DIVIDE2 |s| |t|)
+                                               (MULTIPLE-VALUE-CALL
+                                                #'CONS
+                                                (TRUNCATE |s| |t|))
                                                |DFLOAT;rationalApproximation;$2NniF;87|)
                                               (LETT |q| (CAR |#G107|)
                                                |DFLOAT;rationalApproximation;$2NniF;87|)

Modified: trunk/src/algebra/strap/EUCDOM-.lsp
===================================================================
--- trunk/src/algebra/strap/EUCDOM-.lsp	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/algebra/strap/EUCDOM-.lsp	2010-07-28 10:41:18 UTC (rev 1723)
@@ -299,7 +299,7 @@
           (T (SEQ (LETT |l1| (SPADCALL |l| (|getShellEntry| $ 58))
                         |EUCDOM-;multiEuclidean;LSU;11|)
                   (LETT |l2|
-                        (SPADCALL |l1| (QUOTIENT2 |n| 2)
+                        (SPADCALL |l1| (TRUNCATE |n| 2)
                             (|getShellEntry| $ 61))
                         |EUCDOM-;multiEuclidean;LSU;11|)
                   (LETT |u|

Modified: trunk/src/algebra/strap/FFIELDC-.lsp
===================================================================
--- trunk/src/algebra/strap/FFIELDC-.lsp	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/algebra/strap/FFIELDC-.lsp	2010-07-28 10:41:18 UTC (rev 1723)
@@ -79,7 +79,7 @@
 
 (DEFUN |FFIELDC-;charthRoot;2S;6| (|x| $)
   (SPADCALL |x|
-      (QUOTIENT2 (SPADCALL (|getShellEntry| $ 40))
+      (TRUNCATE (SPADCALL (|getShellEntry| $ 40))
           (|spadConstant| $ 41))
       (|getShellEntry| $ 43))) 
 
@@ -137,7 +137,7 @@
                            (T (SETQ |equalone|
                                     (SPADCALL
                                      (SPADCALL |a|
-                                      (QUOTIENT2 |q| (CAR |exp|))
+                                      (TRUNCATE |q| (CAR |exp|))
                                       (|getShellEntry| $ 58))
                                      (|getShellEntry| $ 59)))))
                          (SETQ #0# (CDR #0#))))
@@ -161,7 +161,7 @@
                            ((ATOM #0#) (RETURN NIL))
                            (T (LET ((|rec| (CAR #0#)))
                                 (SEQ (LETT |a|
-                                      (QUOTIENT2 |ord|
+                                      (TRUNCATE |ord|
                                        (LETT |primeDivisor| (CAR |rec|)
                                         |FFIELDC-;order;SPi;10|))
                                       |FFIELDC-;order;SPi;10|)
@@ -182,7 +182,7 @@
                                            (T
                                             (SEQ (SETQ |ord| |a|)
                                              (SETQ |a|
-                                              (QUOTIENT2 |ord|
+                                              (TRUNCATE |ord|
                                                |primeDivisor|))
                                              (EXIT
                                               (SETQ |goon|
@@ -245,7 +245,7 @@
                                                       (T
                                                        (SEQ
                                                         (SETQ |exp|
-                                                         (QUOTIENT2
+                                                         (TRUNCATE
                                                           |exp| |fac|))
                                                         (LETT
                                                          |exptable|
@@ -267,7 +267,7 @@
                                                            $ 58))
                                                          |FFIELDC-;discreteLog;SNni;11|)
                                                         (LETT |end|
-                                                         (QUOTIENT2
+                                                         (TRUNCATE
                                                           (- |fac| 1)
                                                           |n|)
                                                          |FFIELDC-;discreteLog;SNni;11|)
@@ -330,7 +330,7 @@
                                                                       (SPADCALL
                                                                        |gen|
                                                                        (*
-                                                                        (QUOTIENT2
+                                                                        (TRUNCATE
                                                                          |groupord|
                                                                          |fac|)
                                                                         (-
@@ -392,13 +392,12 @@
              ((SPADCALL |b| |logbase| (|getShellEntry| $ 63))
               (CONS 0 1))
              (T (COND
-                  ((NOT (ZEROP (REMAINDER2
-                                   (LETT |groupord|
-                                    (SPADCALL |logbase|
-                                     (|getShellEntry| $ 19))
-                                    |FFIELDC-;discreteLog;2SU;12|)
-                                   (SPADCALL |b|
-                                    (|getShellEntry| $ 19)))))
+                  ((NOT (ZEROP (REM (LETT |groupord|
+                                     (SPADCALL |logbase|
+                                      (|getShellEntry| $ 19))
+                                     |FFIELDC-;discreteLog;2SU;12|)
+                                    (SPADCALL |b|
+                                     (|getShellEntry| $ 19)))))
                    (SEQ (SPADCALL
                             "discreteLog: second argument not in cyclic group generated by first argument"
                             (|getShellEntry| $ 83))
@@ -425,7 +424,7 @@
                                        |FFIELDC-;discreteLog;2SU;12|)
                                       (LETT |primroot|
                                        (SPADCALL |logbase|
-                                        (QUOTIENT2 |groupord| |fac|)
+                                        (TRUNCATE |groupord| |fac|)
                                         (|getShellEntry| $ 58))
                                        |FFIELDC-;discreteLog;2SU;12|)
                                       (EXIT
@@ -438,7 +437,7 @@
                                              (T
                                               (SEQ
                                                (SETQ |exp|
-                                                (QUOTIENT2 |exp| |fac|))
+                                                (TRUNCATE |exp| |fac|))
                                                (LETT |rhoHelp|
                                                 (SPADCALL |primroot|
                                                  (SPADCALL |a| |exp|

Modified: trunk/src/algebra/strap/FPS-.lsp
===================================================================
--- trunk/src/algebra/strap/FPS-.lsp	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/algebra/strap/FPS-.lsp	2010-07-28 10:41:18 UTC (rev 1723)
@@ -14,7 +14,7 @@
 (DEFUN |FPS-;digits;Pi;2| ($)
   (LET ((#0=#:G1402
             (MAX 1
-                 (QUOTIENT2
+                 (TRUNCATE
                      (SPADCALL 4004
                          (- (SPADCALL (|getShellEntry| $ 14)) 1)
                          (|getShellEntry| $ 16))

Modified: trunk/src/algebra/strap/ILIST.lsp
===================================================================
--- trunk/src/algebra/strap/ILIST.lsp	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/algebra/strap/ILIST.lsp	2010-07-28 10:41:18 UTC (rev 1723)
@@ -401,7 +401,7 @@
            (EXIT (COND
                    ((< |n| 3) |p|)
                    (T (SEQ (LETT |l|
-                                 (LET ((#0=#:G1511 (QUOTIENT2 |n| 2)))
+                                 (LET ((#0=#:G1511 (TRUNCATE |n| 2)))
                                    (|check-subtype| (NOT (MINUSP #0#))
                                     '(|NonNegativeInteger|) #0#))
                                  |ILIST;mergeSort|)

Modified: trunk/src/algebra/strap/INT.lsp
===================================================================
--- trunk/src/algebra/strap/INT.lsp	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/algebra/strap/INT.lsp	2010-07-28 10:41:18 UTC (rev 1723)
@@ -207,7 +207,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Pair|)
                 |INT;divide;2$R;48|)) 
 
-(PUT '|INT;divide;2$R;48| '|SPADreplace| 'DIVIDE2) 
+(PUT '|INT;divide;2$R;48| '|SPADreplace| '|%idivide|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
                 |INT;quo;3$;49|)) 
@@ -430,7 +430,7 @@
 
 (DEFUN |INT;divide;2$R;48| (|x| |y| $)
   (DECLARE (IGNORE $))
-  (DIVIDE2 |x| |y|)) 
+  (MULTIPLE-VALUE-CALL #'CONS (TRUNCATE |x| |y|))) 
 
 (DEFUN |INT;quo;3$;49| (|x| |y| $)
   (DECLARE (IGNORE $))

Modified: trunk/src/algebra/strap/LSAGG-.lsp
===================================================================
--- trunk/src/algebra/strap/LSAGG-.lsp	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/algebra/strap/LSAGG-.lsp	2010-07-28 10:41:18 UTC (rev 1723)
@@ -405,7 +405,7 @@
            (EXIT (COND
                    ((< |n| 3) |p|)
                    (T (SEQ (LETT |l|
-                                 (LET ((#0=#:G1511 (QUOTIENT2 |n| 2)))
+                                 (LET ((#0=#:G1511 (TRUNCATE |n| 2)))
                                    (|check-subtype| (NOT (MINUSP #0#))
                                     '(|NonNegativeInteger|) #0#))
                                  |LSAGG-;mergeSort|)

Modified: trunk/src/algebra/strap/OUTFORM.lsp
===================================================================
--- trunk/src/algebra/strap/OUTFORM.lsp	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/algebra/strap/OUTFORM.lsp	2010-07-28 10:41:18 UTC (rev 1723)
@@ -594,8 +594,8 @@
 
 (DEFUN |OUTFORM;center;$I$;22| (|a| |w| $)
   (|OUTFORM;hconcat;3$;48|
-      (|OUTFORM;hspace;I$;29|
-          (QUOTIENT2 (- |w| (|outformWidth| |a|)) 2) $)
+      (|OUTFORM;hspace;I$;29| (TRUNCATE (- |w| (|outformWidth| |a|)) 2)
+          $)
       |a| $)) 
 
 (DEFUN |OUTFORM;left;$I$;23| (|a| |w| $)

Modified: trunk/src/algebra/strap/SINT.lsp
===================================================================
--- trunk/src/algebra/strap/SINT.lsp	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/algebra/strap/SINT.lsp	2010-07-28 10:41:18 UTC (rev 1723)
@@ -174,6 +174,8 @@
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Pair|)
                 |SINT;divide;2$R;39|)) 
 
+(PUT '|SINT;divide;2$R;39| '|SPADreplace| '|%idivide|) 
+
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;gcd;3$;40|)) 
 
@@ -420,7 +422,8 @@
   (REM |x| |y|)) 
 
 (DEFUN |SINT;divide;2$R;39| (|x| |y| $)
-  (CONS (QSQUOTIENT |x| |y|) (QSREMAINDER |x| |y|))) 
+  (DECLARE (IGNORE $))
+  (MULTIPLE-VALUE-CALL #'CONS (TRUNCATE |x| |y|))) 
 
 (DEFUN |SINT;gcd;3$;40| (|x| |y| $)
   (DECLARE (IGNORE $))

Modified: trunk/src/algebra/strap/SYMBOL.lsp
===================================================================
--- trunk/src/algebra/strap/SYMBOL.lsp	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/algebra/strap/SYMBOL.lsp	2010-07-28 10:41:18 UTC (rev 1723)
@@ -388,7 +388,9 @@
         (LOOP
           (COND
             (NIL (RETURN NIL))
-            (T (SEQ (LETT |qr| (DIVIDE2 |n| (QCSIZE |s|))
+            (T (SEQ (LETT |qr|
+                          (MULTIPLE-VALUE-CALL #'CONS
+                              (TRUNCATE |n| (QCSIZE |s|)))
                           |SYMBOL;anyRadix|)
                     (SETQ |n| (CAR |qr|))
                     (SETQ |ns|

Modified: trunk/src/interp/g-opt.boot
===================================================================
--- trunk/src/interp/g-opt.boot	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/interp/g-opt.boot	2010-07-28 10:41:18 UTC (rev 1723)
@@ -443,7 +443,7 @@
         %beq %blt %ble %bgt %bge %bitand %bitior %bitnot %bcompl
         %icst0 %icst1
         %imul %iadd %isub %igcd %ilcm %ipow %imin %imax %ieven? %iodd? %iinc
-        %irem %iquo
+        %irem %iquo %idivide
         %feq %flt %fle %fgt %fge %fmul %fadd %fsub %fexp %fmin %fmax %float?
         %fpow %fdiv %fneg %i2f %fminval %fmaxval %fbase %fprec %ftrunc
         %nil %pair? %lconcat %llength %lfirst %lsecond %lthird

Modified: trunk/src/interp/g-util.boot
===================================================================
--- trunk/src/interp/g-util.boot	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/interp/g-util.boot	2010-07-28 10:41:18 UTC (rev 1723)
@@ -263,6 +263,10 @@
   integer? x => -x
   ['_-,x]
 
+expandIdivide ['%idivide,x,y] ==
+  ['MULTIPLE_-VALUE_-CALL,['FUNCTION,'CONS],
+    ['TRUNCATE,expandToVMForm x,expandToVMForm y]]
+
 expandIeq ['%ieq,a,b] ==
   a := expandToVMForm a
   integer? a and a = 0 => ['ZEROP,expandToVMForm b]
@@ -463,6 +467,7 @@
    ['%igt,     :function expandIgt],
    ['%ilt,     :function expandIlt],
    ['%ineg,    :function expandIneg],
+   ['%idivide, :function expandIdivide],
    ['%bitand,  :function expandBitand],
    ['%bitior,  :function expandBitior],
    ['%bitnot,  :function expandBitnot],

Modified: trunk/src/interp/spad.lisp
===================================================================
--- trunk/src/interp/spad.lisp	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/interp/spad.lisp	2010-07-28 10:41:18 UTC (rev 1723)
@@ -244,20 +244,6 @@
     (sort (copy-seq seq) (function (lambda (x y) (SPADCALL X Y SPADFN)))))
 
 #-Lucid
-(defun QUOTIENT2 (X Y) (values (TRUNCATE X Y)))
-
-#+Lucid
-(defun QUOTIENT2 (X Y) ; following to force error check in division by zero
-  (values (if (zerop y) (truncate 1 Y) (TRUNCATE X Y))))
-
-#-Lucid
-(define-function 'REMAINDER2 #'REM)
-
-#+Lucid
-(defun REMAINDER2 (X Y)
-  (if (zerop y) (REM 1 Y) (REM X Y)))
-
-#-Lucid
 (defun DIVIDE2 (X Y) (multiple-value-call #'cons (TRUNCATE X Y)))
 
 #+Lucid
@@ -290,7 +276,6 @@
         |$insideCategoryIfTrue| |$insideCapsuleFunctionIfTrue| |$form|
         (|$e| |$EmptyEnvironment|)
         (|$genSDVar| 0)
-        (|$VariableCount| 0)
         (|$previousTime| (TEMPUS-FUGIT)))
     (|compileParseTree| X)))
 

Modified: trunk/src/interp/sys-globals.boot
===================================================================
--- trunk/src/interp/sys-globals.boot	2010-07-28 08:21:13 UTC (rev 1722)
+++ trunk/src/interp/sys-globals.boot	2010-07-28 10:41:18 UTC (rev 1723)
@@ -209,9 +209,6 @@
 $previousTime := 0
 
 ++
-$VariableCount := 0
-
-++
 $useBFasDefault := true
 
 ++


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1724
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1724&view=rev
Author:   dos-reis
Date:     2010-07-28 14:50:10 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
	* interp/spad.lisp (DIVIDE2): Remove.
	* interp/vmlisp.lisp (QSQUOTIENT): Likewise.
	(QSREMAINDER): Likewise.
	* interp/buildom.boot: Use quo and rem in leur of QUOTIENT and
	REMAINDER or variants.
	* interp/g-timer.boot: Likewise.
	* interp/g-util.boot: Likewise.
	* interp/htsetvar.boot: Likewise.
	* interp/i-output.boot: Likewise.
	* interp/incl.boot: Likewise.
	* interp/msgdb.boot: Likewise.
	* interp/nrungo.boot: Likewise.
	* interp/pspad1.boot: Likewise.
	* interp/topics.boot: Likewise.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/interp/buildom.boot
    trunk/src/interp/g-timer.boot
    trunk/src/interp/g-util.boot
    trunk/src/interp/htsetvar.boot
    trunk/src/interp/i-output.boot
    trunk/src/interp/incl.boot
    trunk/src/interp/msgdb.boot
    trunk/src/interp/nrungo.boot
    trunk/src/interp/nrunopt.boot
    trunk/src/interp/pspad1.boot
    trunk/src/interp/topics.boot
    trunk/src/interp/vmlisp.lisp

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-28 10:41:18 UTC (rev 1723)
+++ trunk/src/ChangeLog	2010-07-28 14:50:10 UTC (rev 1724)
@@ -1,5 +1,22 @@
 2010-07-28  Gabriel Dos Reis  <gdr@...>
 
+	* interp/spad.lisp (DIVIDE2): Remove.
+	* interp/vmlisp.lisp (QSQUOTIENT): Likewise.
+	(QSREMAINDER): Likewise.
+	* interp/buildom.boot: Use quo and rem in leur of QUOTIENT and
+	REMAINDER or variants.
+	* interp/g-timer.boot: Likewise.
+	* interp/g-util.boot: Likewise.
+	* interp/htsetvar.boot: Likewise.
+	* interp/i-output.boot: Likewise.
+	* interp/incl.boot: Likewise.
+	* interp/msgdb.boot: Likewise.
+	* interp/nrungo.boot: Likewise.
+	* interp/pspad1.boot: Likewise.
+	* interp/topics.boot: Likewise.
+
+2010-07-28  Gabriel Dos Reis  <gdr@...>
+
 	* interp/sys-globals.boot ($VariableCount): Remove.
 	* interp/spad.lisp (QUOTIENT2): Remove.
 	(REMAINDER2): Likewise.

Modified: trunk/src/interp/buildom.boot
===================================================================
--- trunk/src/interp/buildom.boot	2010-07-28 10:41:18 UTC (rev 1723)
+++ trunk/src/interp/buildom.boot	2010-07-28 14:50:10 UTC (rev 1724)
@@ -240,7 +240,7 @@
 coerceMap2E(x) ==
   -- nrlib domain
   ARRAYP rest x => ["theMap", BPINAME first x,
-    if $testingSystem then 0 else REMAINDER(HASHEQ rest x, 1000)]
+    if $testingSystem then 0 else HASHEQ(rest x) rem 1000]
   -- aldor 
   ["theMap", BPINAME first x  ]
 

Modified: trunk/src/interp/g-timer.boot
===================================================================
--- trunk/src/interp/g-timer.boot	2010-07-28 10:41:18 UTC (rev 1723)
+++ trunk/src/interp/g-timer.boot	2010-07-28 14:50:10 UTC (rev 1724)
@@ -102,8 +102,8 @@
   integer? t =>
       K := 1024
       M := K*K
-      t > 9*M => strconc(STRINGIMAGE QUOTIENT(t + 512*K,M), '"M")
-      t > 9*K => strconc(STRINGIMAGE QUOTIENT(t + 512,K),   '"K")
+      t > 9*M => strconc(STRINGIMAGE((t + 512*K) quo M), '"M")
+      t > 9*K => strconc(STRINGIMAGE((t + 512) quo K),   '"K")
       STRINGIMAGE t
   STRINGIMAGE t
  

Modified: trunk/src/interp/g-util.boot
===================================================================
--- trunk/src/interp/g-util.boot	2010-07-28 10:41:18 UTC (rev 1723)
+++ trunk/src/interp/g-util.boot	2010-07-28 14:50:10 UTC (rev 1724)
@@ -1069,7 +1069,7 @@
       t.rest := NIL
    if QSLESSP(n,3) then return p
    -- split the list p into p and q of equal length
-   l := QSQUOTIENT(n,2)
+   l := n quo 2
    t := p
    for i in 1..l-1 repeat t := rest t
    q := rest t

Modified: trunk/src/interp/htsetvar.boot
===================================================================
--- trunk/src/interp/htsetvar.boot	2010-07-28 10:41:18 UTC (rev 1723)
+++ trunk/src/interp/htsetvar.boot	2010-07-28 14:50:10 UTC (rev 1724)
@@ -60,7 +60,7 @@
   maxWidth2 := MAX(41,maxWidth2)
   tabset1 := STRINGIMAGE (maxWidth1)
   tabset2 := STRINGIMAGE (maxWidth2 + maxWidth1 - 1)
-  htSay('"\tab{2}\newline Variable\tab{",STRINGIMAGE (maxWidth1 + QUOTIENT(maxWidth2,3)),'"}Description\tab{",STRINGIMAGE(maxWidth2 + maxWidth1 + 2),'"}Value\newline\beginitems ")
+  htSay('"\tab{2}\newline Variable\tab{",STRINGIMAGE (maxWidth1 + (maxWidth2 quo 3)),'"}Description\tab{",STRINGIMAGE(maxWidth2 + maxWidth1 + 2),'"}Value\newline\beginitems ")
   for setData in reverse okList repeat
       htSay '"\item"
       label := strconc('"\menuitemstyle{",setData.setName,'"}")

Modified: trunk/src/interp/i-output.boot
===================================================================
--- trunk/src/interp/i-output.boot	2010-07-28 10:41:18 UTC (rev 1723)
+++ trunk/src/interp/i-output.boot	2010-07-28 14:50:10 UTC (rev 1724)
@@ -1318,7 +1318,7 @@
   MAX(kindWidth,WIDTH bot,(top => WIDTH top; 0)) + 2 + WIDTH arg
 
 half x ==>
-  QUOTIENT(x, 2)
+  x quo 2
 
 bigopAppAux(bot,top,arg,x,y,d,kind) ==
   botWidth := (bot => WIDTH bot; 0)
@@ -1404,7 +1404,7 @@
 overlabelApp([.,a,b], x, y, d) ==
   underApp:= APP(b,x,y,d)
   endPoint := x + WIDTH b - 1
-  middle := QUOTIENT(x + endPoint,2)
+  middle := (x + endPoint) quo 2
   h := y + superspan b + 1
   d := APP(a,middle,h + 1,d)
   apphor(x,x+WIDTH b-1,y+superspan b+1,d,"|")
@@ -2051,12 +2051,12 @@
   -- not possible, expressions are offset to the right rather than left.
   -- MCD 16-8-95
   w := WIDTH u
-  tempx := x + QUOTIENT(1+w - WIDTH second rest u, 2)
+  tempx := x + (1+w - WIDTH second rest u) quo 2
   tempy := y - superspan second rest u - 1
   temparg3 := APP(second rest u, tempx, tempy, d)
   temparg4 := apphor(x, x + w - 1, y, temparg3,specialChar('hbar))
   APP(second u,
-        x + QUOTIENT(1+w - WIDTH second u, 2),
+        x + (1+w - WIDTH second u) quo 2,
           y + 1 + subspan second u,
             temparg4)
 
@@ -2192,10 +2192,10 @@
 
 zagApp(u, x, y, d) ==
     w := WIDTH u
-    denx := x + QUOTIENT(w - WIDTH second rest u, 2)
+    denx := x + (w - WIDTH second rest u) quo 2
     deny := y - superspan second rest u - 1
     d    := APP(second rest u, denx, deny, d)
-    numx := x + QUOTIENT(w - WIDTH second u, 2)
+    numx := x + (w - WIDTH second u) quo 2
     numy := y+1 + subspan second u
     d    := APP(second u, numx, numy, d)
     a := 1 + zagSuper u
@@ -2263,7 +2263,7 @@
                      rows := rest rows
                      return(flag  := '"ON"; nil)
             d := APP(first row,
-                     xc + QUOTIENT(first w - WIDTH first row, 2),
+                     xc + (first w - WIDTH first row) quo 2,
                      yc,
                      d)
             xc := xc + 2 + first w
@@ -2271,11 +2271,11 @@
             w := rest w
 
 matSuper(x) ==
-  (x := x.1) => -1 + QUOTIENT(first x.1 + first x.2, 2)
+  (x := x.1) => -1 + (first x.1 + first x.2) quo 2
   true => ERROR('MAT)
 
 matSub(x) ==
-  (x := x.1) => QUOTIENT(-1 + first x.1 + first x.2, 2)
+  (x := x.1) => (-1 + first x.1 + first x.2) quo 2
   true => ERROR('MAT)
 
 matWidth(x) ==
@@ -2522,7 +2522,7 @@
   y := y + superspan u.1 + 1
   for a in rest u repeat
       y := y - superspan a - 1
-      xoff := QUOTIENT(w - WIDTH a, 2)
+      xoff := (w - WIDTH a) quo 2
       d := APP(a, x + xoff, y, d)
       y := y - subspan a
   d
@@ -2533,10 +2533,10 @@
   d := APP('"(",x,y,d)
   x := x + 1
   y1 := y - height a
-  xoff := QUOTIENT(w - WIDTH a, 2)
+  xoff := (w - WIDTH a) quo 2
   d := APP(a, x + xoff, y1, d)
   y2 := y + height b
-  xoff := QUOTIENT(w - WIDTH b, 2)
+  xoff := (w - WIDTH b) quo 2
   d := APP(b, x + xoff, y2, d)
   x := x + w
   APP('")",x,y,d)

Modified: trunk/src/interp/incl.boot
===================================================================
--- trunk/src/interp/incl.boot	2010-07-28 10:41:18 UTC (rev 1723)
+++ trunk/src/interp/incl.boot	2010-07-28 14:50:10 UTC (rev 1724)
@@ -53,13 +53,13 @@
 ElseSkipToEnd   == 30
 ElseKeepPart    == 31
  
-Top?     (st) == QUOTIENT(st,10) = 0
-If?      (st) == QUOTIENT(st,10) = 1
-Elseif?  (st) == QUOTIENT(st,10) = 2
-Else?    (st) == QUOTIENT(st,10) = 3
-SkipEnd? (st) == REMAINDER(st,10) = 0
-KeepPart?(st) == REMAINDER(st,10) = 1
-SkipPart?(st) == REMAINDER(st,10) = 2
+Top?     (st) == st quo 10 = 0
+If?      (st) == st quo 10 = 1
+Elseif?  (st) == st quo 10 = 2
+Else?    (st) == st quo 10 = 3
+SkipEnd? (st) == st rem 10 = 0
+KeepPart?(st) == st rem 10 = 1
+SkipPart?(st) == st rem 10 = 2
 Skipping?(st) == not KeepPart? st
  
 incStringStream s==

Modified: trunk/src/interp/msgdb.boot
===================================================================
--- trunk/src/interp/msgdb.boot	2010-07-28 10:41:18 UTC (rev 1723)
+++ trunk/src/interp/msgdb.boot	2010-07-28 14:50:10 UTC (rev 1724)
@@ -864,17 +864,17 @@
     NIL
   w := MIN(m + 3,$LINELENGTH)
   -- p is the number of elements per line
-  p := QUOTIENT($LINELENGTH,w)
+  p := $LINELENGTH quo w
   n := # l
   str := '""
   for i in 0..(n-1) repeat
     [c,:l] := l
     str := strconc(str,c,fillerSpaces(w - #c,'" "))
-    REMAINDER(i+1,p) = 0 => (sayMSG str ; str := '"" )
+    (i+1) rem p = 0 => (sayMSG str ; str := '"" )
   if str ~= '"" then sayMSG str
   NIL
 
-say2PerLine l == say2PerLineWidth(l, QUOTIENT($LINELENGTH,2))
+say2PerLine l == say2PerLineWidth(l, $LINELENGTH quo 2)
 
 say2PerLineWidth(l,n) ==
   [short,long] := say2Split(l,nil,nil,n)
@@ -907,7 +907,7 @@
   while l repeat
     sayBrightlyNT first l
     sayBrightlyNT
-      fillerSpaces((QUOTIENT($LINELENGTH,2)-sayDisplayWidth first l),'" ")
+      fillerSpaces(($LINELENGTH quo 2 - sayDisplayWidth first l),'" ")
     (l:= rest l) =>
       sayBrightlyNT first l
       l:= rest l
@@ -938,7 +938,7 @@
     ppPair(abb,name)
     if canFit2ndEntry(name,al) then
       [[abb,:name],:al]:= al
-      TAB QUOTIENT($LINELENGTH,2)
+      TAB($LINELENGTH quo 2)
       ppPair(abb,name)
     sayNewLine()
   nil
@@ -947,7 +947,7 @@
     sayBrightlyNT [:bright abb,fillerSpaces(8-entryWidth abb," "),name]
 
 canFit2ndEntry(name,al) ==
-  wid := QUOTIENT($LINELENGTH,2) - 10
+  wid := $LINELENGTH quo 2 - 10
   null al => nil
   entryWidth name > wid => nil
   entryWidth CDAR al > wid => nil

Modified: trunk/src/interp/nrungo.boot
===================================================================
--- trunk/src/interp/nrungo.boot	2010-07-28 10:41:18 UTC (rev 1723)
+++ trunk/src/interp/nrungo.boot	2010-07-28 14:50:10 UTC (rev 1724)
@@ -104,12 +104,12 @@
   [:arglist,env] := l
   arglist is ['goGet,:.] => stop()
   [[.,[op,initSig,:code]],thisDomain] := env
-  domainSlot := QSQUOTIENT(code,8192)
-  code1 := QSREMAINDER(code,8192)
+  domainSlot := code quo 8192
+  code1 := code rem 8192
   if QSODDP code1 then isConstant := true
-  code2 := QSQUOTIENT(code1,2)
+  code2 := code1 quo 2
   if QSODDP code2 then explicitLookupDomainIfTrue := true
-  index := QSQUOTIENT(code2,2)
+  index := code2 quo 2
   kind := (isConstant = true => 'CONST; 'ELT)
   sig := [NRTreplaceLocalTypes(s,thisDomain) for s in initSig]
   sig := substDomainArgs(thisDomain,sig)
@@ -157,10 +157,10 @@
                EQSUBSTLIST(rest(domain.0),$FormalMapVariableList,a)
             someMatch:=true
             false
-      predIndex := QSQUOTIENT(code,8192)
+      predIndex := code quo 8192
       predIndex ~= 0 and not lookupPred($predVector.predIndex,dollar,domain)
         => false
-      loc := QSQUOTIENT(QSREMAINDER(code,8192),2)
+      loc := (code rem 8192) quo 2
       loc = 0 =>
         someMatch := true
         nil

Modified: trunk/src/interp/nrunopt.boot
===================================================================
--- trunk/src/interp/nrunopt.boot	2010-07-28 10:41:18 UTC (rev 1723)
+++ trunk/src/interp/nrunopt.boot	2010-07-28 14:50:10 UTC (rev 1724)
@@ -345,7 +345,7 @@
  
 bitsOf n ==
   n = 0 => 0
-  1 + bitsOf QUOTIENT(n,2)
+  1 + bitsOf(n quo 2)
  
 --=======================================================================
 --               Generate Slot 4 Constructor Vectors
@@ -639,7 +639,7 @@
 
 dcData1 vec ==
   n := MAXINDEX vec
-  tens := QUOTIENT(n,10)
+  tens := n quo 10
   for i in 0..tens repeat
     start := 10*i
     sayBrightlyNT rightJustifyString(STRINGIMAGE start,6)
@@ -725,7 +725,7 @@
 vectorSize(n) == 4 * (1 + n)
 
 halfWordSize(n) == 
-  n < 128 => QUOTIENT(n,2)
+  n < 128 => n quo 2
   n < 256 => n
   2 * n
 

Modified: trunk/src/interp/pspad1.boot
===================================================================
--- trunk/src/interp/pspad1.boot	2010-07-28 10:41:18 UTC (rev 1723)
+++ trunk/src/interp/pspad1.boot	2010-07-28 14:50:10 UTC (rev 1724)
@@ -178,7 +178,7 @@
     $autoLine =>
                    --is true except within try
       formatOutput reverse $lineFragmentBuffer
-      $c:= REMAINDER($m+2*($numberOfSpills:= $numberOfSpills+1), $lineLength)
+      $c:= ($m+2*($numberOfSpills:= $numberOfSpills+1)) rem $lineLength
       $lineFragmentBuffer:= [nBlanks $c]
       consBuffer item
     nil

Modified: trunk/src/interp/topics.boot
===================================================================
--- trunk/src/interp/topics.boot	2010-07-28 10:41:18 UTC (rev 1723)
+++ trunk/src/interp/topics.boot	2010-07-28 14:50:10 UTC (rev 1724)
@@ -221,7 +221,7 @@
 
 code2Classes cc ==
   cc := 2*cc
-  [x while cc ~= 0 for x in $topicClasses | ODDP (cc := QUOTIENT(cc,2))]
+  [x while cc ~= 0 for x in $topicClasses | ODDP (cc := cc quo 2)]
   
 myLastAtom x == 
   while x is [.,:x] repeat nil

Modified: trunk/src/interp/vmlisp.lisp
===================================================================
--- trunk/src/interp/vmlisp.lisp	2010-07-28 10:41:18 UTC (rev 1723)
+++ trunk/src/interp/vmlisp.lisp	2010-07-28 14:50:10 UTC (rev 1724)
@@ -778,11 +778,6 @@
       (multiple-value-list (truncate x y))
       (list (QUOTIENT x y) (REMAINDER x y))))
 
-(defun QSQUOTIENT (a b) (the fixnum (truncate (the fixnum a) (the fixnum b))))
-
-(defun QSREMAINDER (a b) (the fixnum (rem (the fixnum a) (the fixnum b))))
-
-
 ; 13.3 Updating
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1725
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1725&view=rev
Author:   dos-reis
Date:     2010-07-29 08:37:00 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
	* interp/c-util.boot (removeToplevelRETURN_-FROM): New.
	(transformToBackendCode): Use it to clean function body.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/interp/c-util.boot

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-28 14:50:10 UTC (rev 1724)
+++ trunk/src/ChangeLog	2010-07-29 08:37:00 UTC (rev 1725)
@@ -1,3 +1,8 @@
+2010-07-29  Gabriel Dos Reis  <gdr@...>
+
+	* interp/c-util.boot (removeToplevelRETURN_-FROM): New.
+	(transformToBackendCode): Use it to clean function body.
+
 2010-07-28  Gabriel Dos Reis  <gdr@...>
 
 	* interp/spad.lisp (DIVIDE2): Remove.

Modified: trunk/src/interp/c-util.boot
===================================================================
--- trunk/src/interp/c-util.boot	2010-07-28 14:50:10 UTC (rev 1724)
+++ trunk/src/interp/c-util.boot	2010-07-29 08:37:00 UTC (rev 1725)
@@ -1603,6 +1603,16 @@
   form is ['BLOCK,=nil,:.] => false
   or/[needsPROG? x for x in form]
 
+++ We are processing the complete `body' of a function definition.
+++ If this body is a multiway test, there is no need to have
+++ a RETURN-FROM operator in the immediate consequence of a branch.
+removeToplevelRETURN_-FROM body ==
+  if body is [['COND,:stmts]] then
+    for stmt in stmts repeat
+      stmt is [.,['RETURN_-FROM,.,expr]] =>
+        second(stmt) := expr
+  body
+
 ++ Generate Lisp code by lowering middle end defining form `x'.
 ++ x has the strucrure: <name, parms, stmt1, ...>
 transformToBackendCode: %Form -> %Code
@@ -1635,7 +1645,7 @@
       [declareGlobalVariables fluids,:body]
     lvars ~= nil or needsPROG? body =>
       [["PROG",lvars,["RETURN",:body]]]
-    body
+    removeToplevelRETURN_-FROM body
   -- add reference parameters to the list of special variables.
   fluids := S_+(backendFluidize second x, $SpecialVars)
   lastdecl := lastDeclarationNode rest x


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1727
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1727&view=rev
Author:   dos-reis
Date:     2010-07-29 15:43:35 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
	* algebra/sf.spad.pamphlet (DoubleFloat): Use builtin
	trigonometric functions.
	* interp/g-opt.boot ($VMsideEffectFreeOperators): Include them.
	* interp/g-util.boot: Expand them.
	* include/edible.H1: Move declarations to clef/edible.c.  Remove.
	* driver/utils.h: Give G linkage to declarations.
	* sman/Makefile.in: Link programs against C++ runtime.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/algebra/sf.spad.pamphlet
    trunk/src/algebra/strap/DFLOAT.lsp
    trunk/src/clef/edible.c
    trunk/src/driver/utils.h
    trunk/src/interp/g-opt.boot
    trunk/src/interp/g-util.boot
    trunk/src/sman/Makefile.in

Removed Paths:
-------------
    trunk/src/include/edible.H1

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-29 08:53:43 UTC (rev 1726)
+++ trunk/src/ChangeLog	2010-07-29 15:43:35 UTC (rev 1727)
@@ -1,5 +1,15 @@
 2010-07-29  Gabriel Dos Reis  <gdr@...>
 
+	* algebra/sf.spad.pamphlet (DoubleFloat): Use builtin
+	trigonometric functions.
+	* interp/g-opt.boot ($VMsideEffectFreeOperators): Include them.
+	* interp/g-util.boot: Expand them.
+	* include/edible.H1: Move declarations to clef/edible.c.  Remove.
+	* driver/utils.h: Give G linkage to declarations.
+	* sman/Makefile.in: Link programs against C++ runtime.
+
+2010-07-29  Gabriel Dos Reis  <gdr@...>
+
 	* driver/main.c (main): Add explicit conversion to
 	openaxiom_spawn_flags. 
 	* driver/utils.c (openaxiom_execute_core): The system want the

Modified: trunk/src/algebra/sf.spad.pamphlet
===================================================================
--- trunk/src/algebra/sf.spad.pamphlet	2010-07-29 08:53:43 UTC (rev 1726)
+++ trunk/src/algebra/sf.spad.pamphlet	2010-07-29 15:43:35 UTC (rev 1727)
@@ -279,6 +279,7 @@
 
  == add
    MER ==> Record(MANTISSA:Integer,EXPONENT:Integer)
+   import %hash: % -> SingleInteger     from Foreign Builtin
    import %fminval: () -> %             from Foreign Builtin
    import %fmaxval: () -> %             from Foreign Builtin
    import %fbase: () -> PositiveInteger from Foreign Builtin
@@ -298,6 +299,22 @@
    import %fle: (%,%) -> Boolean        from Foreign Builtin
    import %fgt: (%,%) -> Boolean        from Foreign Builtin
    import %fge: (%,%) -> Boolean        from Foreign Builtin
+   import %fsin: % -> %                 from Foreign Builtin
+   import %fcos: % -> %                 from Foreign Builtin
+   import %ftan: % -> %                 from Foreign Builtin
+   import %fcot: % -> %                 from Foreign Builtin
+   import %fsec: % -> %                 from Foreign Builtin
+   import %fcsc: % -> %                 from Foreign Builtin
+   import %fatan: % -> %                from Foreign Builtin
+   import %facot: % -> %                from Foreign Builtin
+   import %fsinh: % -> %                from Foreign Builtin
+   import %fcosh: % -> %                from Foreign Builtin
+   import %ftanh: % -> %                from Foreign Builtin
+   import %fcsch: % -> %                from Foreign Builtin
+   import %fcoth: % -> %                from Foreign Builtin
+   import %fsech: % -> %                from Foreign Builtin
+   import %fasinh: % -> %               from Foreign Builtin
+   import %facsch: % -> %               from Foreign Builtin
 
    manexp: % -> MER
 
@@ -381,35 +398,35 @@
    exp x            == EXP(x)$Lisp
    log x            == checkComplex LN(x)$Lisp
    log2 x           == checkComplex LOG2(x)$Lisp
-   sin x            == SIN(x)$Lisp
-   cos x            == COS(x)$Lisp
-   tan x            == TAN(x)$Lisp
-   cot x            == COT(x)$Lisp
-   sec x            == SEC(x)$Lisp
-   csc x            == CSC(x)$Lisp
+   sin x            == %fsin x
+   cos x            == %fcos x
+   tan x            == %ftan x
+   cot x            == %fcot x
+   sec x            == %fsec x
+   csc x            == %fcsc x
    asin x           == checkComplex ASIN(x)$Lisp -- can be complex
    acos x           == checkComplex ACOS(x)$Lisp -- can be complex
-   atan x           == ATAN(x)$Lisp
+   atan x           == %fatan x
    acsc x           == checkComplex ACSC(x)$Lisp
-   acot x           == ACOT(x)$Lisp
+   acot x           == %facot x
    asec x           == checkComplex ASEC(x)$Lisp
-   sinh x           == SINH(x)$Lisp
-   cosh x           == COSH(x)$Lisp
-   tanh x           == TANH(x)$Lisp
-   csch x           == CSCH(x)$Lisp
-   coth x           == COTH(x)$Lisp
-   sech x           == SECH(x)$Lisp
-   asinh x          == ASINH(x)$Lisp
+   sinh x           == %fsinh x
+   cosh x           == %fcosh x
+   tanh x           == %ftanh x
+   csch x           == %fcsch x
+   coth x           == %fcoth x
+   sech x           == %fsech x
+   asinh x          == %fasinh x
    acosh x          == checkComplex ACOSH(x)$Lisp -- can be complex
    atanh x          == checkComplex ATANH(x)$Lisp -- can be complex
-   acsch x          == ACSCH(x)$Lisp
+   acsch x          == %facsch x
    acoth x          == checkComplex ACOTH(x)$Lisp
    asech x          == checkComplex ASECH(x)$Lisp
    x:% / y:%        == %fdiv(x,y)
    negative? x      == x < 0
    zero? x          == x = 0
    one? x           == x = 1
-   hash x           == HASHEQ(x)$Lisp
+   hash x           == %hash x
    recip(x)         == (zero? x => "failed"; 1 / x)
    differentiate x  == 0
 

Modified: trunk/src/algebra/strap/DFLOAT.lsp
===================================================================
--- trunk/src/algebra/strap/DFLOAT.lsp	2010-07-29 08:53:43 UTC (rev 1726)
+++ trunk/src/algebra/strap/DFLOAT.lsp	2010-07-29 15:43:35 UTC (rev 1727)
@@ -184,32 +184,32 @@
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;sin;2$;41|)) 
 
-(PUT '|DFLOAT;sin;2$;41| '|SPADreplace| 'SIN) 
+(PUT '|DFLOAT;sin;2$;41| '|SPADreplace| '|%fsin|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;cos;2$;42|)) 
 
-(PUT '|DFLOAT;cos;2$;42| '|SPADreplace| 'COS) 
+(PUT '|DFLOAT;cos;2$;42| '|SPADreplace| '|%fcos|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;tan;2$;43|)) 
 
-(PUT '|DFLOAT;tan;2$;43| '|SPADreplace| 'TAN) 
+(PUT '|DFLOAT;tan;2$;43| '|SPADreplace| '|%ftan|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;cot;2$;44|)) 
 
-(PUT '|DFLOAT;cot;2$;44| '|SPADreplace| 'COT) 
+(PUT '|DFLOAT;cot;2$;44| '|SPADreplace| '|%fcot|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;sec;2$;45|)) 
 
-(PUT '|DFLOAT;sec;2$;45| '|SPADreplace| 'SEC) 
+(PUT '|DFLOAT;sec;2$;45| '|SPADreplace| '|%fsec|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;csc;2$;46|)) 
 
-(PUT '|DFLOAT;csc;2$;46| '|SPADreplace| 'CSC) 
+(PUT '|DFLOAT;csc;2$;46| '|SPADreplace| '|%fcsc|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;asin;2$;47|)) 
@@ -220,7 +220,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;atan;2$;49|)) 
 
-(PUT '|DFLOAT;atan;2$;49| '|SPADreplace| 'ATAN) 
+(PUT '|DFLOAT;atan;2$;49| '|SPADreplace| '|%fatan|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;acsc;2$;50|)) 
@@ -228,7 +228,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;acot;2$;51|)) 
 
-(PUT '|DFLOAT;acot;2$;51| '|SPADreplace| 'ACOT) 
+(PUT '|DFLOAT;acot;2$;51| '|SPADreplace| '|%facot|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;asec;2$;52|)) 
@@ -236,37 +236,37 @@
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;sinh;2$;53|)) 
 
-(PUT '|DFLOAT;sinh;2$;53| '|SPADreplace| 'SINH) 
+(PUT '|DFLOAT;sinh;2$;53| '|SPADreplace| '|%fsinh|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;cosh;2$;54|)) 
 
-(PUT '|DFLOAT;cosh;2$;54| '|SPADreplace| 'COSH) 
+(PUT '|DFLOAT;cosh;2$;54| '|SPADreplace| '|%fcosh|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;tanh;2$;55|)) 
 
-(PUT '|DFLOAT;tanh;2$;55| '|SPADreplace| 'TANH) 
+(PUT '|DFLOAT;tanh;2$;55| '|SPADreplace| '|%ftanh|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;csch;2$;56|)) 
 
-(PUT '|DFLOAT;csch;2$;56| '|SPADreplace| 'CSCH) 
+(PUT '|DFLOAT;csch;2$;56| '|SPADreplace| '|%fcsch|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;coth;2$;57|)) 
 
-(PUT '|DFLOAT;coth;2$;57| '|SPADreplace| 'COTH) 
+(PUT '|DFLOAT;coth;2$;57| '|SPADreplace| '|%fcoth|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;sech;2$;58|)) 
 
-(PUT '|DFLOAT;sech;2$;58| '|SPADreplace| 'SECH) 
+(PUT '|DFLOAT;sech;2$;58| '|SPADreplace| '|%fsech|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;asinh;2$;59|)) 
 
-(PUT '|DFLOAT;asinh;2$;59| '|SPADreplace| 'ASINH) 
+(PUT '|DFLOAT;asinh;2$;59| '|SPADreplace| '|%fasinh|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;acosh;2$;60|)) 
@@ -277,7 +277,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;acsch;2$;62|)) 
 
-(PUT '|DFLOAT;acsch;2$;62| '|SPADreplace| 'ACSCH) 
+(PUT '|DFLOAT;acsch;2$;62| '|SPADreplace| '|%facsch|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;acoth;2$;63|)) 
@@ -303,7 +303,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Short|)
                 |DFLOAT;hash;$Si;69|)) 
 
-(PUT '|DFLOAT;hash;$Si;69| '|SPADreplace| 'HASHEQ) 
+(PUT '|DFLOAT;hash;$Si;69| '|SPADreplace| '|%hash|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Pair|)
                 |DFLOAT;recip;$U;70|)) 
@@ -590,7 +590,7 @@
 
 (DEFUN |DFLOAT;one?;$B;68| (|x| $) (DECLARE (IGNORE $)) (= |x| 1.0)) 
 
-(DEFUN |DFLOAT;hash;$Si;69| (|x| $) (DECLARE (IGNORE $)) (HASHEQ |x|)) 
+(DEFUN |DFLOAT;hash;$Si;69| (|x| $) (DECLARE (IGNORE $)) (SXHASH |x|)) 
 
 (DEFUN |DFLOAT;recip;$U;70| (|x| $)
   (COND ((ZEROP |x|) (CONS 1 "failed")) (T (CONS 0 (/ 1.0 |x|))))) 

Modified: trunk/src/clef/edible.c
===================================================================
--- trunk/src/clef/edible.c	2010-07-29 08:53:43 UTC (rev 1726)
+++ trunk/src/clef/edible.c	2010-07-29 15:43:35 UTC (rev 1727)
@@ -55,7 +55,6 @@
 #include "prt.H1"
 #include "edin.H1"
 #include "wct.H1"
-#include "edible.H1"
 #include "fnct_key.H1"
 #include "cfuns.h"
 
@@ -68,7 +67,14 @@
 
 #define Cursor_shape(x) 
 
+static void check_flip(void);
+static void catch_signals(void);
+static void init_parent(void);
+static void set_function_chars(void);
+static void flip_canonical(int );
+static void flip_raw(int );
 
+
 #ifdef siglog
 int sigfile;
 char sigbuff[256];
@@ -324,7 +330,7 @@
 }
 
 
-void
+static void
 init_parent(void)
 {
   
@@ -370,7 +376,7 @@
 }
 
 
-void 
+static void 
 hangup_handler(int sig)
 {
 #ifdef siglog
@@ -392,7 +398,7 @@
   exit(-1);
 }
 
-void 
+static void 
 terminate_handler(int sig)
 {
 #ifdef siglog
@@ -414,7 +420,7 @@
   exit(0);
 }
 
-void 
+static void 
 interrupt_handler(int sig)
 {
 #ifdef siglog
@@ -426,7 +432,7 @@
   kill(child_pid, SIGINT);
 }
 
-void 
+static void 
 child_handler(int sig)
 {
 #ifdef siglog
@@ -448,7 +454,7 @@
   exit(0);
 }
 
-void 
+static void 
 alarm_handler(int sig)
 {
   int newppid = getppid();
@@ -478,7 +484,7 @@
 }
 
 /* a procedure which tells my parent how to catch signals from its children */
-void
+static void
 catch_signals(void) 
 {
 #ifdef siglog
@@ -498,7 +504,7 @@
 /* Here is where I check the child's termio settings, and try to copy them.
    I simply trace through the main modes (CLEFRAW,  CLEFCANONICAL) and
    try to simulate them */
-void 
+static void 
 check_flip(void)
 {
   return;
@@ -529,7 +535,7 @@
 
 
 
-void
+static void
 flip_raw(int chann)
 {
   
@@ -543,7 +549,7 @@
 }
 
 
-void
+static void
 flip_canonical(int chann)
 {
   if(tcsetattr(0, TCSAFLUSH, &canonbuf) == -1) {
@@ -556,22 +562,10 @@
     Cursor_shape(2);
 }
 
-void
-etc_get_next_line(char * line,int * nr,int  fd)
-{
-  *nr = read(fd, line, 1024);
-  if(*nr == -1) {
-    perror("Reading /etc/master");
-  }
-  if(*nr == 0) {
-    fprintf(stderr, "Not found \n");
-  }
-}
-
 #define etc_whitespace(c) ((c == ' ' || c == '\t')?(1):(0))
 
 
-void
+static void
 set_function_chars(void)
 {
   /* get the special characters */

Modified: trunk/src/driver/utils.h
===================================================================
--- trunk/src/driver/utils.h	2010-07-29 08:53:43 UTC (rev 1726)
+++ trunk/src/driver/utils.h	2010-07-29 15:43:35 UTC (rev 1727)
@@ -42,6 +42,10 @@
 #  include <windows.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif   
+
 /* A list of drivers for OpenAxiom.  */
 typedef enum openaxiom_driver {
    openaxiom_unknown_driver,    /* unknown driver */
@@ -81,4 +85,10 @@
 openaxiom_driver
   openaxiom_preprocess_arguments(openaxiom_command*, int, char**);
 
+
+
+#ifdef __cplusplus
+}
+#endif   
+
 #endif /* OPENAXIOM_UTILS_INCLUDED */

Deleted: trunk/src/include/edible.H1
===================================================================
--- trunk/src/include/edible.H1	2010-07-29 08:53:43 UTC (rev 1726)
+++ trunk/src/include/edible.H1	2010-07-29 15:43:35 UTC (rev 1727)
@@ -1,13 +0,0 @@
-extern void check_flip(void);
-extern int main(int  , char * []);
-extern void catch_signals(void);
-extern void init_parent(void);
-extern void set_function_chars(void);
-extern void hangup_handler(int );
-extern void terminate_handler(int );
-extern void interrupt_handler(int );
-extern void child_handler(int );
-extern void alarm_handler(int );
-extern void flip_canonical(int );
-extern void flip_raw(int );
-extern void etc_get_next_line(char *  , int *  , int );

Modified: trunk/src/interp/g-opt.boot
===================================================================
--- trunk/src/interp/g-opt.boot	2010-07-29 08:53:43 UTC (rev 1726)
+++ trunk/src/interp/g-opt.boot	2010-07-29 15:43:35 UTC (rev 1727)
@@ -446,6 +446,8 @@
         %irem %iquo %idivide
         %feq %flt %fle %fgt %fge %fmul %fadd %fsub %fexp %fmin %fmax %float?
         %fpow %fdiv %fneg %i2f %fminval %fmaxval %fbase %fprec %ftrunc
+        %fsin %fcos %ftan %fcot %fsec %fcsc %fatan %facot
+        %fsinh %fcosh %ftanh %fcsch %fcoth %fsech %fasinh %facsch
         %nil %pair? %lconcat %llength %lfirst %lsecond %lthird
         %lreverse %lempty? %hash %ismall? %string? %f2s
         %ccst %ceq %clt %cle %cgt %cge %c2i %i2c %sname

Modified: trunk/src/interp/g-util.boot
===================================================================
--- trunk/src/interp/g-util.boot	2010-07-29 08:53:43 UTC (rev 1726)
+++ trunk/src/interp/g-util.boot	2010-07-29 15:43:35 UTC (rev 1727)
@@ -413,6 +413,23 @@
     ['%fpow,  :'EXPT],
     ['%fsub,  :"-"],
 
+    ['%fsin,   :'SIN],
+    ['%fcos,   :'COS],
+    ['%ftan,   :'TAN],
+    ['%fcot,   :'COT],
+    ['%fsec,   :'SEC],
+    ['%fcsc,   :'CSC],
+    ['%fatan,  :'ATAN],
+    ['%facot,  :'ACOT],
+    ['%fsinh,  :'SINH],
+    ['%fcosh,  :'COSH],
+    ['%ftanh,  :'TANH],
+    ['%fcsch,  :'CSCH],
+    ['%fcoth,  :'COTH],
+    ['%fsech,  :'SECH],
+    ['%fasinh, :'ASINH],
+    ['%facsch, :'ACSCH],
+
     -- string operations
     ['%f2s,   :'DFLOAT_-FORMAT_-GENERAL],
 

Modified: trunk/src/sman/Makefile.in
===================================================================
--- trunk/src/sman/Makefile.in	2010-07-29 08:53:43 UTC (rev 1726)
+++ trunk/src/sman/Makefile.in	2010-07-29 15:43:35 UTC (rev 1727)
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2009, Gabriel Dos Reis.
+# Copyright (C) 2007-2010, Gabriel Dos Reis.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -85,16 +85,16 @@
 		-I$(top_srcdir)/src/driver $<
 
 ${OUTLIB}/session$(EXEEXT): $(session_objects) $(session_DEPENDENCIES)
-	$(LINK) -o $@ $(session_objects) $(session_LDADD)
+	$(CXXLINK) -o $@ $(session_objects) $(session_LDADD)
 
 ${OUTLIB}/spadclient$(EXEEXT): $(spadclient_objects) $(spadclient_DEPENDENCIES)
-	$(LINK) -o $@ $(spadclient_objects) $(spadclient_LDADD)
+	$(CXXLINK) -o $@ $(spadclient_objects) $(spadclient_LDADD)
 
 spadclient.$(OBJEXT): ${INC}/useproto.h ${INC}/spadclient.H1 \
 			$(axiom_configdir)/axiom-c-macros.h
 
 ${OUT}/sman$(EXEEXT): $(sman_objects) $(sman_DEPENDENCIES)
-	$(LINK) -o $@ $(sman_objects) $(sman_LDADD)
+	$(CXXLINK) -o $@ $(sman_objects) $(sman_LDADD)
 
 $(sman_objects): sman.h $(axiom_c_macros_h)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1730
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1730&view=rev
Author:   dos-reis
Date:     2010-07-29 22:34:06 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
	* clef/Makefile.in: Build and link programs by a C++ compiler.
	* clef/edible.c: Make it acceptable to a C++ compiler.
	* driver/utils.c: Likewise.
	* sman/sman.c: Likewise.

Modified Paths:
--------------
    trunk/src/ChangeLog
    trunk/src/clef/Makefile.in
    trunk/src/clef/edible.c
    trunk/src/driver/utils.c
    trunk/src/hyper/htadd.c
    trunk/src/include/openpty.H1
    trunk/src/sman/Makefile.in
    trunk/src/sman/sman.c
    trunk/src/sman/sman.h

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-29 21:06:32 UTC (rev 1729)
+++ trunk/src/ChangeLog	2010-07-29 22:34:06 UTC (rev 1730)
@@ -1,5 +1,12 @@
 2010-07-29  Gabriel Dos Reis  <gdr@...>
 
+	* clef/Makefile.in: Build and link programs by a C++ compiler.
+	* clef/edible.c: Make it acceptable to a C++ compiler.
+	* driver/utils.c: Likewise.
+	* sman/sman.c: Likewise.
+
+2010-07-29  Gabriel Dos Reis  <gdr@...>
+
 	* lib/XSpadFill.c: Tidy.
 	* lib/pixmap.c: Likewise.
 	* lib/spadcolors.c: Likewise.

Modified: trunk/src/clef/Makefile.in
===================================================================
--- trunk/src/clef/Makefile.in	2010-07-29 21:06:32 UTC (rev 1729)
+++ trunk/src/clef/Makefile.in	2010-07-29 22:34:06 UTC (rev 1730)
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2008, Gabriel Dos Reis.
+# Copyright (C) 2007-2010, Gabriel Dos Reis.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -58,7 +58,7 @@
 	$(STAMP) stamp
 
 $(axiom_target_bindir)/clef$(EXEEXT): $(clef_objects) $(clef_DEPENDENCIES)
-	$(LINK) -o $@ $(clef_objects) $(clef_LDADD) ${LDF}
+	$(CXXLINK) -o $@ $(clef_objects) $(clef_LDADD) ${LDF}
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .h
@@ -68,7 +68,7 @@
 	$(axiom_configdir)/openaxiom-c-macros.h
 
 %.lo: %.c $(axiom_c_macros_h)
-	$(COMPILE) -o $@ ${CCF} $(axiom_includes) $<
+	$(CXXCOMPILE) -o $@ ${CCF} $(axiom_includes) $<
 
 mostlyclean-local:
 	@rm -f $(clef_objects)

Modified: trunk/src/clef/edible.c
===================================================================
--- trunk/src/clef/edible.c	2010-07-29 21:06:32 UTC (rev 1729)
+++ trunk/src/clef/edible.c	2010-07-29 22:34:06 UTC (rev 1730)
@@ -1,7 +1,7 @@
 /*
     Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
     All rights reserved.
-    Copyright (C) 2007-2009, Gabriel Dos Reis.
+    Copyright (C) 2007-2010, Gabriel Dos Reis.
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -135,7 +135,7 @@
   
   
 
-  putenv("LC_ALL=C");
+  putenv((char*) "LC_ALL=C");
   setlocale(LC_ALL, "");
   /* try to get a pseudoterminal to play with */
   if (ptyopen(&contNum, &serverNum, serverPath) == -1) {
@@ -280,11 +280,11 @@
     }
 #endif
     
-    code = select(FD_SETSIZE,(void *) &rfds, NULL, NULL, NULL);
+    code = select(FD_SETSIZE, &rfds, NULL, NULL, NULL);
     for(; code < 0 ;) {
       if(errno == EINTR) {
         check_flip();
-        code = select(FD_SETSIZE,(void *) &rfds, NULL, NULL, NULL);
+        code = select(FD_SETSIZE, &rfds, NULL, NULL, NULL);
       }
       else  {
         perror("clef select failure");

Modified: trunk/src/driver/utils.c
===================================================================
--- trunk/src/driver/utils.c	2010-07-29 21:06:32 UTC (rev 1729)
+++ trunk/src/driver/utils.c	2010-07-29 22:34:06 UTC (rev 1730)
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2008-2009, Gabriel Dos Reis.
+   Copyright (C) 2008-2010, Gabriel Dos Reis.
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
@@ -135,19 +135,20 @@
          command->rt_argc = 3;
          command->rt_argv = (char **)
             malloc(command->rt_argc * sizeof (char*));
-         command->rt_argv[0] = "-batch";
-         command->rt_argv[1] = "-eval";
-         command->rt_argv[2] = "(" OPENAXIOM_LISP_CORE_ENTRY_POINT ")";
+         command->rt_argv[0] = (char*) "-batch";
+         command->rt_argv[1] = (char*) "-eval";
+         command->rt_argv[2] =
+            (char*) ("(" OPENAXIOM_LISP_CORE_ENTRY_POINT ")");
          break;
 
       case openaxiom_sbcl_runtime:
          command->rt_argc = 4;
          command->rt_argv = (char **)
             malloc(command->rt_argc * sizeof (char*));
-         command->rt_argv[0] = "--noinform";
-         command->rt_argv[1] = "--end-runtime-options";
-         command->rt_argv[2] = "--noprint";
-         command->rt_argv[3] = "--end-toplevel-options";
+         command->rt_argv[0] = (char*) "--noinform";
+         command->rt_argv[1] = (char*) "--end-runtime-options";
+         command->rt_argv[2] = (char*) "--noprint";
+         command->rt_argv[3] = (char*) "--end-toplevel-options";
          break;
          
       default:
@@ -288,7 +289,7 @@
             command->core.argv =
                (char**) malloc((other + 2) * sizeof(char*));
             command->core.argv[0] = argv[0];
-            command->core.argv[1] = "--script";
+            command->core.argv[1] = (char*) "--script";
             for (i = 0; i < other; ++i)
                command->core.argv[2 + i] = argv[1 + i];
             driver = openaxiom_script_driver;
@@ -390,7 +391,7 @@
    /* GCL has this oddity that it wants to believe that argv[0] has
       something to tell about what GCL's own runtime is.  Silly.  */
    if (OPENAXIOM_BASE_RTS == openaxiom_gcl_runtime)
-      args[0] = "";
+      args[0] = (char*) "";
    /* And CLISP wants to believe that argv[0] is where it hides stuff
       from the saved image.  */
    else if (OPENAXIOM_BASE_RTS == openaxiom_clisp_runtime)
@@ -407,7 +408,7 @@
          differentiate this from the base runtime system arguments.
          We do this by inserting a doubledash to indicate beginning
          of arguments.  */
-      args[command->rt_argc + 1] = "--";
+      args[command->rt_argc + 1] = (char*) "--";
       /* Then, copy over the arguments received from the command line.  */
       for (i = 1; i < command->core.argc; ++i)
          args[command->rt_argc + i + 1] = command->core.argv[i];

Modified: trunk/src/hyper/htadd.c
===================================================================
--- trunk/src/hyper/htadd.c	2010-07-29 21:06:32 UTC (rev 1729)
+++ trunk/src/hyper/htadd.c	2010-07-29 22:34:06 UTC (rev 1730)
@@ -36,7 +36,6 @@
 /* HyperDoc database file manager */
 
 
-#define _HTADD_C
 #include "openaxiom-c-macros.h"
 
 #include <errno.h>

Modified: trunk/src/include/openpty.H1
===================================================================
--- trunk/src/include/openpty.H1	2010-07-29 21:06:32 UTC (rev 1729)
+++ trunk/src/include/openpty.H1	2010-07-29 22:34:06 UTC (rev 1730)
@@ -1 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern int ptyopen(int*, int*, char*);
+
+#ifdef __cplusplus
+}
+#endif

Modified: trunk/src/sman/Makefile.in
===================================================================
--- trunk/src/sman/Makefile.in	2010-07-29 21:06:32 UTC (rev 1729)
+++ trunk/src/sman/Makefile.in	2010-07-29 22:34:06 UTC (rev 1730)
@@ -81,7 +81,7 @@
 .PRECIOUS: %.lo %.obj
 
 %.lo: %.c 
-	$(COMPILE) ${CCF} -o $@ $(axiom_includes) -I$(srcdir) \
+	$(CXXCOMPILE) ${CCF} -o $@ $(axiom_includes) -I$(srcdir) \
 		-I$(top_srcdir)/src/driver $<
 
 ${OUTLIB}/session$(EXEEXT): $(session_objects) $(session_DEPENDENCIES)

Modified: trunk/src/sman/sman.c
===================================================================
--- trunk/src/sman/sman.c	2010-07-29 21:06:32 UTC (rev 1729)
+++ trunk/src/sman/sman.c	2010-07-29 22:34:06 UTC (rev 1730)
@@ -1,7 +1,7 @@
 /*
   Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2009, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -65,12 +65,12 @@
 static void sman_catch_signals(void);
 static void fix_env(int);
 static void init_term_io(void);
-static char* strPrefix(char* , char*);
-static void check_spad_proc(char* , char*);
+static const char* strPrefix(const char* , const char*);
+static void check_spad_proc(const char* , const char*);
 static void clean_up_old_sockets(void);
 static SpadProcess* fork_you(int);
-static void exec_command_env(char*);
-static SpadProcess* spawn_of_hell(char* , int);
+static void exec_command_env(const char*);
+static SpadProcess* spawn_of_hell(const char* , int);
 static void start_the_spadclient(void);
 static void start_the_local_spadclient(void);
 static void start_the_session_manager(void);
@@ -104,12 +104,12 @@
 /* definitions of programs which sman can start */
 /************************************************/
 
-char    *GraphicsProgram        = "$AXIOM/lib/viewman";
-char    *HypertexProgram        = "$AXIOM/lib/hypertex -s";
-char    *ClefProgram            = 
+const char    *GraphicsProgram        = "$AXIOM/lib/viewman";
+const char    *HypertexProgram        = "$AXIOM/lib/hypertex -s";
+const char    *ClefProgram            = 
            "$AXIOM/bin/clef -f $AXIOM/lib/command.list -e ";
-char    *SessionManagerProgram  = "$AXIOM/lib/session";
-char    *SpadClientProgram      = "$AXIOM/lib/spadclient";
+const char    *SessionManagerProgram  = "$AXIOM/lib/session";
+const char    *SpadClientProgram      = "$AXIOM/lib/spadclient";
 char    *PasteFile              = NULL;
 char    *MakeRecordFile         = NULL;
 char    *VerifyRecordFile       = NULL;
@@ -319,8 +319,8 @@
   _EOL = oldbuf.c_cc[VEOL];
 }
 
-static char *
-strPrefix(char *prefix,char * s)
+static const char*
+strPrefix(const char* prefix, const char* s)
 {
   while (*prefix != '\0' && *prefix == *s) {
     prefix++;
@@ -331,9 +331,9 @@
 }
 
 static void
-check_spad_proc(char *file, char *prefix)
+check_spad_proc(const char *file, const char *prefix)
 {
-  char *num;
+  const char *num;
   int pid;
   if ((num = strPrefix(prefix, file))) {
     pid = atoi(num);
@@ -392,7 +392,7 @@
 }
 
 static void
-exec_command_env(char *command)
+exec_command_env(const char *command)
 {
   char new_command[512];
   sprintf(new_command, "exec %s", command);
@@ -400,7 +400,7 @@
 }
 
 static SpadProcess *
-spawn_of_hell(char *command, int death_action)
+spawn_of_hell(const char *command, int death_action)
 {
   SpadProcess *proc = fork_you(death_action);
   if (proc != NULL) {
@@ -529,8 +529,8 @@
     /* Tell the Core that it is being invoked in server mode.   */
     oa_allocate_process_argv(&cmd->core, 2);
     cmd->core.argv[0] =
-       openaxiom_make_path_for(cmd->root_dir, openaxiom_core_driver);
-    cmd->core.argv[1] = "--role=server";
+       (char*) openaxiom_make_path_for(cmd->root_dir, openaxiom_core_driver);
+    cmd->core.argv[1] = (char*) "--role=server";
     openaxiom_execute_core(cmd, openaxiom_core_driver);
   }
 }
@@ -762,7 +762,7 @@
    command.root_dir = openaxiom_get_systemdir(argc, argv);
    process_options(&command, argc, argv);
 
-  putenv("LC_ALL=C");
+  putenv((char*) "LC_ALL=C");
   setlocale(LC_ALL, "");
   bsdSignal(SIGINT,  SIG_IGN,RestartSystemCalls);
   init_term_io();

Modified: trunk/src/sman/sman.h
===================================================================
--- trunk/src/sman/sman.h	2010-07-29 21:06:32 UTC (rev 1729)
+++ trunk/src/sman/sman.h	2010-07-29 22:34:06 UTC (rev 1730)
@@ -48,7 +48,7 @@
 typedef struct spad_proc {
   int   proc_id;        /* process id of child */
   int   death_action;   /* one of the above constants */
-  char  *command;       /* sh command line to restart the process */
+  const char* command;       /* sh command line to restart the process */
   struct spad_proc *next;
 } SpadProcess;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1710
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1710&view=rev
Author:   dos-reis
Date:     2010-07-26 02:29:37 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
 r14975@... (orig r1690):  gdr | 2010-07-22 11:15:46 -0500
 	* interp/g-opt.boot (simplifyVMForm): New.
 	(optRetract): Simplify the predicate when possible.
 	(optNot): New transformer.
 	(optAnd): Likewise.
 	(optOr): Likewise.
 	(optIlt): Likewise.
 	(optIle): Likewise.
 	(optIgt): Likewise.
 	(optIge): Likewise.
 
 r14976@... (orig r1691):  gdr | 2010-07-22 16:44:36 -0500
 	* interp/g-util.boot (expandIeq): New expander for %ieq.
 	* interp/g-opt.boot (optIeq): New.
 	(optIadd): Likewise.
 	(optIsub): Likewise.
 	(optImul): Likewise.
 	(optIneg): Likewise.
 	(lispize): Remove.
 
 r14977@... (orig r1692):  gdr | 2010-07-22 18:30:11 -0500
 more cleanup
 r14978@... (orig r1693):  gdr | 2010-07-22 21:23:45 -0500
 	* interp/g-util.boot (expandFeq): New.
 	* algebra/sf.spad.pamphlet (DoubleFloat): Tidy.
 
 r14979@... (orig r1694):  gdr | 2010-07-23 05:19:23 -0500
 	* interp/g-opt.boot (optMINUS): Remove.
 	(opt_-): Likewise.
 
 r14980@... (orig r1695):  gdr | 2010-07-23 10:50:17 -0500
 	* interp/g-util.boot: Remove expansion for %ble, %bgt, %bge.
 	* interp/g-opt.boot (optMINUS): Remove.
 	(opt_-): Likewise.
 	(optBle): New.
 	(optBgt): Likewise.
 	(optBge): Likewise.
 
 r14981@... (orig r1696):  gdr | 2010-07-23 16:09:41 -0500
 	* interp/g-opt.boot (optBind): Check for dependencies in
 	initializations in %bind expressions.
 	* interp/g-util.boot (expandBind): The body of s %bind expression
 	may be a sequence of statements.
 
 r14983@... (orig r1698):  gdr | 2010-07-23 20:50:17 -0500
 	* interp/compiler.boot (compMatchAlternative): Don't generate
 	LET-expressions. 
 	* interp/g-opt.boot (optBind): Tidy.
 
 r14984@... (orig r1699):  gdr | 2010-07-24 19:12:59 -0500
 	* interp/cattable.boot: Use %true for truth value in VM expressions.
 	* interp/clam.boot: Likewise.
 	* interp/define.boot: Likewise.
 	* interp/format.boot: Likewise.
 	* interp/functor.boot: Likewise.
 	* interp/g-opt.boot: Likewise.
 	* interp/mark.boot: Likewise.
 	* interp/pspad1.boot: Likewise.
 	* interp/pspad2.boot: Likewise.
 	* interp/slam.boot: Likewise.
 	* interp/wi1.boot: Likewise.
 	* interp/wi2.boot: Likewise.
 	* interp/sys-constants.boot: Remove $true and $false as unused.
 
 r14985@... (orig r1700):  gdr | 2010-07-24 22:34:32 -0500
 	* interp/c-util.boot (usedSymbol?): Move to g-util.boot.
 	* interp/nruncomp.boot (NRTsetVector4a): Tidy.
 
 r14986@... (orig r1701):  gdr | 2010-07-24 23:37:09 -0500
 	* interp/g-opt.boot (optIadd): More simplification if either 
 	operand is zero.
 	(optIsub): Likewise.
 	(optImul): More simplifications if either operand is one.
 
 r14987@... (orig r1702):  gdr | 2010-07-25 00:47:02 -0500
 	* interp/g-opt.boot (resetTo): New.
 	(optCatch): Use it.
 	(optCall): Likewise.
 	(optSpecialCall): Likewise.
 	(simplifyVMForm): Handle simple cases here.
 	* interp/macros.lisp (RPLACW): Remove.
 
 r14988@... (orig r1703):  gdr | 2010-07-25 07:28:03 -0500
 	* interp/g-opt.boot (simplifyVMForm): Don't call optimize.
 	(optCall): Handle VM macro expansions here.
 
 r14989@... (orig r1704):  gdr | 2010-07-25 12:28:41 -0500
 use simplifyVMForm instead of optimize
 r14990@... (orig r1705):  gdr | 2010-07-25 13:35:19 -0500
 	* interp/g-opt.boot (optCall): Don't call optimize again.
 
 r14991@... (orig r1706):  gdr | 2010-07-25 16:53:36 -0500
 	(optCallSpecially): Remove deadcode.
 
 r14992@... (orig r1707):  dos-reis | 2010-07-25 19:46:58 -0500
 	* interp/g-opt.boot (oprCond): Replace use of TruthP with direct
 	comparison to %true.
 
 r14993@... (orig r1708):  gdr | 2010-07-25 20:47:12 -0500
 	* interp/g-opt.boot (optimize): Remove as no longer used.
 	* interp/define.boot (DomainSubstitutionFunction): Use
 	simplifyVMForm in lieu of optimize.
 	* interp/nruncomp.boot (NRTsetVector4a): Likewise.
 

Modified Paths:
--------------
    jap-sandbox/src/ChangeLog
    jap-sandbox/src/algebra/integer.spad.pamphlet
    jap-sandbox/src/algebra/sex.spad.pamphlet
    jap-sandbox/src/algebra/sf.spad.pamphlet
    jap-sandbox/src/algebra/strap/ABELGRP-.lsp
    jap-sandbox/src/algebra/strap/ABELMON-.lsp
    jap-sandbox/src/algebra/strap/ABELSG-.lsp
    jap-sandbox/src/algebra/strap/ALAGG.lsp
    jap-sandbox/src/algebra/strap/BOOLEAN.lsp
    jap-sandbox/src/algebra/strap/CHAR.lsp
    jap-sandbox/src/algebra/strap/CLAGG.lsp
    jap-sandbox/src/algebra/strap/DFLOAT.lsp
    jap-sandbox/src/algebra/strap/DIVRING-.lsp
    jap-sandbox/src/algebra/strap/EUCDOM-.lsp
    jap-sandbox/src/algebra/strap/FFIELDC-.lsp
    jap-sandbox/src/algebra/strap/GCDDOM-.lsp
    jap-sandbox/src/algebra/strap/HOAGG-.lsp
    jap-sandbox/src/algebra/strap/HOAGG.lsp
    jap-sandbox/src/algebra/strap/ILIST.lsp
    jap-sandbox/src/algebra/strap/INS-.lsp
    jap-sandbox/src/algebra/strap/INT.lsp
    jap-sandbox/src/algebra/strap/INTDOM-.lsp
    jap-sandbox/src/algebra/strap/ISTRING.lsp
    jap-sandbox/src/algebra/strap/LIST.lsp
    jap-sandbox/src/algebra/strap/LNAGG-.lsp
    jap-sandbox/src/algebra/strap/LNAGG.lsp
    jap-sandbox/src/algebra/strap/LSAGG-.lsp
    jap-sandbox/src/algebra/strap/LSAGG.lsp
    jap-sandbox/src/algebra/strap/MONOID-.lsp
    jap-sandbox/src/algebra/strap/MTSCAT.lsp
    jap-sandbox/src/algebra/strap/NNI.lsp
    jap-sandbox/src/algebra/strap/ORDRING-.lsp
    jap-sandbox/src/algebra/strap/OUTFORM.lsp
    jap-sandbox/src/algebra/strap/PI.lsp
    jap-sandbox/src/algebra/strap/POLYCAT-.lsp
    jap-sandbox/src/algebra/strap/POLYCAT.lsp
    jap-sandbox/src/algebra/strap/QFCAT-.lsp
    jap-sandbox/src/algebra/strap/QFCAT.lsp
    jap-sandbox/src/algebra/strap/RCAGG.lsp
    jap-sandbox/src/algebra/strap/RNS-.lsp
    jap-sandbox/src/algebra/strap/SETAGG.lsp
    jap-sandbox/src/algebra/strap/SINT.lsp
    jap-sandbox/src/algebra/strap/STAGG-.lsp
    jap-sandbox/src/algebra/strap/STAGG.lsp
    jap-sandbox/src/algebra/strap/SYMBOL.lsp
    jap-sandbox/src/algebra/strap/URAGG-.lsp
    jap-sandbox/src/algebra/strap/URAGG.lsp
    jap-sandbox/src/algebra/strap/VECTOR.lsp
    jap-sandbox/src/algebra/syntax.spad.pamphlet
    jap-sandbox/src/boot/strap/tokens.clisp
    jap-sandbox/src/boot/tokens.boot
    jap-sandbox/src/interp/Makefile.in
    jap-sandbox/src/interp/Makefile.pamphlet
    jap-sandbox/src/interp/c-util.boot
    jap-sandbox/src/interp/cattable.boot
    jap-sandbox/src/interp/clam.boot
    jap-sandbox/src/interp/compiler.boot
    jap-sandbox/src/interp/define.boot
    jap-sandbox/src/interp/format.boot
    jap-sandbox/src/interp/functor.boot
    jap-sandbox/src/interp/g-opt.boot
    jap-sandbox/src/interp/g-util.boot
    jap-sandbox/src/interp/macros.lisp
    jap-sandbox/src/interp/mark.boot
    jap-sandbox/src/interp/nruncomp.boot
    jap-sandbox/src/interp/pspad1.boot
    jap-sandbox/src/interp/pspad2.boot
    jap-sandbox/src/interp/slam.boot
    jap-sandbox/src/interp/spad.lisp
    jap-sandbox/src/interp/sys-constants.boot
    jap-sandbox/src/interp/wi1.boot
    jap-sandbox/src/interp/wi2.boot

Property Changed:
----------------
    jap-sandbox/


Property changes on: jap-sandbox
___________________________________________________________________
Modified: svk:merge
   - 02417865-de37-0410-9a13-d91e0bdeb7dd:/case.svn:12427
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-coerce:12405
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-ctor:12505
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-libtool:13782
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-parse:12477
f499efd5-9937-0410-b36a-d3739c31ded8:/trunk:1688
   + 02417865-de37-0410-9a13-d91e0bdeb7dd:/case.svn:12427
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-coerce:12405
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-ctor:12505
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-libtool:13782
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-parse:12477
f499efd5-9937-0410-b36a-d3739c31ded8:/trunk:1708

Modified: jap-sandbox/src/ChangeLog
===================================================================
--- jap-sandbox/src/ChangeLog	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/ChangeLog	2010-07-26 02:29:37 UTC (rev 1710)
@@ -1,3 +1,111 @@
+2010-07-25  Gabriel Dos Reis  <gdr@...>
+
+	* interp/g-opt.boot (optimize): Remove as no longer used.
+	* interp/define.boot (DomainSubstitutionFunction): Use
+	simplifyVMForm in lieu of optimize.
+	* interp/nruncomp.boot (NRTsetVector4a): Likewise.
+
+2010-07-25  Gabriel Dos Reis  <gdr@...>
+
+	* interp/g-opt.boot (oprCond): Replace use of TruthP with direct
+	comparison to %true.
+
+2010-07-25  Gabriel Dos Reis  <gdr@...>
+
+	* interp/g-opt.boot (optCall): Don't call optimize again.
+	(optCallSpecially): Remove deadcode.
+
+2010-07-25  Gabriel Dos Reis  <gdr@...>
+
+	* interp/g-opt.boot (simplifyVMForm): Don't call optimize.
+	(optCall): Handle VM macro expansions here.
+
+2010-07-25  Gabriel Dos Reis  <gdr@...>
+
+	* interp/g-opt.boot (resetTo): New.
+	(optCatch): Use it.
+	(optCall): Likewise.
+	(optSpecialCall): Likewise.
+	(simplifyVMForm): Handle simple cases here.
+	* interp/macros.lisp (RPLACW): Remove.
+
+2010-07-24  Gabriel Dos Reis  <gdr@...>
+
+	* interp/g-opt.boot (optIadd): More simplification if either 
+	operand is zero.
+	(optIsub): Likewise.
+	(optImul): More simplifications if either operand is one.
+
+2010-07-24  Gabriel Dos Reis  <gdr@...>
+
+	* interp/c-util.boot (usedSymbol?): Move to g-util.boot.
+	* interp/nruncomp.boot (NRTsetVector4a): Tidy.
+
+2010-07-24  Gabriel Dos Reis  <gdr@...>
+
+	* interp/cattable.boot: Use %true for truth value in VM expressions.
+	* interp/clam.boot: Likewise.
+	* interp/define.boot: Likewise.
+	* interp/format.boot: Likewise.
+	* interp/functor.boot: Likewise.
+	* interp/g-opt.boot: Likewise.
+	* interp/mark.boot: Likewise.
+	* interp/pspad1.boot: Likewise.
+	* interp/pspad2.boot: Likewise.
+	* interp/slam.boot: Likewise.
+	* interp/wi1.boot: Likewise.
+	* interp/wi2.boot: Likewise.
+	* interp/sys-constants.boot: Remove $true and $false as unused.
+
+2010-07-23  Gabriel Dos Reis  <gdr@...>
+
+	* interp/compiler.boot (compMatchAlternative): Don't generate
+	LET-expressions. 
+	* interp/g-opt.boot (optBind): Tidy.
+
+2010-07-23  Gabriel Dos Reis  <gdr@...>
+
+	* interp/g-opt.boot (optBind): Check for dependencies in
+	initializations in %bind expressions.
+	* interp/g-util.boot (expandBind): The body of s %bind expression
+	may be a sequence of statements.
+
+2010-07-23  Gabriel Dos Reis  <gdr@...>
+
+	* interp/g-util.boot: Remove expansion for %ble, %bgt, %bge.
+	* interp/g-opt.boot (optMINUS): Remove.
+	(opt_-): Likewise.
+	(optBle): New.
+	(optBgt): Likewise.
+	(optBge): Likewise.
+
+2010-07-22  Gabriel Dos Reis  <gdr@...>
+
+	* interp/g-util.boot (expandFeq): New.
+	* algebra/sf.spad.pamphlet (DoubleFloat): Tidy.
+
+2010-07-22  Gabriel Dos Reis  <gdr@...>
+
+	* interp/g-util.boot (expandIeq): New expander for %ieq.
+	* interp/g-opt.boot (optIeq): New.
+	(optIadd): Likewise.
+	(optIsub): Likewise.
+	(optImul): Likewise.
+	(optIneg): Likewise.
+	(lispize): Remove.
+
+2010-07-22  Gabriel Dos Reis  <gdr@...>
+
+	* interp/g-opt.boot (simplifyVMForm): New.
+	(optRetract): Simplify the predicate when possible.
+	(optNot): New transformer.
+	(optAnd): Likewise.
+	(optOr): Likewise.
+	(optIlt): Likewise.
+	(optIle): Likewise.
+	(optIgt): Likewise.
+	(optIge): Likewise.
+
 2010-07-21  Gabriel Dos Reis  <gdr@...>
 
 	* algebra/data.spad.pamphlet (Byte) [~]: Tidy.

Modified: jap-sandbox/src/algebra/integer.spad.pamphlet
===================================================================
--- jap-sandbox/src/algebra/integer.spad.pamphlet	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/algebra/integer.spad.pamphlet	2010-07-26 02:29:37 UTC (rev 1710)
@@ -145,7 +145,7 @@
       inc  x  == x + 1
       dec  x  == x - 1
       hash x == %hash x
-      negative? x == MINUSP(x)$Lisp
+      negative? x == x < 0
       coerce(x):OutputForm == outputForm(x pretend Integer)
       coerce(m:Integer):% == m pretend %
       convert(x:%):Integer == x pretend Integer

Modified: jap-sandbox/src/algebra/sex.spad.pamphlet
===================================================================
--- jap-sandbox/src/algebra/sex.spad.pamphlet	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/algebra/sex.spad.pamphlet	2010-07-26 02:29:37 UTC (rev 1710)
@@ -119,7 +119,7 @@
             paren blankSeparate l1
 
         b1 = b2        == EQUAL(b1,b2)$Lisp
-        eq(b1, b2)     == %peq(b1,b2)$Foreign(Builtin)
+        eq(b1, b2)     == %peq(b1,b2)
 
         null? b      == NULL(b)$Lisp
         atom? b      == ATOM(b)$Lisp

Modified: jap-sandbox/src/algebra/sf.spad.pamphlet
===================================================================
--- jap-sandbox/src/algebra/sf.spad.pamphlet	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/algebra/sf.spad.pamphlet	2010-07-26 02:29:37 UTC (rev 1710)
@@ -406,8 +406,8 @@
    acoth x          == checkComplex ACOTH(x)$Lisp
    asech x          == checkComplex ASECH(x)$Lisp
    x:% / y:%        == %fdiv(x,y)
-   negative? x      == MINUSP(x)$Lisp
-   zero? x          == ZEROP(x)$Lisp
+   negative? x      == x < 0
+   zero? x          == x = 0
    one? x           == x = 1
    hash x           == HASHEQ(x)$Lisp
    recip(x)         == (zero? x => "failed"; 1 / x)

Modified: jap-sandbox/src/algebra/strap/ABELGRP-.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/ABELGRP-.lsp	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/algebra/strap/ABELGRP-.lsp	2010-07-26 02:29:37 UTC (rev 1710)
@@ -28,9 +28,8 @@
   (COND
     ((ZEROP |n|) (|spadConstant| $ 19))
     ((PLUSP |n|) (SPADCALL |n| |x| (|getShellEntry| $ 24)))
-    ('T
-     (SPADCALL (- |n|) (SPADCALL |x| (|getShellEntry| $ 7))
-         (|getShellEntry| $ 24))))) 
+    (T (SPADCALL (- |n|) (SPADCALL |x| (|getShellEntry| $ 7))
+           (|getShellEntry| $ 24))))) 
 
 (DEFUN |AbelianGroup&| (|#1|)
   (LET* ((|dv$1| (|devaluate| |#1|))
@@ -42,9 +41,8 @@
     (|setShellEntry| $ 6 |#1|)
     (COND
       ((|HasCategory| |#1| '(|Ring|)))
-      ('T
-       (|setShellEntry| $ 26
-           (CONS (|dispatchFunction| |ABELGRP-;*;I2S;4|) $))))
+      (T (|setShellEntry| $ 26
+             (CONS (|dispatchFunction| |ABELGRP-;*;I2S;4|) $))))
     $)) 
 
 (MAKEPROP '|AbelianGroup&| '|infovec|

Modified: jap-sandbox/src/algebra/strap/ABELMON-.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/ABELMON-.lsp	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/algebra/strap/ABELMON-.lsp	2010-07-26 02:29:37 UTC (rev 1710)
@@ -25,7 +25,7 @@
 (DEFUN |ABELMON-;*;Nni2S;4| (|n| |x| $)
   (COND
     ((ZEROP |n|) (|spadConstant| $ 7))
-    ('T (SPADCALL |n| |x| (|getShellEntry| $ 18))))) 
+    (T (SPADCALL |n| |x| (|getShellEntry| $ 18))))) 
 
 (DEFUN |AbelianMonoid&| (|#1|)
   (LET* ((|dv$1| (|devaluate| |#1|))
@@ -37,9 +37,8 @@
     (|setShellEntry| $ 6 |#1|)
     (COND
       ((|HasCategory| |#1| '(|Ring|)))
-      ('T
-       (|setShellEntry| $ 19
-           (CONS (|dispatchFunction| |ABELMON-;*;Nni2S;4|) $))))
+      (T (|setShellEntry| $ 19
+             (CONS (|dispatchFunction| |ABELMON-;*;Nni2S;4|) $))))
     $)) 
 
 (MAKEPROP '|AbelianMonoid&| '|infovec|

Modified: jap-sandbox/src/algebra/strap/ABELSG-.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/ABELSG-.lsp	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/algebra/strap/ABELSG-.lsp	2010-07-26 02:29:37 UTC (rev 1710)
@@ -18,9 +18,8 @@
     (|setShellEntry| $ 6 |#1|)
     (COND
       ((|HasCategory| |#1| '(|Ring|)))
-      ('T
-       (|setShellEntry| $ 10
-           (CONS (|dispatchFunction| |ABELSG-;*;Pi2S;1|) $))))
+      (T (|setShellEntry| $ 10
+             (CONS (|dispatchFunction| |ABELSG-;*;Pi2S;1|) $))))
     $)) 
 
 (MAKEPROP '|AbelianSemiGroup&| '|infovec|

Modified: jap-sandbox/src/algebra/strap/ALAGG.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/ALAGG.lsp	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/algebra/strap/ALAGG.lsp	2010-07-26 02:29:37 UTC (rev 1710)
@@ -16,19 +16,19 @@
                                      (|:| |entry| |t#2|))))
                     (COND
                       (|AssociationListAggregate;CAT|)
-                      ('T
-                       (SETQ |AssociationListAggregate;CAT|
-                             (|Join| (|TableAggregate| '|t#1| '|t#2|)
-                                     (|ListAggregate| '#1#)
-                                     (|mkCategory| '|domain|
-                                      '(((|assoc|
-                                          ((|Union|
-                                            (|Record| (|:| |key| |t#1|)
-                                             (|:| |entry| |t#2|))
-                                            "failed")
-                                           |t#1| $))
-                                         T))
-                                      NIL 'NIL NIL)))))))))
+                      (T (SETQ |AssociationListAggregate;CAT|
+                               (|Join| (|TableAggregate| '|t#1| '|t#2|)
+                                       (|ListAggregate| '#1#)
+                                       (|mkCategory| '|domain|
+                                        '(((|assoc|
+                                            ((|Union|
+                                              (|Record|
+                                               (|:| |key| |t#1|)
+                                               (|:| |entry| |t#2|))
+                                              "failed")
+                                             |t#1| $))
+                                           T))
+                                        NIL 'NIL NIL)))))))))
     (|setShellEntry| #0# 0
         (LIST '|AssociationListAggregate| (|devaluate| |t#1|)
               (|devaluate| |t#2|)))

Modified: jap-sandbox/src/algebra/strap/BOOLEAN.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/BOOLEAN.lsp	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/algebra/strap/BOOLEAN.lsp	2010-07-26 02:29:37 UTC (rev 1710)
@@ -114,41 +114,39 @@
   (DECLARE (IGNORE $))
   (OR |a| |b|)) 
 
-(DEFUN |BOOLEAN;xor;3$;10| (|a| |b| $)
-  (COND (|a| (NOT |b|)) ('T |b|))) 
+(DEFUN |BOOLEAN;xor;3$;10| (|a| |b| $) (COND (|a| (NOT |b|)) (T |b|))) 
 
-(DEFUN |BOOLEAN;nor;3$;11| (|a| |b| $)
-  (COND (|a| NIL) ('T (NOT |b|)))) 
+(DEFUN |BOOLEAN;nor;3$;11| (|a| |b| $) (COND (|a| NIL) (T (NOT |b|)))) 
 
-(DEFUN |BOOLEAN;nand;3$;12| (|a| |b| $) (COND (|a| (NOT |b|)) ('T T))) 
+(DEFUN |BOOLEAN;nand;3$;12| (|a| |b| $) (COND (|a| (NOT |b|)) (T T))) 
 
 (DEFUN |BOOLEAN;=;3$;13| (|a| |b| $)
   (DECLARE (IGNORE $))
   (EQ |a| |b|)) 
 
-(DEFUN |BOOLEAN;implies;3$;14| (|a| |b| $) (COND (|a| |b|) ('T T))) 
+(DEFUN |BOOLEAN;implies;3$;14| (|a| |b| $) (COND (|a| |b|) (T T))) 
 
 (DEFUN |BOOLEAN;equiv;3$;15| (|a| |b| $)
   (DECLARE (IGNORE $))
   (EQ |a| |b|)) 
 
-(DEFUN |BOOLEAN;<;3$;16| (|a| |b| $) (COND (|b| (NOT |a|)) ('T NIL))) 
+(DEFUN |BOOLEAN;<;3$;16| (|a| |b| $) (COND (|b| (NOT |a|)) (T NIL))) 
 
 (DEFUN |BOOLEAN;size;Nni;17| ($) (DECLARE (IGNORE $)) 2) 
 
 (DEFUN |BOOLEAN;index;Pi$;18| (|i| $)
-  (COND ((SPADCALL |i| (|getShellEntry| $ 26)) NIL) ('T T))) 
+  (COND ((SPADCALL |i| (|getShellEntry| $ 26)) NIL) (T T))) 
 
-(DEFUN |BOOLEAN;lookup;$Pi;19| (|a| $) (COND (|a| 1) ('T 2))) 
+(DEFUN |BOOLEAN;lookup;$Pi;19| (|a| $) (COND (|a| 1) (T 2))) 
 
 (DEFUN |BOOLEAN;random;$;20| ($)
-  (COND ((SPADCALL (|random|) (|getShellEntry| $ 26)) NIL) ('T T))) 
+  (COND ((SPADCALL (|random|) (|getShellEntry| $ 26)) NIL) (T T))) 
 
 (DEFUN |BOOLEAN;convert;$If;21| (|x| $)
-  (COND (|x| '|true|) ('T '|false|))) 
+  (COND (|x| '|true|) (T '|false|))) 
 
 (DEFUN |BOOLEAN;coerce;$Of;22| (|x| $)
-  (COND (|x| '|true|) ('T '|false|))) 
+  (COND (|x| '|true|) (T '|false|))) 
 
 (DEFUN |Boolean| ()
   (DECLARE (SPECIAL |$ConstructorCache|))
@@ -157,12 +155,11 @@
       (COND
         ((SETQ #0# (HGET |$ConstructorCache| '|Boolean|))
          (|CDRwithIncrement| (CDAR #0#)))
-        ('T
-         (UNWIND-PROTECT
-           (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Boolean|
-                               (LIST (CONS NIL (CONS 1 (|Boolean;|))))))
-             (SETQ #0# T))
-           (COND ((NOT #0#) (HREM |$ConstructorCache| '|Boolean|))))))))) 
+        (T (UNWIND-PROTECT
+             (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Boolean|
+                                 (LIST (CONS NIL (CONS 1 (|Boolean;|))))))
+               (SETQ #0# T))
+             (COND ((NOT #0#) (HREM |$ConstructorCache| '|Boolean|))))))))) 
 
 (DEFUN |Boolean;| ()
   (LET ((|dv$| (LIST '|Boolean|)) ($ (|newShell| 39))

Modified: jap-sandbox/src/algebra/strap/CHAR.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/CHAR.lsp	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/algebra/strap/CHAR.lsp	2010-07-26 02:29:37 UTC (rev 1710)
@@ -175,7 +175,7 @@
     ((EQL (QCSIZE |s|) 1)
      (SPADCALL |s| (SPADCALL |s| (|getShellEntry| $ 52))
          (|getShellEntry| $ 53)))
-    ('T (|userError| "String is not a single character")))) 
+    (T (|userError| "String is not a single character")))) 
 
 (DEFUN |CHAR;upperCase;2$;24| (|c| $)
   (DECLARE (IGNORE $))
@@ -192,12 +192,13 @@
       (COND
         ((SETQ #0# (HGET |$ConstructorCache| '|Character|))
          (|CDRwithIncrement| (CDAR #0#)))
-        ('T
-         (UNWIND-PROTECT
-           (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Character|
-                               (LIST (CONS NIL (CONS 1 (|Character;|))))))
-             (SETQ #0# T))
-           (COND ((NOT #0#) (HREM |$ConstructorCache| '|Character|))))))))) 
+        (T (UNWIND-PROTECT
+             (PROG1 (CDDAR (HPUT |$ConstructorCache| '|Character|
+                                 (LIST (CONS NIL
+                                        (CONS 1 (|Character;|))))))
+               (SETQ #0# T))
+             (COND
+               ((NOT #0#) (HREM |$ConstructorCache| '|Character|))))))))) 
 
 (DEFUN |Character;| ()
   (LET ((|dv$| (LIST '|Character|)) ($ (|newShell| 58))

Modified: jap-sandbox/src/algebra/strap/CLAGG.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/CLAGG.lsp	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/algebra/strap/CLAGG.lsp	2010-07-26 02:29:37 UTC (rev 1710)
@@ -10,65 +10,62 @@
             (|sublisV| (PAIR '(|t#1|) (LIST (|devaluate| |t#1|)))
                 (COND
                   (|Collection;CAT|)
-                  ('T
-                   (SETQ |Collection;CAT|
-                         (|Join| (|HomogeneousAggregate| '|t#1|)
-                                 (|mkCategory| '|domain|
-                                     '(((|construct|
-                                         ($ (|List| |t#1|)))
-                                        T)
-                                       ((|find|
-                                         ((|Union| |t#1| "failed")
-                                          (|Mapping| (|Boolean|) |t#1|)
-                                          $))
-                                        T)
-                                       ((|reduce|
-                                         (|t#1|
-                                          (|Mapping| |t#1| |t#1| |t#1|)
-                                          $))
+                  (T (SETQ |Collection;CAT|
+                           (|Join| (|HomogeneousAggregate| '|t#1|)
+                                   (|mkCategory| '|domain|
+                                    '(((|construct| ($ (|List| |t#1|)))
+                                       T)
+                                      ((|find|
+                                        ((|Union| |t#1| "failed")
+                                         (|Mapping| (|Boolean|) |t#1|)
+                                         $))
+                                       T)
+                                      ((|reduce|
+                                        (|t#1|
+                                         (|Mapping| |t#1| |t#1| |t#1|)
+                                         $))
+                                       (|has| $
+                                        (ATTRIBUTE |finiteAggregate|)))
+                                      ((|reduce|
+                                        (|t#1|
+                                         (|Mapping| |t#1| |t#1| |t#1|)
+                                         $ |t#1|))
+                                       (|has| $
+                                        (ATTRIBUTE |finiteAggregate|)))
+                                      ((|remove|
+                                        ($
+                                         (|Mapping| (|Boolean|) |t#1|)
+                                         $))
+                                       (|has| $
+                                        (ATTRIBUTE |finiteAggregate|)))
+                                      ((|select|
+                                        ($
+                                         (|Mapping| (|Boolean|) |t#1|)
+                                         $))
+                                       (|has| $
+                                        (ATTRIBUTE |finiteAggregate|)))
+                                      ((|reduce|
+                                        (|t#1|
+                                         (|Mapping| |t#1| |t#1| |t#1|)
+                                         $ |t#1| |t#1|))
+                                       (AND
+                                        (|has| |t#1| (|SetCategory|))
                                         (|has| $
-                                         (ATTRIBUTE |finiteAggregate|)))
-                                       ((|reduce|
-                                         (|t#1|
-                                          (|Mapping| |t#1| |t#1| |t#1|)
-                                          $ |t#1|))
+                                         (ATTRIBUTE |finiteAggregate|))))
+                                      ((|remove| ($ |t#1| $))
+                                       (AND
+                                        (|has| |t#1| (|SetCategory|))
                                         (|has| $
-                                         (ATTRIBUTE |finiteAggregate|)))
-                                       ((|remove|
-                                         ($
-                                          (|Mapping| (|Boolean|) |t#1|)
-                                          $))
+                                         (ATTRIBUTE |finiteAggregate|))))
+                                      ((|removeDuplicates| ($ $))
+                                       (AND
+                                        (|has| |t#1| (|SetCategory|))
                                         (|has| $
-                                         (ATTRIBUTE |finiteAggregate|)))
-                                       ((|select|
-                                         ($
-                                          (|Mapping| (|Boolean|) |t#1|)
-                                          $))
-                                        (|has| $
-                                         (ATTRIBUTE |finiteAggregate|)))
-                                       ((|reduce|
-                                         (|t#1|
-                                          (|Mapping| |t#1| |t#1| |t#1|)
-                                          $ |t#1| |t#1|))
-                                        (AND
-                                         (|has| |t#1| (|SetCategory|))
-                                         (|has| $
-                                          (ATTRIBUTE |finiteAggregate|))))
-                                       ((|remove| ($ |t#1| $))
-                                        (AND
-                                         (|has| |t#1| (|SetCategory|))
-                                         (|has| $
-                                          (ATTRIBUTE |finiteAggregate|))))
-                                       ((|removeDuplicates| ($ $))
-                                        (AND
-                                         (|has| |t#1| (|SetCategory|))
-                                         (|has| $
-                                          (ATTRIBUTE |finiteAggregate|)))))
-                                     '(((|ConvertibleTo| (|InputForm|))
-                                        (|has| |t#1|
-                                         (|ConvertibleTo|
-                                          (|InputForm|)))))
-                                     '((|List| |t#1|)) NIL))))))))
+                                         (ATTRIBUTE |finiteAggregate|)))))
+                                    '(((|ConvertibleTo| (|InputForm|))
+                                       (|has| |t#1|
+                                        (|ConvertibleTo| (|InputForm|)))))
+                                    '((|List| |t#1|)) NIL))))))))
     (|setShellEntry| #0# 0 (LIST '|Collection| (|devaluate| |t#1|)))
     #0#)) 
 

Modified: jap-sandbox/src/algebra/strap/DFLOAT.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/DFLOAT.lsp	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/algebra/strap/DFLOAT.lsp	2010-07-26 02:29:37 UTC (rev 1710)
@@ -441,15 +441,14 @@
   (COND
     ((EQL 2 2) 53)
     ((EQL 2 16) (* 4 53))
-    ('T
-     (LET ((#0=#:G1431
-               (TRUNCATE
-                   (SPADCALL 53
-                       (|DFLOAT;log2;2$;40|
-                           (FLOAT 2 |$DoubleFloatMaximum|) $)
-                       (|getShellEntry| $ 32)))))
-       (|check-subtype| (AND (NOT (MINUSP #0#)) (PLUSP #0#))
-           '(|PositiveInteger|) #0#))))) 
+    (T (LET ((#0=#:G1431
+                 (TRUNCATE
+                     (SPADCALL 53
+                         (|DFLOAT;log2;2$;40|
+                             (FLOAT 2 |$DoubleFloatMaximum|) $)
+                         (|getShellEntry| $ 32)))))
+         (|check-subtype| (AND (NOT (MINUSP #0#)) (PLUSP #0#))
+             '(|PositiveInteger|) #0#))))) 
 
 (DEFUN |DFLOAT;max;$;11| ($)
   (DECLARE (IGNORE $))
@@ -594,7 +593,7 @@
 (DEFUN |DFLOAT;hash;$Si;69| (|x| $) (DECLARE (IGNORE $)) (HASHEQ |x|)) 
 
 (DEFUN |DFLOAT;recip;$U;70| (|x| $)
-  (COND ((ZEROP |x|) (CONS 1 "failed")) ('T (CONS 0 (/ 1.0 |x|))))) 
+  (COND ((ZEROP |x|) (CONS 1 "failed")) (T (CONS 0 (/ 1.0 |x|))))) 
 
 (DEFUN |DFLOAT;differentiate;2$;71| (|x| $) (DECLARE (IGNORE $)) 0.0) 
 
@@ -627,13 +626,13 @@
               (COND
                 ((PLUSP |y|) (/ PI 2))
                 ((MINUSP |y|) (- (/ PI 2)))
-                ('T 0.0)))
-             ('T
-              (SEQ (LETT |theta| (ATAN (ABS (/ |y| |x|)))
-                         |DFLOAT;atan;3$;79|)
-                   (COND ((MINUSP |x|) (SETQ |theta| (- PI |theta|))))
-                   (COND ((MINUSP |y|) (SETQ |theta| (- |theta|))))
-                   (EXIT |theta|)))))))) 
+                (T 0.0)))
+             (T (SEQ (LETT |theta| (ATAN (ABS (/ |y| |x|)))
+                           |DFLOAT;atan;3$;79|)
+                     (COND
+                       ((MINUSP |x|) (SETQ |theta| (- PI |theta|))))
+                     (COND ((MINUSP |y|) (SETQ |theta| (- |theta|))))
+                     (EXIT |theta|)))))))) 
 
 (DEFUN |DFLOAT;retract;$F;80| (|x| $)
   (|DFLOAT;rationalApproximation;$2NniF;87| |x|
@@ -658,7 +657,7 @@
             (FLOAT (LETT |n| (TRUNCATE |x|) |DFLOAT;retract;$I;82|)
                    |$DoubleFloatMaximum|))
          |n|)
-        ('T (|error| "Not an integer")))))) 
+        (T (|error| "Not an integer")))))) 
 
 (DEFUN |DFLOAT;retractIfCan;$U;83| (|x| $)
   (PROG (|n|)
@@ -669,7 +668,7 @@
                          |DFLOAT;retractIfCan;$U;83|)
                    |$DoubleFloatMaximum|))
          (CONS 0 |n|))
-        ('T (CONS 1 "failed")))))) 
+        (T (CONS 1 "failed")))))) 
 
 (DEFUN |DFLOAT;sign;$I;84| (|x| $)
   (|DFLOAT;retract;$I;82| (FLOAT-SIGN |x| 1.0) $)) 
@@ -681,24 +680,23 @@
     (RETURN
       (SEQ (COND
              ((ZEROP |x|) (CONS 0 0))
-             ('T
-              (SEQ (LETT |s| (|DFLOAT;sign;$I;84| |x| $)
-                         |DFLOAT;manexp|)
-                   (SETQ |x| (ABS |x|))
-                   (COND
-                     ((< |$DoubleFloatMaximum| |x|)
-                      (RETURN-FROM |DFLOAT;manexp|
-                        (CONS (+ (* |s|
+             (T (SEQ (LETT |s| (|DFLOAT;sign;$I;84| |x| $)
+                           |DFLOAT;manexp|)
+                     (SETQ |x| (ABS |x|))
+                     (COND
+                       ((< |$DoubleFloatMaximum| |x|)
+                        (RETURN-FROM |DFLOAT;manexp|
+                          (CONS (+ (* |s|
                                     (|DFLOAT;mantissa;$I;7|
                                      |$DoubleFloatMaximum| $))
-                                 1)
-                              (|DFLOAT;exponent;$I;8|
-                                  |$DoubleFloatMaximum| $)))))
-                   (LETT |me| (MANEXP |x|) |DFLOAT;manexp|)
-                   (LETT |two53| (EXPT 2 53) |DFLOAT;manexp|)
-                   (EXIT (CONS (* |s|
-                                  (TRUNCATE (* |two53| (CAR |me|))))
-                               (- (CDR |me|) 53)))))))))) 
+                                   1)
+                                (|DFLOAT;exponent;$I;8|
+                                    |$DoubleFloatMaximum| $)))))
+                     (LETT |me| (MANEXP |x|) |DFLOAT;manexp|)
+                     (LETT |two53| (EXPT 2 53) |DFLOAT;manexp|)
+                     (EXIT (CONS (* |s|
+                                    (TRUNCATE (* |two53| (CAR |me|))))
+                                 (- (CDR |me|) 53)))))))))) 
 
 (DEFUN |DFLOAT;rationalApproximation;$2NniF;87| (|f| |d| |b| $)
   (PROG (BASE |de| |tol| |s| |t| |p0| |p1| |q0| |q1| |#G107| |q| |r|
@@ -717,88 +715,87 @@
                                    (|check-subtype| (NOT (MINUSP |ex|))
                                     '(|NonNegativeInteger|) |ex|)))
                           (|getShellEntry| $ 134)))
-                     ('T
-                      (SEQ (LETT |de|
-                                 (EXPT BASE
-                                       (LET ((#0=#:G1550 (- |ex|)))
-                                         (|check-subtype|
-                                          (NOT (MINUSP #0#))
-                                          '(|NonNegativeInteger|) #0#)))
-                                 |DFLOAT;rationalApproximation;$2NniF;87|)
-                           (EXIT (COND
-                                   ((< |b| 2)
-                                    (|error| "base must be > 1"))
-                                   ('T
-                                    (SEQ
-                                     (LETT |tol| (EXPT |b| |d|)
-                                      |DFLOAT;rationalApproximation;$2NniF;87|)
-                                     (LETT |s| |nu|
-                                      |DFLOAT;rationalApproximation;$2NniF;87|)
-                                     (LETT |t| |de|
-                                      |DFLOAT;rationalApproximation;$2NniF;87|)
-                                     (LETT |p0| 0
-                                      |DFLOAT;rationalApproximation;$2NniF;87|)
-                                     (LETT |p1| 1
-                                      |DFLOAT;rationalApproximation;$2NniF;87|)
-                                     (LETT |q0| 1
-                                      |DFLOAT;rationalApproximation;$2NniF;87|)
-                                     (LETT |q1| 0
-                                      |DFLOAT;rationalApproximation;$2NniF;87|)
-                                     (EXIT
-                                      (LOOP
-                                        (COND
-                                          (NIL (RETURN NIL))
-                                          (T
-                                           (SEQ
-                                            (LETT |#G107|
-                                             (DIVIDE2 |s| |t|)
-                                             |DFLOAT;rationalApproximation;$2NniF;87|)
-                                            (LETT |q| (CAR |#G107|)
-                                             |DFLOAT;rationalApproximation;$2NniF;87|)
-                                            (LETT |r| (CDR |#G107|)
-                                             |DFLOAT;rationalApproximation;$2NniF;87|)
-                                            |#G107|
-                                            (LETT |p2|
-                                             (+ (* |q| |p1|) |p0|)
-                                             |DFLOAT;rationalApproximation;$2NniF;87|)
-                                            (LETT |q2|
-                                             (+ (* |q| |q1|) |q0|)
-                                             |DFLOAT;rationalApproximation;$2NniF;87|)
-                                            (COND
-                                              ((OR (ZEROP |r|)
-                                                (<
-                                                 (SPADCALL |tol|
-                                                  (ABS
-                                                   (- (* |nu| |q2|)
-                                                    (* |de| |p2|)))
-                                                  (|getShellEntry| $
-                                                   143))
-                                                 (* |de| (ABS |p2|))))
-                                               (RETURN-FROM
-                                                |DFLOAT;rationalApproximation;$2NniF;87|
-                                                 (SPADCALL |p2| |q2|
-                                                  (|getShellEntry| $
-                                                   141)))))
-                                            (LETT |#G108| |p1|
-                                             |DFLOAT;rationalApproximation;$2NniF;87|)
-                                            (LETT |#G109| |p2|
-                                             |DFLOAT;rationalApproximation;$2NniF;87|)
-                                            (SETQ |p0| |#G108|)
-                                            (SETQ |p1| |#G109|)
-                                            (LETT |#G110| |q1|
-                                             |DFLOAT;rationalApproximation;$2NniF;87|)
-                                            (LETT |#G111| |q2|
-                                             |DFLOAT;rationalApproximation;$2NniF;87|)
-                                            (SETQ |q0| |#G110|)
-                                            (SETQ |q1| |#G111|)
-                                            (EXIT
-                                             (PROGN
-                                               (LETT |#G112| |t|
-                                                |DFLOAT;rationalApproximation;$2NniF;87|)
-                                               (LETT |#G113| |r|
-                                                |DFLOAT;rationalApproximation;$2NniF;87|)
-                                               (SETQ |s| |#G112|)
-                                               (SETQ |t| |#G113|))))))))))))))))))))) 
+                     (T (SEQ (LETT |de|
+                                   (EXPT BASE
+                                    (LET ((#0=#:G1550 (- |ex|)))
+                                      (|check-subtype|
+                                       (NOT (MINUSP #0#))
+                                       '(|NonNegativeInteger|) #0#)))
+                                   |DFLOAT;rationalApproximation;$2NniF;87|)
+                             (EXIT (COND
+                                     ((< |b| 2)
+                                      (|error| "base must be > 1"))
+                                     (T
+                                      (SEQ
+                                       (LETT |tol| (EXPT |b| |d|)
+                                        |DFLOAT;rationalApproximation;$2NniF;87|)
+                                       (LETT |s| |nu|
+                                        |DFLOAT;rationalApproximation;$2NniF;87|)
+                                       (LETT |t| |de|
+                                        |DFLOAT;rationalApproximation;$2NniF;87|)
+                                       (LETT |p0| 0
+                                        |DFLOAT;rationalApproximation;$2NniF;87|)
+                                       (LETT |p1| 1
+                                        |DFLOAT;rationalApproximation;$2NniF;87|)
+                                       (LETT |q0| 1
+                                        |DFLOAT;rationalApproximation;$2NniF;87|)
+                                       (LETT |q1| 0
+                                        |DFLOAT;rationalApproximation;$2NniF;87|)
+                                       (EXIT
+                                        (LOOP
+                                          (COND
+                                            (NIL (RETURN NIL))
+                                            (T
+                                             (SEQ
+                                              (LETT |#G107|
+                                               (DIVIDE2 |s| |t|)
+                                               |DFLOAT;rationalApproximation;$2NniF;87|)
+                                              (LETT |q| (CAR |#G107|)
+                                               |DFLOAT;rationalApproximation;$2NniF;87|)
+                                              (LETT |r| (CDR |#G107|)
+                                               |DFLOAT;rationalApproximation;$2NniF;87|)
+                                              |#G107|
+                                              (LETT |p2|
+                                               (+ (* |q| |p1|) |p0|)
+                                               |DFLOAT;rationalApproximation;$2NniF;87|)
+                                              (LETT |q2|
+                                               (+ (* |q| |q1|) |q0|)
+                                               |DFLOAT;rationalApproximation;$2NniF;87|)
+                                              (COND
+                                                ((OR (ZEROP |r|)
+                                                  (<
+                                                   (SPADCALL |tol|
+                                                    (ABS
+                                                     (- (* |nu| |q2|)
+                                                      (* |de| |p2|)))
+                                                    (|getShellEntry| $
+                                                     143))
+                                                   (* |de| (ABS |p2|))))
+                                                 (RETURN-FROM
+                                                  |DFLOAT;rationalApproximation;$2NniF;87|
+                                                   (SPADCALL |p2| |q2|
+                                                    (|getShellEntry| $
+                                                     141)))))
+                                              (LETT |#G108| |p1|
+                                               |DFLOAT;rationalApproximation;$2NniF;87|)
+                                              (LETT |#G109| |p2|
+                                               |DFLOAT;rationalApproximation;$2NniF;87|)
+                                              (SETQ |p0| |#G108|)
+                                              (SETQ |p1| |#G109|)
+                                              (LETT |#G110| |q1|
+                                               |DFLOAT;rationalApproximation;$2NniF;87|)
+                                              (LETT |#G111| |q2|
+                                               |DFLOAT;rationalApproximation;$2NniF;87|)
+                                              (SETQ |q0| |#G110|)
+                                              (SETQ |q1| |#G111|)
+                                              (EXIT
+                                               (PROGN
+                                                 (LETT |#G112| |t|
+                                                  |DFLOAT;rationalApproximation;$2NniF;87|)
+                                                 (LETT |#G113| |r|
+                                                  |DFLOAT;rationalApproximation;$2NniF;87|)
+                                                 (SETQ |s| |#G112|)
+                                                 (SETQ |t| |#G113|))))))))))))))))))))) 
 
 (DEFUN |DFLOAT;**;$F$;88| (|x| |r| $)
   (PROG (|n| |d|)
@@ -810,39 +807,44 @@
                  (|error| "0**0 is undefined"))
                 ((SPADCALL |r| (|getShellEntry| $ 146))
                  (|error| "division by 0"))
-                ('T 0.0)))
+                (T 0.0)))
              ((OR (SPADCALL |r| (|getShellEntry| $ 145)) (= |x| 1.0))
               1.0)
-             ('T
-              (COND
-                ((SPADCALL |r| (|getShellEntry| $ 147)) |x|)
-                ('T
-                 (SEQ (LETT |n| (SPADCALL |r| (|getShellEntry| $ 148))
-                            |DFLOAT;**;$F$;88|)
-                      (LETT |d| (SPADCALL |r| (|getShellEntry| $ 149))
-                            |DFLOAT;**;$F$;88|)
-                      (EXIT (COND
-                              ((MINUSP |x|)
-                               (COND
-                                 ((ODDP |d|)
-                                  (COND
-                                    ((ODDP |n|)
-                                     (RETURN-FROM |DFLOAT;**;$F$;88|
-                                       (-
-                                        (|DFLOAT;**;$F$;88| (- |x|) |r|
-                                         $))))
-                                    ('T
-                                     (RETURN-FROM |DFLOAT;**;$F$;88|
-                                       (|DFLOAT;**;$F$;88| (- |x|) |r|
-                                        $)))))
-                                 ('T (|error| "negative root"))))
-                              ((EQL |d| 2)
-                               (EXPT (|DFLOAT;sqrt;2$;33| |x| $) |n|))
-                              ('T
-                               (|DFLOAT;**;3$;36| |x|
-                                   (/ (FLOAT |n| |$DoubleFloatMaximum|)
-                                    (FLOAT |d| |$DoubleFloatMaximum|))
-                                   $))))))))))))) 
+             (T (COND
+                  ((SPADCALL |r| (|getShellEntry| $ 147)) |x|)
+                  (T (SEQ (LETT |n|
+                                (SPADCALL |r| (|getShellEntry| $ 148))
+                                |DFLOAT;**;$F$;88|)
+                          (LETT |d|
+                                (SPADCALL |r| (|getShellEntry| $ 149))
+                                |DFLOAT;**;$F$;88|)
+                          (EXIT (COND
+                                  ((MINUSP |x|)
+                                   (COND
+                                     ((ODDP |d|)
+                                      (COND
+                                        ((ODDP |n|)
+                                         (RETURN-FROM
+                                          |DFLOAT;**;$F$;88|
+                                           (-
+                                            (|DFLOAT;**;$F$;88| (- |x|)
+                                             |r| $))))
+                                        (T
+                                         (RETURN-FROM
+                                          |DFLOAT;**;$F$;88|
+                                           (|DFLOAT;**;$F$;88| (- |x|)
+                                            |r| $)))))
+                                     (T (|error| "negative root"))))
+                                  ((EQL |d| 2)
+                                   (EXPT (|DFLOAT;sqrt;2$;33| |x| $)
+                                    |n|))
+                                  (T (|DFLOAT;**;3$;36| |x|
+                                      (/
+                                       (FLOAT |n|
+                                        |$DoubleFloatMaximum|)
+                                       (FLOAT |d|
+                                        |$DoubleFloatMaximum|))
+                                      $))))))))))))) 
 
 (DEFUN |DoubleFloat| ()
   (DECLARE (SPECIAL |$ConstructorCache|))
@@ -851,14 +853,13 @@
       (COND
         ((SETQ #0# (HGET |$ConstructorCache| '|DoubleFloat|))
          (|CDRwithIncrement| (CDAR #0#)))
-        ('T
-         (UNWIND-PROTECT
-           (PROG1 (CDDAR (HPUT |$ConstructorCache| '|DoubleFloat|
-                               (LIST (CONS NIL
-                                      (CONS 1 (|DoubleFloat;|))))))
-             (SETQ #0# T))
-           (COND
-             ((NOT #0#) (HREM |$ConstructorCache| '|DoubleFloat|))))))))) 
+        (T (UNWIND-PROTECT
+             (PROG1 (CDDAR (HPUT |$ConstructorCache| '|DoubleFloat|
+                                 (LIST (CONS NIL
+                                        (CONS 1 (|DoubleFloat;|))))))
+               (SETQ #0# T))
+             (COND
+               ((NOT #0#) (HREM |$ConstructorCache| '|DoubleFloat|))))))))) 
 
 (DEFUN |DoubleFloat;| ()
   (LET ((|dv$| (LIST '|DoubleFloat|)) ($ (|newShell| 164))

Modified: jap-sandbox/src/algebra/strap/DIVRING-.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/DIVRING-.lsp	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/algebra/strap/DIVRING-.lsp	2010-07-26 02:29:37 UTC (rev 1710)
@@ -11,11 +11,11 @@
   (COND
     ((ZEROP |n|) (|spadConstant| $ 10))
     ((SPADCALL |x| (|getShellEntry| $ 11))
-     (COND ((MINUSP |n|) (|error| "division by zero")) ('T |x|)))
+     (COND ((MINUSP |n|) (|error| "division by zero")) (T |x|)))
     ((MINUSP |n|)
      (SPADCALL (SPADCALL |x| (|getShellEntry| $ 15)) (- |n|)
          (|getShellEntry| $ 19)))
-    ('T (SPADCALL |x| |n| (|getShellEntry| $ 19))))) 
+    (T (SPADCALL |x| |n| (|getShellEntry| $ 19))))) 
 
 (DEFUN |DIVRING-;*;F2S;2| (|q| |x| $)
   (SPADCALL

Modified: jap-sandbox/src/algebra/strap/EUCDOM-.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/EUCDOM-.lsp	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/algebra/strap/EUCDOM-.lsp	2010-07-26 02:29:37 UTC (rev 1710)
@@ -39,9 +39,8 @@
   (COND
     ((SPADCALL |y| (|getShellEntry| $ 8)) NIL)
     ((SPADCALL |x| (|getShellEntry| $ 8)) T)
-    ('T
-     (< (SPADCALL |x| (|getShellEntry| $ 12))
-        (SPADCALL |y| (|getShellEntry| $ 12)))))) 
+    (T (< (SPADCALL |x| (|getShellEntry| $ 12))
+          (SPADCALL |y| (|getShellEntry| $ 12)))))) 
 
 (DEFUN |EUCDOM-;quo;3S;2| (|x| |y| $)
   (CAR (SPADCALL |x| |y| (|getShellEntry| $ 16)))) 
@@ -56,13 +55,14 @@
              ((SPADCALL |x| (|getShellEntry| $ 8))
               (CONS 0 (|spadConstant| $ 19)))
              ((SPADCALL |y| (|getShellEntry| $ 8)) (CONS 1 "failed"))
-             ('T
-              (SEQ (LETT |qr| (SPADCALL |x| |y| (|getShellEntry| $ 16))
-                         |EUCDOM-;exquo;2SU;4|)
-                   (EXIT (COND
-                           ((SPADCALL (CDR |qr|) (|getShellEntry| $ 8))
-                            (CONS 0 (CAR |qr|)))
-                           ('T (CONS 1 "failed"))))))))))) 
+             (T (SEQ (LETT |qr|
+                           (SPADCALL |x| |y| (|getShellEntry| $ 16))
+                           |EUCDOM-;exquo;2SU;4|)
+                     (EXIT (COND
+                             ((SPADCALL (CDR |qr|)
+                                  (|getShellEntry| $ 8))
+                              (CONS 0 (CAR |qr|)))
+                             (T (CONS 1 "failed"))))))))))) 
 
 (DEFUN |EUCDOM-;gcd;3S;5| (|x| |y| $)
   (PROG (|#G13| |#G14|)
@@ -90,12 +90,11 @@
     (SEQ |#G16|
          (EXIT (COND
                  ((SPADCALL |a| (|getShellEntry| $ 28)) |s|)
-                 ('T
-                  (VECTOR (SPADCALL |a| (QVELT |s| 0)
-                              (|getShellEntry| $ 29))
-                          (SPADCALL |a| (QVELT |s| 1)
-                              (|getShellEntry| $ 29))
-                          |c|))))))) 
+                 (T (VECTOR (SPADCALL |a| (QVELT |s| 0)
+                                (|getShellEntry| $ 29))
+                            (SPADCALL |a| (QVELT |s| 1)
+                                (|getShellEntry| $ 29))
+                            |c|))))))) 
 
 (DEFUN |EUCDOM-;extendedEuclidean;2SR;7| (|x| |y| $)
   (PROG (|s3| |qr|)
@@ -111,53 +110,54 @@
         (COND
           ((SPADCALL |y| (|getShellEntry| $ 8)) |s1|)
           ((SPADCALL |x| (|getShellEntry| $ 8)) |s2|)
-          ('T
-           (SEQ (LOOP
+          (T (SEQ (LOOP
+                    (COND
+                      ((NOT (NOT (SPADCALL (QVELT |s2| 2)
+                                     (|getShellEntry| $ 8))))
+                       (RETURN NIL))
+                      (T (SEQ (LETT |qr|
+                                    (SPADCALL (QVELT |s1| 2)
+                                     (QVELT |s2| 2)
+                                     (|getShellEntry| $ 16))
+                                    |EUCDOM-;extendedEuclidean;2SR;7|)
+                              (LETT |s3|
+                                    (VECTOR
+                                     (SPADCALL (QVELT |s1| 0)
+                                      (SPADCALL (CAR |qr|)
+                                       (QVELT |s2| 0)
+                                       (|getShellEntry| $ 29))
+                                      (|getShellEntry| $ 31))
+                                     (SPADCALL (QVELT |s1| 1)
+                                      (SPADCALL (CAR |qr|)
+                                       (QVELT |s2| 1)
+                                       (|getShellEntry| $ 29))
+                                      (|getShellEntry| $ 31))
+                                     (CDR |qr|))
+                                    |EUCDOM-;extendedEuclidean;2SR;7|)
+                              (SETQ |s1| |s2|)
+                              (EXIT (SETQ |s2|
+                                     (|EUCDOM-;unitNormalizeIdealElt|
+                                      |s3| $)))))))
                   (COND
-                    ((NOT (NOT (SPADCALL (QVELT |s2| 2)
-                                   (|getShellEntry| $ 8))))
-                     (RETURN NIL))
-                    (T (SEQ (LETT |qr|
-                                  (SPADCALL (QVELT |s1| 2)
-                                      (QVELT |s2| 2)
-                                      (|getShellEntry| $ 16))
-                                  |EUCDOM-;extendedEuclidean;2SR;7|)
-                            (LETT |s3|
-                                  (VECTOR (SPADCALL (QVELT |s1| 0)
-                                           (SPADCALL (CAR |qr|)
-                                            (QVELT |s2| 0)
-                                            (|getShellEntry| $ 29))
-                                           (|getShellEntry| $ 31))
-                                          (SPADCALL (QVELT |s1| 1)
-                                           (SPADCALL (CAR |qr|)
-                                            (QVELT |s2| 1)
-                                            (|getShellEntry| $ 29))
-                                           (|getShellEntry| $ 31))
-                                          (CDR |qr|))
-                                  |EUCDOM-;extendedEuclidean;2SR;7|)
-                            (SETQ |s1| |s2|)
-                            (EXIT (SETQ |s2|
-                                        (|EUCDOM-;unitNormalizeIdealElt|
-                                         |s3| $)))))))
-                (COND
-                  ((NOT (SPADCALL (QVELT |s1| 0) (|getShellEntry| $ 8)))
-                   (COND
-                     ((NOT (SPADCALL (QVELT |s1| 0) |y|
-                               (|getShellEntry| $ 32)))
-                      (SEQ (LETT |qr|
-                                 (SPADCALL (QVELT |s1| 0) |y|
-                                     (|getShellEntry| $ 16))
-                                 |EUCDOM-;extendedEuclidean;2SR;7|)
-                           (QSETVELT |s1| 0 (CDR |qr|))
-                           (QSETVELT |s1| 1
-                               (SPADCALL (QVELT |s1| 1)
-                                   (SPADCALL (CAR |qr|) |x|
-                                    (|getShellEntry| $ 29))
-                                   (|getShellEntry| $ 33)))
-                           (EXIT (SETQ |s1|
-                                       (|EUCDOM-;unitNormalizeIdealElt|
-                                        |s1| $))))))))
-                (EXIT |s1|)))))))) 
+                    ((NOT (SPADCALL (QVELT |s1| 0)
+                              (|getShellEntry| $ 8)))
+                     (COND
+                       ((NOT (SPADCALL (QVELT |s1| 0) |y|
+                                 (|getShellEntry| $ 32)))
+                        (SEQ (LETT |qr|
+                                   (SPADCALL (QVELT |s1| 0) |y|
+                                    (|getShellEntry| $ 16))
+                                   |EUCDOM-;extendedEuclidean;2SR;7|)
+                             (QSETVELT |s1| 0 (CDR |qr|))
+                             (QSETVELT |s1| 1
+                                 (SPADCALL (QVELT |s1| 1)
+                                     (SPADCALL (CAR |qr|) |x|
+                                      (|getShellEntry| $ 29))
+                                     (|getShellEntry| $ 33)))
+                             (EXIT (SETQ |s1|
+                                    (|EUCDOM-;unitNormalizeIdealElt|
+                                     |s1| $))))))))
+                  (EXIT |s1|)))))))) 
 
 (DEFUN |EUCDOM-;extendedEuclidean;3SU;8| (|x| |y| |z| $)
   (PROG (|s| |w| |qr|)
@@ -166,40 +166,39 @@
              ((SPADCALL |z| (|getShellEntry| $ 8))
               (CONS 0
                     (CONS (|spadConstant| $ 19) (|spadConstant| $ 19))))
-             ('T
-              (SEQ (LETT |s| (SPADCALL |x| |y| (|getShellEntry| $ 36))
-                         |EUCDOM-;extendedEuclidean;3SU;8|)
-                   (LETT |w|
-                         (SPADCALL |z| (QVELT |s| 2)
-                             (|getShellEntry| $ 37))
-                         |EUCDOM-;extendedEuclidean;3SU;8|)
-                   (EXIT (COND
-                           ((EQL (CAR |w|) 1) (CONS 1 "failed"))
-                           ((SPADCALL |y| (|getShellEntry| $ 8))
-                            (CONS 0
-                                  (CONS (SPADCALL (QVELT |s| 0)
-                                         (CDR |w|)
-                                         (|getShellEntry| $ 29))
-                                        (SPADCALL (QVELT |s| 1)
-                                         (CDR |w|)
-                                         (|getShellEntry| $ 29)))))
-                           ('T
-                            (SEQ (LETT |qr|
-                                       (SPADCALL
-                                        (SPADCALL (QVELT |s| 0)
-                                         (CDR |w|)
-                                         (|getShellEntry| $ 29))
-                                        |y| (|getShellEntry| $ 16))
-                                       |EUCDOM-;extendedEuclidean;3SU;8|)
-                                 (EXIT (CONS 0
-                                        (CONS (CDR |qr|)
-                                         (SPADCALL
-                                          (SPADCALL (QVELT |s| 1)
-                                           (CDR |w|)
-                                           (|getShellEntry| $ 29))
-                                          (SPADCALL (CAR |qr|) |x|
-                                           (|getShellEntry| $ 29))
-                                          (|getShellEntry| $ 33)))))))))))))))) 
+             (T (SEQ (LETT |s|
+                           (SPADCALL |x| |y| (|getShellEntry| $ 36))
+                           |EUCDOM-;extendedEuclidean;3SU;8|)
+                     (LETT |w|
+                           (SPADCALL |z| (QVELT |s| 2)
+                               (|getShellEntry| $ 37))
+                           |EUCDOM-;extendedEuclidean;3SU;8|)
+                     (EXIT (COND
+                             ((EQL (CAR |w|) 1) (CONS 1 "failed"))
+                             ((SPADCALL |y| (|getShellEntry| $ 8))
+                              (CONS 0
+                                    (CONS
+                                     (SPADCALL (QVELT |s| 0) (CDR |w|)
+                                      (|getShellEntry| $ 29))
+                                     (SPADCALL (QVELT |s| 1) (CDR |w|)
+                                      (|getShellEntry| $ 29)))))
+                             (T (SEQ (LETT |qr|
+                                      (SPADCALL
+                                       (SPADCALL (QVELT |s| 0)
+                                        (CDR |w|)
+                                        (|getShellEntry| $ 29))
+                                       |y| (|getShellEntry| $ 16))
+                                      |EUCDOM-;extendedEuclidean;3SU;8|)
+                                     (EXIT
+                                      (CONS 0
+                                       (CONS (CDR |qr|)
+                                        (SPADCALL
+                                         (SPADCALL (QVELT |s| 1)
+                                          (CDR |w|)
+                                          (|getShellEntry| $ 29))
+                                         (SPADCALL (CAR |qr|) |x|
+                                          (|getShellEntry| $ 29))
+                                         (|getShellEntry| $ 33)))))))))))))))) 
 
 (DEFUN |EUCDOM-;principalIdeal;LR;9| (|l| $)
   (PROG (|uca| |v| |u|)
@@ -221,32 +220,32 @@
                          |EUCDOM-;principalIdeal;LR;9|)
                    (EXIT (CONS (LIST (QVELT |u| 0) (QVELT |u| 1))
                                (QVELT |u| 2)))))
-             ('T
-              (SEQ (LETT |v|
-                         (SPADCALL (CDR |l|) (|getShellEntry| $ 48))
-                         |EUCDOM-;principalIdeal;LR;9|)
-                   (LETT |u|
-                         (SPADCALL (|SPADfirst| |l|) (CDR |v|)
-                             (|getShellEntry| $ 36))
-                         |EUCDOM-;principalIdeal;LR;9|)
-                   (EXIT (CONS (CONS (QVELT |u| 0)
-                                     (LET
-                                      ((#0=#:G1519 (CAR |v|))
-                                       (#1=#:G1518 NIL))
-                                       (LOOP
-                                         (COND
-                                           ((ATOM #0#)
-                                            (RETURN (NREVERSE #1#)))
-                                           (T
-                                            (LET ((|vv| (CAR #0#)))
-                                              (SETQ #1#
-                                               (CONS
-                                                (SPADCALL (QVELT |u| 1)
-                                                 |vv|
-                                                 (|getShellEntry| $ 29))
-                                                #1#)))))
-                                         (SETQ #0# (CDR #0#)))))
-                               (QVELT |u| 2)))))))))) 
+             (T (SEQ (LETT |v|
+                           (SPADCALL (CDR |l|) (|getShellEntry| $ 48))
+                           |EUCDOM-;principalIdeal;LR;9|)
+                     (LETT |u|
+                           (SPADCALL (|SPADfirst| |l|) (CDR |v|)
+                               (|getShellEntry| $ 36))
+                           |EUCDOM-;principalIdeal;LR;9|)
+                     (EXIT (CONS (CONS (QVELT |u| 0)
+                                       (LET
+                                        ((#0=#:G1519 (CAR |v|))
+                                         (#1=#:G1518 NIL))
+                                         (LOOP
+                                           (COND
+                                             ((ATOM #0#)
+                                              (RETURN (NREVERSE #1#)))
+                                             (T
+                                              (LET ((|vv| (CAR #0#)))
+                                                (SETQ #1#
+                                                 (CONS
+                                                  (SPADCALL
+                                                   (QVELT |u| 1) |vv|
+                                                   (|getShellEntry| $
+                                                    29))
+                                                  #1#)))))
+                                           (SETQ #0# (CDR #0#)))))
+                                 (QVELT |u| 2)))))))))) 
 
 (DEFUN |EUCDOM-;expressIdealMember;LSU;10| (|l| |z| $)
   (PROG (|pid| |q|)
@@ -263,31 +262,32 @@
                                (SETQ #1#
                                      (CONS (|spadConstant| $ 19) #1#)))))
                         (SETQ #0# (CDR #0#))))))
-             ('T
-              (SEQ (LETT |pid| (SPADCALL |l| (|getShellEntry| $ 48))
-                         |EUCDOM-;expressIdealMember;LSU;10|)
-                   (LETT |q|
-                         (SPADCALL |z| (CDR |pid|)
-                             (|getShellEntry| $ 37))
-                         |EUCDOM-;expressIdealMember;LSU;10|)
-                   (EXIT (COND
-                           ((EQL (CAR |q|) 1) (CONS 1 "failed"))
-                           ('T
-                            (CONS 0
-                                  (LET ((#2=#:G1523 (CAR |pid|))
+             (T (SEQ (LETT |pid| (SPADCALL |l| (|getShellEntry| $ 48))
+                           |EUCDOM-;expressIdealMember;LSU;10|)
+                     (LETT |q|
+                           (SPADCALL |z| (CDR |pid|)
+                               (|getShellEntry| $ 37))
+                           |EUCDOM-;expressIdealMember;LSU;10|)
+                     (EXIT (COND
+                             ((EQL (CAR |q|) 1) (CONS 1 "failed"))
+                             (T (CONS 0
+                                      (LET
+                                       ((#2=#:G1523 (CAR |pid|))
                                         (#3=#:G1522 NIL))
-                                    (LOOP
-                                      (COND
-                                        ((ATOM #2#)
-                                         (RETURN (NREVERSE #3#)))
-                                        (T
-                                         (LET ((|v| (CAR #2#)))
-                                           (SETQ #3#
-                                            (CONS
-                                             (SPADCALL (CDR |q|) |v|
-                                              (|getShellEntry| $ 29))
-                                             #3#)))))
-                                      (SETQ #2# (CDR #2#))))))))))))))) 
+                                        (LOOP
+                                          (COND
+                                            ((ATOM #2#)
+                                             (RETURN (NREVERSE #3#)))
+                                            (T
+                                             (LET ((|v| (CAR #2#)))
+                                               (SETQ #3#
+                                                (CONS
+                                                 (SPADCALL (CDR |q|)
+                                                  |v|
+                                                  (|getShellEntry| $
+                                                   29))
+                                                 #3#)))))
+                                          (SETQ #2# (CDR #2#))))))))))))))) 
 
 (DEFUN |EUCDOM-;multiEuclidean;LSU;11| (|l| |z| $)
   (PROG (|l1| |l2| |u| |v1| |v2|)
@@ -296,80 +296,80 @@
         (COND
           ((ZEROP |n|) (|error| "empty list passed to multiEuclidean"))
           ((EQL |n| 1) (CONS 0 (LIST |z|)))
-          ('T
-           (SEQ (LETT |l1| (SPADCALL |l| (|getShellEntry| $ 58))
-                      |EUCDOM-;multiEuclidean;LSU;11|)
-                (LETT |l2|
-                      (SPADCALL |l1| (QUOTIENT2 |n| 2)
-                          (|getShellEntry| $ 61))
-                      |EUCDOM-;multiEuclidean;LSU;11|)
-                (LETT |u|
-                      (SPADCALL
-                          (LET ((#0=#:G1504 NIL) (#1=#:G1505 T)
-                                (#2=#:G1524 |l1|))
-                            (LOOP
-                              (COND
-                                ((ATOM #2#)
-                                 (RETURN
-                                   (COND
-                                     (#1# (|spadConstant| $ 30))
-                                     (T #0#))))
-                                (T (LET ((#3=#:G1397 (CAR #2#)))
-                                     (LET ((#4=#:G1503 #3#))
-                                       (COND
-                                         (#1# (SETQ #0# #4#))
-                                         (T
-                                          (SETQ #0#
-                                           (SPADCALL #0# #4#
-                                            (|getShellEntry| $ 29)))))
-                                       (SETQ #1# NIL)))))
-                              (SETQ #2# (CDR #2#))))
-                          (LET ((#5=#:G1507 NIL) (#6=#:G1508 T)
-                                (#7=#:G1525 |l2|))
-                            (LOOP
-                              (COND
-                                ((ATOM #7#)
-                                 (RETURN
-                                   (COND
-                                     (#6# (|spadConstant| $ 30))
-                                     (T #5#))))
-                                (T (LET ((#8=#:G1398 (CAR #7#)))
-                                     (LET ((#9=#:G1506 #8#))
-                                       (COND
-                                         (#6# (SETQ #5# #9#))
-                                         (T
-                                          (SETQ #5#
-                                           (SPADCALL #5# #9#
-                                            (|getShellEntry| $ 29)))))
-                                       (SETQ #6# NIL)))))
-                              (SETQ #7# (CDR #7#))))
-                          |z| (|getShellEntry| $ 62))
-                      |EUCDOM-;multiEuclidean;LSU;11|)
-                (EXIT (COND
-                        ((EQL (CAR |u|) 1) (CONS 1 "failed"))
-                        ('T
-                         (SEQ (LETT |v1|
-                                    (SPADCALL |l1| (CDR (CDR |u|))
-                                     (|getShellEntry| $ 63))
-                                    |EUCDOM-;multiEuclidean;LSU;11|)
-                              (EXIT (COND
-                                      ((EQL (CAR |v1|) 1)
-                                       (CONS 1 "failed"))
-                                      ('T
-                                       (SEQ
-                                        (LETT |v2|
-                                         (SPADCALL |l2| (CAR (CDR |u|))
-                                          (|getShellEntry| $ 63))
-                                         |EUCDOM-;multiEuclidean;LSU;11|)
-                                        (EXIT
+          (T (SEQ (LETT |l1| (SPADCALL |l| (|getShellEntry| $ 58))
+                        |EUCDOM-;multiEuclidean;LSU;11|)
+                  (LETT |l2|
+                        (SPADCALL |l1| (QUOTIENT2 |n| 2)
+                            (|getShellEntry| $ 61))
+                        |EUCDOM-;multiEuclidean;LSU;11|)
+                  (LETT |u|
+                        (SPADCALL
+                            (LET ((#0=#:G1504 NIL) (#1=#:G1505 T)
+                                  (#2=#:G1524 |l1|))
+                              (LOOP
+                                (COND
+                                  ((ATOM #2#)
+                                   (RETURN
+                                     (COND
+                                       (#1# (|spadConstant| $ 30))
+                                       (T #0#))))
+                                  (T (LET ((#3=#:G1397 (CAR #2#)))
+                                       (LET ((#4=#:G1503 #3#))
                                          (COND
-                                           ((EQL (CAR |v2|) 1)
-                                            (CONS 1 "failed"))
-                                           ('T
-                                            (CONS 0
-                                             (SPADCALL (CDR |v1|)
-                                              (CDR |v2|)
-                                              (|getShellEntry| $ 64))))))))))))))))))))) 
+                                           (#1# (SETQ #0# #4#))
+                                           (T
+                                            (SETQ #0#
+                                             (SPADCALL #0# #4#
+                                              (|getShellEntry| $ 29)))))
+                                         (SETQ #1# NIL)))))
+                                (SETQ #2# (CDR #2#))))
+                            (LET ((#5=#:G1507 NIL) (#6=#:G1508 T)
+                                  (#7=#:G1525 |l2|))
+                              (LOOP
+                                (COND
+                                  ((ATOM #7#)
+                                   (RETURN
+                                     (COND
+                                       (#6# (|spadConstant| $ 30))
+                                       (T #5#))))
+                                  (T (LET ((#8=#:G1398 (CAR #7#)))
+                                       (LET ((#9=#:G1506 #8#))
+                                         (COND
+                                           (#6# (SETQ #5# #9#))
+                                           (T
+                                            (SETQ #5#
+                                             (SPADCALL #5# #9#
+                                              (|getShellEntry| $ 29)))))
+                                         (SETQ #6# NIL)))))
+                                (SETQ #7# (CDR #7#))))
+                            |z| (|getShellEntry| $ 62))
+                        |EUCDOM-;multiEuclidean;LSU;11|)
+                  (EXIT (COND
+                          ((EQL (CAR |u|) 1) (CONS 1 "failed"))
+                          (T (SEQ (LETT |v1|
+                                        (SPADCALL |l1| (CDR (CDR |u|))
+                                         (|getShellEntry| $ 63))
+                                        |EUCDOM-;multiEuclidean;LSU;11|)
+                                  (EXIT (COND
+                                          ((EQL (CAR |v1|) 1)
+                                           (CONS 1 "failed"))
+                                          (T
+                                           (SEQ
+                                            (LETT |v2|
+                                             (SPADCALL |l2|
+                                              (CAR (CDR |u|))
+                                              (|getShellEntry| $ 63))
+                                             |EUCDOM-;multiEuclidean;LSU;11|)
+                                            (EXIT
+                                             (COND
+                                               ((EQL (CAR |v2|) 1)
+                                                (CONS 1 "failed"))
+                                               (T
+                                                (CONS 0
+                                                 (SPADCALL (CDR |v1|)
+                                                  (CDR |v2|)
+                                                  (|getShellEntry| $
+                                                   64))))))))))))))))))))) 
 
 (DEFUN |EuclideanDomain&| (|#1|)
   (LET* ((|dv$1| (|devaluate| |#1|))

Modified: jap-sandbox/src/algebra/strap/FFIELDC-.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/FFIELDC-.lsp	2010-07-26 02:25:42 UTC (rev 1709)
+++ jap-sandbox/src/algebra/strap/FFIELDC-.lsp	2010-07-26 02:29:37 UTC (rev 1710)
@@ -60,7 +60,7 @@
                    (|getShellEntry| $ 14)))
          (|getShellEntry| $ 16))
      (CONS 1 "failed"))
-    ('T (CONS 0 |a|)))) 
+    (T (CONS 0 |a|)))) 
 
 (DEFUN |FFIELDC-;order;SOpc;4| (|e| $)
   (SPADCALL (SPADCALL |e| (|getShellEntry| $ 19))
@@ -95,7 +95,7 @@
                             (CONS 1 "polynomial")
                             (|getShellEntry| $ 49))
                         (|spadConstant| $ 41))
-                       ('T 1)))
+                       (T 1)))
             (|found| NIL))
         (SEQ (LET ((|i| |start|))
                (LOOP
@@ -122,27 +122,26 @@
     (RETURN
       (SEQ (COND
              ((SPADCALL |a| (|getShellEntry| $ 16)) NIL)
-             ('T
-              (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 56))
-                         |FFIELDC-;primitive?;SB;9|)
-                   (LETT |q| (- (SPADCALL (|getShellEntry| $ 40)) 1)
-                         |FFIELDC-;primitive?;SB;9|)
-                   (LETT |equalone| NIL |FFIELDC-;primitive?;SB;9|)
-                   (LET ((#0=#:G1513 |explist|) (|exp| NIL))
-                     (LOOP
-                       (COND
-                         ((OR (ATOM #0#)
-                              (PROGN (SETQ |exp| (CAR #0#)) NIL)
-                              (NOT (NOT |equalone|)))
-                          (RETURN NIL))
-                         (T (SETQ |equalone|
-                                  (SPADCALL
-                                      (SPADCALL |a|
-                                       (QUOTIENT2 |q| (CAR |exp|))
-                                       (|getShellEntry| $ 58))
-                                      (|getShellEntry| $ 59)))))
-                       (SETQ #0# (CDR #0#))))
-                   (EXIT (NOT |equalone|))))))))) 
+             (T (SEQ (LETT |explist| (SPADCALL (|getShellEntry| $ 56))
+                           |FFIELDC-;primitive?;SB;9|)
+                     (LETT |q| (- (SPADCALL (|getShellEntry| $ 40)) 1)
+                           |FFIELDC-;primitive?;SB;9|)
+                     (LETT |equalone| NIL |FFIELDC-;primitive?;SB;9|)
+                     (LET ((#0=#:G1513 |explist|) (|exp| NIL))
+                       (LOOP
+                         (COND
+                           ((OR (ATOM #0#)
+                                (PROGN (SETQ |exp| (CAR #0#)) NIL)
+                                (NOT (NOT |equalone|)))
+                            (RETURN NIL))
+                           (T (SETQ |equalone|
+                                    (SPADCALL
+                                     (SPADCALL |a|
+                                      (QUOTIENT2 |q| (CAR |exp|))
+                                      (|getShellEntry| $ 58))
+                                     (|getShellEntry| $ 59)))))
+                         (SETQ #0# (CDR #0#))))
+                     (EXIT (NOT |equalone|))))))))) 
 
 (DEFUN |FFIELDC-;order;SPi;10| (|e| $)
   (PROG (|primeDivisor| |a| |goon| |ord| |lof|)
@@ -151,50 +150,51 @@
              ((SPADCALL |e| (|spadConstant| $ 7)
                   (|getShellEntry| $ 63))
               (|error| "order(0) is not defined "))
-             ('T
-              (SEQ (LETT |ord| (- (SPADCALL (|getShellEntry| $ 40)) 1)
-                         |FFIELDC-;order;SPi;10|)
-                   (LETT |lof| (SPADCALL (|getShellEntry| $ 56))
-                         |FFIELDC-;order;SPi;10|)
-                   (LET ((#0=#:G1514 |lof|))
-                     (LOOP
-                       (COND
-                         ((ATOM #0#) (RETURN NIL))
-                         (T (LET ((|rec| (CAR #0#)))
-                              (SEQ (LETT |a|
-                                    (QUOTIENT2 |ord|
-                                     (LETT |primeDivisor| (CAR |rec|)
-                                      |FFIELDC-;order;SPi;10|))
-                                    |FFIELDC-;order;SPi;10|)
-                                   (LETT |goon|
-                                    (SPADCALL
-                                     (SPADCALL |e| |a|
-                                      (|getShellEntry| $ 58))
-                                     (|getShellEntry| $ 59))
-                                    |FFIELDC-;order;SPi;10|)
-                                   (LET
-                                    ((|j| 0)
-                                     (#1=#:G1515 (- (CDR |rec|) 2)))
-                                     (LOOP
-                                       (COND
-                                         ((OR (> |j| #1#) (NOT |goon|))
-                                          (RETURN NIL))
-                                         (T
-                                          (SEQ (SETQ |ord| |a|)
-                                           (SETQ |a|
-                                            (QUOTIENT2 |ord|
-                                             |primeDivisor|))
-                                           (EXIT
-                                            (SETQ |goon|
-                                             (SPADCALL
-                                              (SPADCALL |e| |a|
-                                               (|getShellEntry| $ 58))
-                                              (|getShellEntry| $ 59)))))))
-                                       (SETQ |j| (+ |j| 1))))
-                                   (EXIT
-                                    (COND (|goon| (SETQ |ord| |a|))))))))
-                       (SETQ #0# (CDR #0#))))
-                   (EXIT |ord|)))))))) 
+             (T (SEQ (LETT |ord|
+                           (- (SPADCALL (|getShellEntry| $ 40)) 1)
+                           |FFIELDC-;order;SPi;10|)
+                     (LETT |lof| (SPADCALL (|getShellEntry| $ 56))
+                           |FFIELDC-;order;SPi;10|)
+                     (LET ((#0=#:G1514 |lof|))
+                       (LOOP
+                         (COND
+                           ((ATOM #0#) (RETURN NIL))
+                           (T (LET ((|rec| (CAR #0#)))
+                                (SEQ (LETT |a|
+                                      (QUOTIENT2 |ord|
+                                       (LETT |primeDivisor| (CAR |rec|)
+                                        |FFIELDC-;order;SPi;10|))
+                                      |FFIELDC-;order;SPi;10|)
+                                     (LETT |goon|
+                                      (SPADCALL
+                                       (SPADCALL |e| |a|
+                                        (|getShellEntry| $ 58))
+                                       (|getShellEntry| $ 59))
+                                      |FFIELDC-;order;SPi;10|)
+                                     (LET
+                                      ((|j| 0)
+                                       (#1=#:G1515 (- (CDR |rec|) 2)))
+                                       (LOOP
+                                         (COND
+                                           ((OR (> |j| #1#)
+                                             (NOT |goon|))
+                                            (RETURN NIL))
+                                           (T
+                                            (SEQ (SETQ |ord| |a|)
+                                             (SETQ |a|
+                                              (QUOTIENT2 |ord|
+                                               |primeDivisor|))
+                                             (EXIT
+                                              (SETQ |goon|
+                                               (SPADCALL
+                                                (SPADCALL |e| |a|
+                                                 (|getShellEntry| $ 58))
+                                                (|getShellEntry| $ 59)))))))
+                                         (SETQ |j| (+ |j| 1))))
+                                     (EXIT
+                                      (COND (|goon| (SETQ |ord| |a|))))))))
+                         (SETQ #0# (CDR #0#))))
+                     (EXIT |ord|)))))))) 
 
 (DEFUN |FFIELDC-;discreteLog;SNni;11| (|b| $)
   (PROG (|rho| |exptable| |n| |c| |end| |found| |disc1| |fac| |faclist|
@@ -203,169 +203,178 @@
       (SEQ (COND
              ((SPADCALL |b| (|getShellEntry| $ 16))
               (|error| "discreteLog: logarithm of zero"))
-             ('T
-              (SEQ (LETT |faclist| (SPADCALL (|getShellEntry| $ 56))
-                         |FFIELDC-;discreteLog;SNni;11|)
-                   (LETT |a| |b| |FFIELDC-;discreteLog;SNni;11|)
-                   (LETT |gen| (SPADCALL (|getShellEntry| $ 65))
-                         |FFIELDC-;discreteLog;SNni;11|)
-                   (EXIT (COND
-                           ((SPADCALL |b| |gen| (|getShellEntry| $ 63))
-                            1)
-                           ('T
-                            (SEQ (LETT |disclog| 0
-                                       |FFIELDC-;discreteLog;SNni;11|)
-                                 (LETT |mult| 1
-                                       |FFIELDC-;discreteLog;SNni;11|)
-                                 (LETT |groupord|
-                                       (-
-                                        (SPADCALL
-                                         (|getShellEntry| $ 40))
-                                        1)
-                                       |FFIELDC-;discreteLog;SNni;11|)
-                                 (LETT |exp| |groupord|
-                                       |FFIELDC-;discreteLog;SNni;11|)
-                                 (LET ((#0=#:G1516 |faclist|))
-                                   (LOOP
-                                     (COND
-                                       ((ATOM #0#) (RETURN NIL))
-                                       (T
-                                        (LET ((|f| (CAR #0#)))
-                                          (SEQ
-                                           (LETT |fac| (CAR |f|)
-                                            |FFIELDC-;discreteLog;SNni;11|)
-                                           (EXIT
-                                            (LET
-                                             ((|t| 0)
-                                              (#1=#:G1517
-                                               (- (CDR |f|) 1)))
-                                              (LOOP
-                                                (COND
-                                                  ((> |t| #1#)
-                                                   (RETURN NIL))
-                                                  (T
-                                                   (SEQ
-                                                    (SETQ |exp|
-                                                     (QUOTIENT2 |exp|
-                                                      |fac|))
-                                                    (LETT |exptable|
-                                                     (SPADCALL |fac|
-                                                      (|getShellEntry|
-                                                       $ 67))
-                                                     |FFIELDC-;discreteLog;SNni;11|)
-                                                    (LETT |n|
-                                                     (SPADCALL
-                                                      |exptable|
-                                                      (|getShellEntry|
-                                                       $ 68))
-                                                     |FFIELDC-;discreteLog;SNni;11|)
-                                                    (LETT |c|
-                                                     (SPADCALL |a|
-                                                      |exp|
-                                                      (|getShellEntry|
-                                                       $ 58))
-                                                     |FFIELDC-;discreteLog;SNni;11|)
-                                                    (LETT |end|
-                                                     (QUOTIENT2
-                                                      (- |fac| 1) |n|)
-                                                     |FFIELDC-;discreteLog;SNni;11|)
-                                                    (LETT |found| NIL
-                                                     |FFIELDC-;discreteLog;SNni;11|)
-                                                    (LETT |disc1| 0
-                                                     |FFIELDC-;discreteLog;SNni;11|)
-                                                    (LET ((|i| 0))
-                                                      (LOOP
-                                                        (COND
-                                                          ((OR
-                                                            (> |i|
-                                                             |end|)
-                                                            (NOT
-                                                             (NOT
-                                                              |found|)))
-                                                           (RETURN
-                                                             NIL))
-                                                          (T
-                                                           (SEQ
-                                                            (LETT |rho|
-                                                             (SPADCALL
-                                                              (SPADCALL
-                                                               |c|
-                                                               (|getShellEntry|
-                                                                $ 11))
-                                                              |exptable|
-                                                              (|getShellEntry|
-                                                               $ 71))
-                                                             |FFIELDC-;discreteLog;SNni;11|)
-                                                            (EXIT
-                                                             (COND
-                                                               ((ZEROP
-                                                                 (CAR
-                                                                  |rho|))
-                                                                (SEQ
-                                                                 (SETQ
-                                                                  |found|
-                                                                  T)
-                                                                 (EXIT
-                                                                  (SETQ
-                                                                   |disc1|
-                                                                   (*
-                                                                    (+
-                                                                     (*
-                                                                      |n|
-                                                                      |i|)
-                                                                     (CDR
-                                                                      |rho|))
-                                                                    |mult|)))))
-                                                               ('T
-                                                                (SETQ
-                                                                 |c|
+             (T (SEQ (LETT |faclist| (SPADCALL (|getShellEntry| $ 56))
+                           |FFIELDC-;discreteLog;SNni;11|)
+                     (LETT |a| |b| |FFIELDC-;discreteLog;SNni;11|)
+                     (LETT |gen| (SPADCALL (|getShellEntry| $ 65))
+                           |FFIELDC-;discreteLog;SNni;11|)
+                     (EXIT (COND
+                             ((SPADCALL |b| |gen|
+                                  (|getShellEntry| $ 63))
+                              1)
+                             (T (SEQ (LETT |disclog| 0
+                                      |FFIELDC-;discreteLog;SNni;11|)
+                                     (LETT |mult| 1
+                                      |FFIELDC-;discreteLog;SNni;11|)
+                                     (LETT |groupord|
+                                      (-
+                                       (SPADCALL
+                                        (|getShellEntry| $ 40))
+                                       1)
+                                      |FFIELDC-;discreteLog;SNni;11|)
+                                     (LETT |exp| |groupord|
+                                      |FFIELDC-;discreteLog;SNni;11|)
+                                     (LET ((#0=#:G1516 |faclist|))
+                                       (LOOP
+                                         (COND
+                                           ((ATOM #0#) (RETURN NIL))
+                                           (T
+                                            (LET ((|f| (CAR #0#)))
+                                              (SEQ
+                                               (LETT |fac| (CAR |f|)
+                                                |FFIELDC-;discreteLog;SNni;11|)
+                                               (EXIT
+                                                (LET
+                                                 ((|t| 0)
+                                                  (#1=#:G1517
+                                                   (- (CDR |f|) 1)))
+                                                  (LOOP
+                                                    (COND
+                                                      ((> |t| #1#)
+                                                       (RETURN NIL))
+                                                      (T
+                                                       (SEQ
+                                                        (SETQ |exp|
+                                                         (QUOTIENT2
+                                                          |exp| |fac|))
+                                                        (LETT
+                                                         |exptable|
+                                                         (SPADCALL
+                                                          |fac|
+                                                          (|getShellEntry|
+                                                           $ 67))
+                                                         |FFIELDC-;discreteLog;SNni;11|)
+                                                        (LETT |n|
+                                                         (SPADCALL
+                                                          |exptable|
+                                                          (|getShellEntry|
+                                                           $ 68))
+                                                         |FFIELDC-;discreteLog;SNni;11|)
+                                                        (LETT |c|
+                                                         (SPADCALL |a|
+                                                          |exp|
+                                                          (|getShellEntry|
+                                                           $ 58))
+                                                         |FFIELDC-;discreteLog;SNni;11|)
+                                                        (LETT |end|
+                                                         (QUOTIENT2
+                                                          (- |fac| 1)
+                                                          |n|)
+                                                         |FFIELDC-;discreteLog;SNni;11|)
+                                                        (LETT |found|
+                                                         NIL
+                                                         |FFIELDC-;discreteLog;SNni;11|)
+                                                        (LETT |disc1| 0
+                                                         |FFIELDC-;discreteLog;SNni;11|)
+                                                        (LET ((|i| 0))
+                                                          (LOOP
+                                                            (COND
+                                                              ((OR
+                                                                (> |i|
+                                                                 |end|)
+                                                                (NOT
+                                                                 (NOT
+                                                                  |found|)))
+                                                               (RETURN
+                                                                 NIL))
+                                                              (T
+                                                               (SEQ
+                                                                (LETT
+                                                                 |rho|
                                                                  (SPADCALL
-                                                                  |c|
                                                                   (SPADCALL
-                                                                   |gen|
-                                                                   (*
-                                                                    (QUOTIENT2
-                                                                     |groupord|
-                                                                     |fac|)
-                                                                    (-
-                                                                     |n|))
+                                                                   |c|
                                                                    (|getShellEntry|
                                                                     $
-                                                                    58))
+                                                                    11))
+                                                                  |exptable|
                                                                   (|getShellEntry|
                                                                    $
-                                                                   77)))))))))
-                                                        (SETQ |i|
-                                                         (+ |i| 1))))
-                                                    (EXIT
-                                                     (COND
-                                                       (|found|
-                                                        (SEQ
-                                                         (SETQ |mult|
-                                                          (* |mult|
-                                                           |fac|))
-                                                         (SETQ
-                                                          |disclog|
-                                                          (+ |disclog|
-                                                           |disc1|))
-                                                         (EXIT
-                                                          (SETQ |a|
-                                                           (SPADCALL
-                                                            |a|
-                                                            (SPADCALL
-                                                             |gen|
-                                                             (-
-                                                              |disc1|)
-                                                             (|getShellEntry|
-                                                              $ 58))
-                                                            (|getShellEntry|
-                                                             $ 77))))))
-                                                       ('T
-                                                        (|error|
-                                                         "discreteLog: ?? discrete logarithm")))))))
-                                                (SETQ |t| (+ |t| 1)))))))))
-                                     (SETQ #0# (CDR #0#))))
-                                 (EXIT |disclog|)))))))))))) 
+                                                                   71))
+                                                                 |FFIELDC-;discreteLog;SNni;11|)
+                                                                (EXIT
+                                                                 (COND
+                                                                   ((ZEROP
+                                                                     (CAR
+                                                                      |rho|))
+                                                                    (SEQ
+                                                                     (SETQ
+                                                                      |found|
+                                                                      T)
+                                                                     (EXIT
+                                                                      (SETQ
+                                                                       |disc1|
+                                                                       (*
+                                                                        (+
+                                                                         (*
+                                                                          |n|
+                                                                          |i|)
+                                                                         (CDR
+                                                                          |rho|))
+                                                                        |mult|)))))
+                                                                   (T
+                                                                    (SETQ
+                                                                     |c|
+                                                                     (SPADCALL
+                                                                      |c|
+                                                                      (SPADCALL
+                                                                       |gen|
+                                                                       (*
+                                                                        (QUOTIENT2
+                                                                         |groupord|
+                                                                         |fac|)
+                                                                        (-
+                                                                         |n|))
+                                                                       (|getShellEntry|
+                                                                        $
+                                                                        58))
+                                                                      (|getShellEntry|
+                                                                       $
+                                                                       77)))))))))
+                                                            (SETQ |i|
+                                                             (+ |i| 1))))
+                                                        (EXIT
+                                                         (COND
+                                                           (|found|
+                                                            (SEQ
+                                                             (SETQ
+                                                              |mult|
+                                                              (* |mult|
+                                                               |fac|))
+                                                             (SETQ
+                                                              |disclog|
+                                                              (+
+                                                               |disclog|
+                                                               |disc1|))
+                                                             (EXIT
+                                                              (SETQ |a|
+                                                               (SPADCALL
+                                                                |a|
+                                                                (SPADCALL
+                                                                 |gen|
+                                                                 (-
+                                                                  |disc1|)
+                                                                 (|getShellEntry|
+                                                                  $ 58))
+                                                                (|getShellEntry|
+                                                                 $ 77))))))
+                                                           (T
+                                                            (|error|
+                                                             "discreteLog: ?? discrete logarithm")))))))
+                                                    (SETQ |t|
+                                                     (+ |t| 1)))))))))
+                                         (SETQ #0# (CDR #0#))))
+                                     (EXIT |disclog|)))))))))))) 
 

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1729
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1729&view=rev
Author:   dos-reis
Date:     2010-07-29 21:06:32 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
 r14996@... (orig r1711):  dos-reis | 2010-07-25 21:49:04 -0500
 	* interp/g-opt.boot (optCond): Simplify newly built COND-expression.
 
 r14997@... (orig r1712):  dos-reis | 2010-07-26 01:54:30 -0500
 	* algebra/si.spad.pamphlet (SingleInteger): Tidy.
 	* interp/g-opt.boot (simplifyVMForm): Expand %icst0 and %icst1.
 	(optIlt): Fold more configurations.
 
 r14998@... (orig r1713):  dos-reis | 2010-07-26 11:33:38 -0500
 	* interp/g-opt.boot ($VMsideEffectFreeOperators): Include new
 	opcodes %icst0,	%icst1, %when, and %ccst.
 	* interp/g-util.boot: Expand %ccst.
 	* algebra/alql.spad.pamphlet: Clean up.
 	* algebra/array1.spad.pamphlet: Likewise.
 	* algebra/c02.spad.pamphlet: Likewise.
 	* algebra/d03.spad.pamphlet: Likewise.
 	* algebra/e04.spad.pamphlet: Likewise.
 	* algebra/integer.spad.pamphlet: Likewise.
 	* algebra/si.spad.pamphlet: Likewise.
 	* algebra/string.spad.pamphlet: Likewise.
 
 r15000@... (orig r1715):  gdr | 2010-07-26 16:32:16 -0500
 	* interp/g-opt.boot (optCond): Work harder at denesting nested
 	if-expressions. 
 
 r15001@... (orig r1716):  gdr | 2010-07-27 07:24:33 -0500
 Misc cleanup
 r15002@... (orig r1717):  gdr | 2010-07-27 09:42:35 -0500
 	* interp/types.boot (%Code): Include %Char.
 	* interp/c-util.boot (middleEndExpand): Temporarilty Comment out
 	signature.
 
 r15004@... (orig r1719):  gdr | 2010-07-27 14:21:10 -0500
 	* interp/i-analy.boot (bottomUpCompile): Use massageBackendCode in
 	lieu of mutateToBackendCode.
 
 r15005@... (orig r1720):  gdr | 2010-07-27 16:50:59 -0500
 	* boot/tokens.boot: quo and rem are now keywords and infix operators.
 	* boot/parser.boot (bpEuclid): New.  Parse integer quotient and
 	remainder expressions.
 	(bpMinus): Now build on bpEuclid instead of bpTimes.
 
 r15006@... (orig r1721):  dos-reis | 2010-07-27 22:02:17 -0500
 	* interp/g-opt.boot: Transform %iquo and %irem expressions.
 	($VMsideEffectFreeOperators): Include %irem and %iquo.
 
 r15007@... (orig r1722):  dos-reis | 2010-07-28 03:21:13 -0500
 	* algebra/integer.spad.pamphlet (Integer): Use builtin functions
 	%irem and %iquo.
 	* algebra/si.spad.pamphlet (SingleInteger): Likewise.
 
 r15008@... (orig r1723):  dos-reis | 2010-07-28 05:41:18 -0500
 	* interp/sys-globals.boot ($VariableCount): Remove.
 	* interp/spad.lisp (QUOTIENT2): Remove.
 	(REMAINDER2): Likewise.
 	* algebra/integer.spad.pamphlet (Integer): Use builtin  %idivide.
 	* algebra/si.spad.pamphlet (SingleInteger): Likewise.
 
 r15009@... (orig r1724):  dos-reis | 2010-07-28 09:50:10 -0500
 	* interp/spad.lisp (DIVIDE2): Remove.
 	* interp/vmlisp.lisp (QSQUOTIENT): Likewise.
 	(QSREMAINDER): Likewise.
 	* interp/buildom.boot: Use quo and rem in leur of QUOTIENT and
 	REMAINDER or variants.
 	* interp/g-timer.boot: Likewise.
 	* interp/g-util.boot: Likewise.
 	* interp/htsetvar.boot: Likewise.
 	* interp/i-output.boot: Likewise.
 	* interp/incl.boot: Likewise.
 	* interp/msgdb.boot: Likewise.
 	* interp/nrungo.boot: Likewise.
 	* interp/pspad1.boot: Likewise.
 	* interp/topics.boot: Likewise.
 
 r15010@... (orig r1725):  gdr | 2010-07-29 03:37:02 -0500
 	* interp/c-util.boot (removeToplevelRETURN_-FROM): New.
 	(transformToBackendCode): Use it to clean function body.
 
 r15011@... (orig r1726):  gdr | 2010-07-29 03:53:44 -0500
 	Support C++ as implementation language.
 	* config/var-def.mk (CXXCOMPILE): New.
 	(CXXLINK): Likewise.
 
 r15012@... (orig r1727):  gdr | 2010-07-29 10:43:37 -0500
 	* algebra/sf.spad.pamphlet (DoubleFloat): Use builtin
 	trigonometric functions.
 	* interp/g-opt.boot ($VMsideEffectFreeOperators): Include them.
 	* interp/g-util.boot: Expand them.
 	* include/edible.H1: Move declarations to clef/edible.c.  Remove.
 	* driver/utils.h: Give G linkage to declarations.
 	* sman/Makefile.in: Link programs against C++ runtime.
 
 r15013@... (orig r1728):  dos-reis | 2010-07-29 14:52:43 -0500
 	* lib/XSpadFill.c: Tidy.
 	* lib/pixmap.c: Likewise.
 	* lib/spadcolors.c: Likewise.
 	* include/ReadBitmap.H1: Remove.
 	* include/all_hyper_proto.H1: Likewise.
 	* include/cond.H1: Likewise.
 	* include/cursor.H1: Likewise.
 	* include/dialog.H1: Likewise.
 	* include/display.H1: Likewise.
 	* include/event.H1: Likewise.
 	* include/extent1.H1: Likewise.
 	* include/extent2.H1: Likewise.
 	* include/form_ext.H1: Likewise.
 	* include/group.H1: Likewise.
 	* include/htinp.H1: Likewise.
 	* include/hyper.H1: Likewise.
 	* include/initx.H1: Likewise.
 	* include/input.H1: Likewise.
 	* include/item.H1: Likewise.
 	* include/keyin.H1: Likewise.
 	* include/macro.H1: Likewise.
 	* include/mem.H1: Likewise.
 	* include/parse.H1: Likewise.
 	* include/parse_aux.H1: Likewise.
 	* include/parse_input.H1: Likewise.
 	* include/parse_paste.H1: Likewise.
 	* include/parse_types.H1: Likewise.
 	* include/scrollbar.H1: Likewise.
 	* include/show_types.H1: Likewise.
 	* include/spadcolors.H1: Likewise.
 	* include/spadint.H1: Likewise.
 	* include/titlebar.H1: Likewise.
 	* hyper/Makefile.in: Compile and Link with a C++ compiler.
 	* hyper/ReadBitmap.c: Make it acceptable to a C++ compiler.
 	* hyper/cond.c: Likewise.
 	* hyper/dialog.c: Likewise.
 	* hyper/display.c: Likewise.
 	* hyper/display.h: Likewise.
 	* hyper/event.c: Likewise.
 	* hyper/event.h: Likewise.
 	* hyper/extent.h: Likewise.
 	* hyper/extent1.c: Likewise.
 	* hyper/extent2.c: Likewise.
 	* hyper/form-ext.c: Likewise.
 	* hyper/group.c: Likewise.
 	* hyper/group.h: Likewise.
 	* hyper/htadd.c: Likewise.
 	* hyper/htinp.c: Likewise.
 	* hyper/hyper.c: Likewise.
 	* hyper/hyper.h: Likewise.
 	* hyper/initx.c: Likewise.
 	* hyper/initx.h: Likewise.
 	* hyper/input.c: Likewise.
 	* hyper/item.c: Likewise.
 	* hyper/keyin.h: Likewise.
 	* hyper/keyin.c: Likewise.
 	* hyper/macro.c: Likewise.
 	* hyper/mem.c: Likewise.
 	* hyper/parse-aux.c: Likewise.
 	* hyper/parse-input.c: Likewise.
 	* hyper/parse-paste.c: Likewise.
 	* hyper/parse-paste.h: Likewise.
 	* hyper/parse-types.h: Likewise.
 	* hyper/parse-types.c: Likewise.
 	* hyper/parse.h: Likewise.
 	* hyper/parse.c: Likewise.
 	* hyper/scrollbar.c: Likewise.
 	* hyper/scrollbar.h: Likewise.
 	* hyper/show-types.c: Likewise.
 	* hyper/spadint.c: Likewise.
 	* hyper/titlebar.c: Likewise.
 	* hyper/titlebar.h: Likewise.
 	* graph/view3D/smoothShade3d.c: Include spadcolors.h
 	* graph/view3D/stuff3d.c: Likewise.
 	* graph/include/view.h (saymem): #undef before #define.
 	* graph/view2D/write2d.c: Include pixmap.h.
 	* graph/view3D/process3d.c: Likewise.
 	* graph/view3D/write3d.c: Likewise.
 	* graph/view3D/header.h: Remove macro definition for endColor and
 	colorStep. 
 	* include/bsdsignal.h: Remove.
 	* include/edin.H1: Likewise.
 	* include/fnct_key.H1: Likewise.
 	* include/halloc.h: Likewise.
 	* include/hash.h: Likewise.
 	* include/prt.H1: Likewise.
 	* include/rgb.H1: Likewise.
 	* include/sockio.h: Likewise.
 	* include/util.h: Likewise.
 	* include/pixmap.h: Rename from pixmap.H1
 

Modified Paths:
--------------
    jap-sandbox/ChangeLog
    jap-sandbox/config/var-def.mk
    jap-sandbox/configure
    jap-sandbox/configure.ac
    jap-sandbox/configure.ac.pamphlet
    jap-sandbox/src/ChangeLog
    jap-sandbox/src/algebra/alql.spad.pamphlet
    jap-sandbox/src/algebra/array1.spad.pamphlet
    jap-sandbox/src/algebra/c02.spad.pamphlet
    jap-sandbox/src/algebra/d03.spad.pamphlet
    jap-sandbox/src/algebra/e04.spad.pamphlet
    jap-sandbox/src/algebra/integer.spad.pamphlet
    jap-sandbox/src/algebra/sf.spad.pamphlet
    jap-sandbox/src/algebra/si.spad.pamphlet
    jap-sandbox/src/algebra/strap/CHAR.lsp
    jap-sandbox/src/algebra/strap/DFLOAT.lsp
    jap-sandbox/src/algebra/strap/EUCDOM-.lsp
    jap-sandbox/src/algebra/strap/FFIELDC-.lsp
    jap-sandbox/src/algebra/strap/FPS-.lsp
    jap-sandbox/src/algebra/strap/ILIST.lsp
    jap-sandbox/src/algebra/strap/INT.lsp
    jap-sandbox/src/algebra/strap/ISTRING.lsp
    jap-sandbox/src/algebra/strap/LSAGG-.lsp
    jap-sandbox/src/algebra/strap/OUTFORM.lsp
    jap-sandbox/src/algebra/strap/POLYCAT-.lsp
    jap-sandbox/src/algebra/strap/SINT.lsp
    jap-sandbox/src/algebra/strap/SYMBOL.lsp
    jap-sandbox/src/algebra/string.spad.pamphlet
    jap-sandbox/src/boot/parser.boot
    jap-sandbox/src/boot/strap/parser.clisp
    jap-sandbox/src/boot/strap/tokens.clisp
    jap-sandbox/src/boot/tokens.boot
    jap-sandbox/src/clef/edible.c
    jap-sandbox/src/driver/Makefile.in
    jap-sandbox/src/driver/main.c
    jap-sandbox/src/driver/utils.c
    jap-sandbox/src/driver/utils.h
    jap-sandbox/src/graph/include/view.h
    jap-sandbox/src/graph/view2D/write2d.c
    jap-sandbox/src/graph/view3D/header.h
    jap-sandbox/src/graph/view3D/process3d.c
    jap-sandbox/src/graph/view3D/smoothShade3d.c
    jap-sandbox/src/graph/view3D/stuff3d.c
    jap-sandbox/src/graph/view3D/write3d.c
    jap-sandbox/src/hyper/Makefile.in
    jap-sandbox/src/hyper/ReadBitmap.c
    jap-sandbox/src/hyper/cond.c
    jap-sandbox/src/hyper/dialog.c
    jap-sandbox/src/hyper/display.c
    jap-sandbox/src/hyper/display.h
    jap-sandbox/src/hyper/event.c
    jap-sandbox/src/hyper/event.h
    jap-sandbox/src/hyper/extent.h
    jap-sandbox/src/hyper/extent1.c
    jap-sandbox/src/hyper/extent2.c
    jap-sandbox/src/hyper/form-ext.c
    jap-sandbox/src/hyper/group.c
    jap-sandbox/src/hyper/group.h
    jap-sandbox/src/hyper/htadd.c
    jap-sandbox/src/hyper/htinp.c
    jap-sandbox/src/hyper/hyper.c
    jap-sandbox/src/hyper/hyper.h
    jap-sandbox/src/hyper/initx.c
    jap-sandbox/src/hyper/initx.h
    jap-sandbox/src/hyper/input.c
    jap-sandbox/src/hyper/item.c
    jap-sandbox/src/hyper/keyin.c
    jap-sandbox/src/hyper/keyin.h
    jap-sandbox/src/hyper/macro.c
    jap-sandbox/src/hyper/mem.c
    jap-sandbox/src/hyper/parse-aux.c
    jap-sandbox/src/hyper/parse-input.c
    jap-sandbox/src/hyper/parse-paste.c
    jap-sandbox/src/hyper/parse-paste.h
    jap-sandbox/src/hyper/parse-types.c
    jap-sandbox/src/hyper/parse-types.h
    jap-sandbox/src/hyper/parse.c
    jap-sandbox/src/hyper/parse.h
    jap-sandbox/src/hyper/scrollbar.c
    jap-sandbox/src/hyper/scrollbar.h
    jap-sandbox/src/hyper/show-types.c
    jap-sandbox/src/hyper/spadint.c
    jap-sandbox/src/hyper/titlebar.c
    jap-sandbox/src/hyper/titlebar.h
    jap-sandbox/src/include/bsdsignal.h
    jap-sandbox/src/include/cursor.H1
    jap-sandbox/src/include/edin.H1
    jap-sandbox/src/include/fnct_key.H1
    jap-sandbox/src/include/halloc.h
    jap-sandbox/src/include/hash.h
    jap-sandbox/src/include/prt.H1
    jap-sandbox/src/include/rgb.h
    jap-sandbox/src/include/sockio.h
    jap-sandbox/src/include/spadcolors.h
    jap-sandbox/src/include/util.H1
    jap-sandbox/src/include/wct.H1
    jap-sandbox/src/interp/buildom.boot
    jap-sandbox/src/interp/c-util.boot
    jap-sandbox/src/interp/compiler.boot
    jap-sandbox/src/interp/define.boot
    jap-sandbox/src/interp/g-opt.boot
    jap-sandbox/src/interp/g-timer.boot
    jap-sandbox/src/interp/g-util.boot
    jap-sandbox/src/interp/htsetvar.boot
    jap-sandbox/src/interp/i-analy.boot
    jap-sandbox/src/interp/i-output.boot
    jap-sandbox/src/interp/incl.boot
    jap-sandbox/src/interp/msgdb.boot
    jap-sandbox/src/interp/nrungo.boot
    jap-sandbox/src/interp/nrunopt.boot
    jap-sandbox/src/interp/pspad1.boot
    jap-sandbox/src/interp/spad.lisp
    jap-sandbox/src/interp/sys-globals.boot
    jap-sandbox/src/interp/topics.boot
    jap-sandbox/src/interp/types.boot
    jap-sandbox/src/interp/vmlisp.lisp
    jap-sandbox/src/lib/XSpadFill.c
    jap-sandbox/src/lib/pixmap.c
    jap-sandbox/src/lib/spadcolors.c
    jap-sandbox/src/share/algebra/browse.daase
    jap-sandbox/src/share/algebra/category.daase
    jap-sandbox/src/share/algebra/compress.daase
    jap-sandbox/src/share/algebra/interp.daase
    jap-sandbox/src/share/algebra/operation.daase
    jap-sandbox/src/sman/Makefile.in

Added Paths:
-----------
    jap-sandbox/src/include/pixmap.h

Removed Paths:
-------------
    jap-sandbox/src/include/ReadBitmap.H1
    jap-sandbox/src/include/all_hyper_proto.H1
    jap-sandbox/src/include/cond.H1
    jap-sandbox/src/include/dialog.H1
    jap-sandbox/src/include/display.H1
    jap-sandbox/src/include/edible.H1
    jap-sandbox/src/include/event.H1
    jap-sandbox/src/include/extent1.H1
    jap-sandbox/src/include/extent2.H1
    jap-sandbox/src/include/form_ext.H1
    jap-sandbox/src/include/group.H1
    jap-sandbox/src/include/htinp.H1
    jap-sandbox/src/include/hyper.H1
    jap-sandbox/src/include/initx.H1
    jap-sandbox/src/include/input.H1
    jap-sandbox/src/include/item.H1
    jap-sandbox/src/include/keyin.H1
    jap-sandbox/src/include/macro.H1
    jap-sandbox/src/include/mem.H1
    jap-sandbox/src/include/parse.H1
    jap-sandbox/src/include/parse_aux.H1
    jap-sandbox/src/include/parse_input.H1
    jap-sandbox/src/include/parse_paste.H1
    jap-sandbox/src/include/parse_types.H1
    jap-sandbox/src/include/pixmap.H1
    jap-sandbox/src/include/scrollbar.H1
    jap-sandbox/src/include/show_types.H1
    jap-sandbox/src/include/spadcolors.H1
    jap-sandbox/src/include/spadint.H1
    jap-sandbox/src/include/titlebar.H1

Property Changed:
----------------
    jap-sandbox/


Property changes on: jap-sandbox
___________________________________________________________________
Modified: svk:merge
   - 02417865-de37-0410-9a13-d91e0bdeb7dd:/case.svn:12427
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-coerce:12405
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-ctor:12505
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-libtool:13782
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-parse:12477
f499efd5-9937-0410-b36a-d3739c31ded8:/trunk:1708
   + 02417865-de37-0410-9a13-d91e0bdeb7dd:/case.svn:12427
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-coerce:12405
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-ctor:12505
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-libtool:13782
02417865-de37-0410-9a13-d91e0bdeb7dd:/oa-parse:12477
f499efd5-9937-0410-b36a-d3739c31ded8:/trunk:1728

Modified: jap-sandbox/ChangeLog
===================================================================
--- jap-sandbox/ChangeLog	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/ChangeLog	2010-07-29 21:06:32 UTC (rev 1729)
@@ -1,3 +1,9 @@
+2010-07-29  Gabriel Dos Reis  <gdr@...>
+
+	Support C++ as implementation language.
+	* config/var-def.mk (CXXCOMPILE): New.
+	(CXXLINK): Likewise.
+
 2010-05-07  Gabriel Dos Reis  <gdr@...>
 
 	* configure.ac.pamphlet: Add new option: --enable-int-file-retention.

Modified: jap-sandbox/config/var-def.mk
===================================================================
--- jap-sandbox/config/var-def.mk	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/config/var-def.mk	2010-07-29 21:06:32 UTC (rev 1729)
@@ -68,12 +68,14 @@
 
 ## Command used to compile a C program 
 COMPILE = $(LIBTOOL) --mode=compile $(CC) -c
+CXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) -c
 
 ## Sadly, at the moment, the C parts of the OpenAxiom system is not
 ## well structured enough to allow for clean dynamic libraries
 ## and dynamic linking.  So, we build static programs.
 ## This situation is to be fixed when I have time.
 LINK = $(LIBTOOL) --mode=link $(CC) -static
+CXXLINK = $(LIBTOOL) --mode=link $(CXX) -static
 
 ## Libtool is a disaster for building DLLs on Cygwin, and insists
 ## on adding silly extensions where it should not on MinGW, so we have

Modified: jap-sandbox/configure
===================================================================
--- jap-sandbox/configure	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/configure	2010-07-29 21:06:32 UTC (rev 1729)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2010-07-18.
+# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2010-07-29.
 #
 # Report bugs to <open-axiom-bugs@...>.
 #
@@ -745,8 +745,8 @@
 # Identity of this package.
 PACKAGE_NAME='OpenAxiom'
 PACKAGE_TARNAME='openaxiom'
-PACKAGE_VERSION='1.4.0-2010-07-18'
-PACKAGE_STRING='OpenAxiom 1.4.0-2010-07-18'
+PACKAGE_VERSION='1.4.0-2010-07-29'
+PACKAGE_STRING='OpenAxiom 1.4.0-2010-07-29'
 PACKAGE_BUGREPORT='open-axiom-bugs@...'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1513,7 +1513,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenAxiom 1.4.0-2010-07-18 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.4.0-2010-07-29 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1583,7 +1583,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-07-18:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-07-29:";;
    esac
   cat <<\_ACEOF
 
@@ -1691,7 +1691,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.4.0-2010-07-18
+OpenAxiom configure 1.4.0-2010-07-29
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1705,7 +1705,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenAxiom $as_me 1.4.0-2010-07-18, which was
+It was created by OpenAxiom $as_me 1.4.0-2010-07-29, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -21178,7 +21178,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenAxiom $as_me 1.4.0-2010-07-18, which was
+This file was extended by OpenAxiom $as_me 1.4.0-2010-07-29, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21241,7 +21241,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-OpenAxiom config.status 1.4.0-2010-07-18
+OpenAxiom config.status 1.4.0-2010-07-29
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

Modified: jap-sandbox/configure.ac
===================================================================
--- jap-sandbox/configure.ac	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/configure.ac	2010-07-29 21:06:32 UTC (rev 1729)
@@ -1,6 +1,6 @@
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.4.0-2010-07-18], 
+AC_INIT([OpenAxiom], [1.4.0-2010-07-29], 
         [open-axiom-bugs@...])
 
 AC_CONFIG_AUX_DIR(config)

Modified: jap-sandbox/configure.ac.pamphlet
===================================================================
--- jap-sandbox/configure.ac.pamphlet	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/configure.ac.pamphlet	2010-07-29 21:06:32 UTC (rev 1729)
@@ -1210,7 +1210,7 @@
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.4.0-2010-07-18], 
+AC_INIT([OpenAxiom], [1.4.0-2010-07-29], 
         [open-axiom-bugs@...])
 
 @

Modified: jap-sandbox/src/ChangeLog
===================================================================
--- jap-sandbox/src/ChangeLog	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/ChangeLog	2010-07-29 21:06:32 UTC (rev 1729)
@@ -1,5 +1,205 @@
+2010-07-29  Gabriel Dos Reis  <gdr@...>
+
+	* lib/XSpadFill.c: Tidy.
+	* lib/pixmap.c: Likewise.
+	* lib/spadcolors.c: Likewise.
+	* include/ReadBitmap.H1: Remove.
+	* include/all_hyper_proto.H1: Likewise.
+	* include/cond.H1: Likewise.
+	* include/cursor.H1: Likewise.
+	* include/dialog.H1: Likewise.
+	* include/display.H1: Likewise.
+	* include/event.H1: Likewise.
+	* include/extent1.H1: Likewise.
+	* include/extent2.H1: Likewise.
+	* include/form_ext.H1: Likewise.
+	* include/group.H1: Likewise.
+	* include/htinp.H1: Likewise.
+	* include/hyper.H1: Likewise.
+	* include/initx.H1: Likewise.
+	* include/input.H1: Likewise.
+	* include/item.H1: Likewise.
+	* include/keyin.H1: Likewise.
+	* include/macro.H1: Likewise.
+	* include/mem.H1: Likewise.
+	* include/parse.H1: Likewise.
+	* include/parse_aux.H1: Likewise.
+	* include/parse_input.H1: Likewise.
+	* include/parse_paste.H1: Likewise.
+	* include/parse_types.H1: Likewise.
+	* include/scrollbar.H1: Likewise.
+	* include/show_types.H1: Likewise.
+	* include/spadcolors.H1: Likewise.
+	* include/spadint.H1: Likewise.
+	* include/titlebar.H1: Likewise.
+	* hyper/Makefile.in: Compile and Link with a C++ compiler.
+	* hyper/ReadBitmap.c: Make it acceptable to a C++ compiler.
+	* hyper/cond.c: Likewise.
+	* hyper/dialog.c: Likewise.
+	* hyper/display.c: Likewise.
+	* hyper/display.h: Likewise.
+	* hyper/event.c: Likewise.
+	* hyper/event.h: Likewise.
+	* hyper/extent.h: Likewise.
+	* hyper/extent1.c: Likewise.
+	* hyper/extent2.c: Likewise.
+	* hyper/form-ext.c: Likewise.
+	* hyper/group.c: Likewise.
+	* hyper/group.h: Likewise.
+	* hyper/htadd.c: Likewise.
+	* hyper/htinp.c: Likewise.
+	* hyper/hyper.c: Likewise.
+	* hyper/hyper.h: Likewise.
+	* hyper/initx.c: Likewise.
+	* hyper/initx.h: Likewise.
+	* hyper/input.c: Likewise.
+	* hyper/item.c: Likewise.
+	* hyper/keyin.h: Likewise.
+	* hyper/keyin.c: Likewise.
+	* hyper/macro.c: Likewise.
+	* hyper/mem.c: Likewise.
+	* hyper/parse-aux.c: Likewise.
+	* hyper/parse-input.c: Likewise.
+	* hyper/parse-paste.c: Likewise.
+	* hyper/parse-paste.h: Likewise.
+	* hyper/parse-types.h: Likewise.
+	* hyper/parse-types.c: Likewise.
+	* hyper/parse.h: Likewise.
+	* hyper/parse.c: Likewise.
+	* hyper/scrollbar.c: Likewise.
+	* hyper/scrollbar.h: Likewise.
+	* hyper/show-types.c: Likewise.
+	* hyper/spadint.c: Likewise.
+	* hyper/titlebar.c: Likewise.
+	* hyper/titlebar.h: Likewise.
+	* graph/view3D/smoothShade3d.c: Include spadcolors.h
+	* graph/view3D/stuff3d.c: Likewise.
+	* graph/include/view.h (saymem): #undef before #define.
+	* graph/view2D/write2d.c: Include pixmap.h.
+	* graph/view3D/process3d.c: Likewise.
+	* graph/view3D/write3d.c: Likewise.
+	* graph/view3D/header.h: Remove macro definition for endColor and
+	colorStep. 
+	* include/bsdsignal.h: Remove.
+	* include/edin.H1: Likewise.
+	* include/fnct_key.H1: Likewise.
+	* include/halloc.h: Likewise.
+	* include/hash.h: Likewise.
+	* include/prt.H1: Likewise.
+	* include/rgb.H1: Likewise.
+	* include/sockio.h: Likewise.
+	* include/util.h: Likewise.
+	* include/pixmap.h: Rename from pixmap.H1
+
+2010-07-29  Gabriel Dos Reis  <gdr@...>
+
+	* algebra/sf.spad.pamphlet (DoubleFloat): Use builtin
+	trigonometric functions.
+	* interp/g-opt.boot ($VMsideEffectFreeOperators): Include them.
+	* interp/g-util.boot: Expand them.
+	* include/edible.H1: Move declarations to clef/edible.c.  Remove.
+	* driver/utils.h: Give G linkage to declarations.
+	* sman/Makefile.in: Link programs against C++ runtime.
+
+2010-07-29  Gabriel Dos Reis  <gdr@...>
+
+	* driver/main.c (main): Add explicit conversion to
+	openaxiom_spawn_flags. 
+	* driver/utils.c (openaxiom_execute_core): The system want the
+	excepath to be writable.
+	* driver/Makefile.in (%.lo): Compile source programs as C++ programs.
+	(open-axiom$(EXEEXT)): Link as a C++ program.
+
+2010-07-29  Gabriel Dos Reis  <gdr@...>
+
+	* interp/c-util.boot (removeToplevelRETURN_-FROM): New.
+	(transformToBackendCode): Use it to clean function body.
+
+2010-07-28  Gabriel Dos Reis  <gdr@...>
+
+	* interp/spad.lisp (DIVIDE2): Remove.
+	* interp/vmlisp.lisp (QSQUOTIENT): Likewise.
+	(QSREMAINDER): Likewise.
+	* interp/buildom.boot: Use quo and rem in leur of QUOTIENT and
+	REMAINDER or variants.
+	* interp/g-timer.boot: Likewise.
+	* interp/g-util.boot: Likewise.
+	* interp/htsetvar.boot: Likewise.
+	* interp/i-output.boot: Likewise.
+	* interp/incl.boot: Likewise.
+	* interp/msgdb.boot: Likewise.
+	* interp/nrungo.boot: Likewise.
+	* interp/pspad1.boot: Likewise.
+	* interp/topics.boot: Likewise.
+
+2010-07-28  Gabriel Dos Reis  <gdr@...>
+
+	* interp/sys-globals.boot ($VariableCount): Remove.
+	* interp/spad.lisp (QUOTIENT2): Remove.
+	(REMAINDER2): Likewise.
+	* algebra/integer.spad.pamphlet (Integer): Use builtin  %idivide.
+	* algebra/si.spad.pamphlet (SingleInteger): Likewise.
+
+2010-07-28  Gabriel Dos Reis  <gdr@...>
+
+	* algebra/integer.spad.pamphlet (Integer): Use builtin functions
+	%irem and %iquo.
+	* algebra/si.spad.pamphlet (SingleInteger): Likewise.
+
+2010-07-27  Gabriel Dos Reis  <gdr@...>
+
+	* interp/g-opt.boot: Transform %iquo and %irem expressions.
+	($VMsideEffectFreeOperators): Include %irem and %iquo.
+
+2010-07-27  Gabriel Dos Reis  <gdr@...>
+
+	* boot/tokens.boot: quo and rem are now keywords and infix operators.
+	* boot/parser.boot (bpEuclid): New.  Parse integer quotient and
+	remainder expressions.
+	(bpMinus): Now build on bpEuclid instead of bpTimes.
+
+2010-07-27  Gabriel Dos Reis  <gdr@...>
+
+	* interp/i-analy.boot (bottomUpCompile): Use massageBackendCode in
+	lieu of mutateToBackendCode.
+
+2010-07-27  Gabriel Dos Reis  <gdr@...>
+
+	* interp/types.boot (%Code): Include %Char.
+	* interp/c-util.boot (middleEndExpand): Temporarilty Comment out
+	signature.
+
+2010-07-26  Gabriel Dos Reis  <gdr@...>
+
+	* interp/g-opt.boot (optCond): Work harder at denesting nested
+	if-expressions. 
+
+2010-07-26  Gabriel Dos Reis  <gdr@...>
+
+	* interp/g-opt.boot ($VMsideEffectFreeOperators): Include new
+	opcodes %icst0,	%icst1, %when, and %ccst.
+	* interp/g-util.boot: Expand %ccst.
+	* algebra/alql.spad.pamphlet: Clean up.
+	* algebra/array1.spad.pamphlet: Likewise.
+	* algebra/c02.spad.pamphlet: Likewise.
+	* algebra/d03.spad.pamphlet: Likewise.
+	* algebra/e04.spad.pamphlet: Likewise.
+	* algebra/integer.spad.pamphlet: Likewise.
+	* algebra/si.spad.pamphlet: Likewise.
+	* algebra/string.spad.pamphlet: Likewise.
+
+2010-07-26  Gabriel Dos Reis  <gdr@...>
+
+	* algebra/si.spad.pamphlet (SingleInteger): Tidy.
+	* interp/g-opt.boot (simplifyVMForm): Expand %icst0 and %icst1.
+	(optIlt): Fold more configurations.
+
 2010-07-25  Gabriel Dos Reis  <gdr@...>
 
+	* interp/g-opt.boot (optCond): Simplify newly built COND-expression.
+
+2010-07-25  Gabriel Dos Reis  <gdr@...>
+
 	* interp/g-opt.boot (optimize): Remove as no longer used.
 	* interp/define.boot (DomainSubstitutionFunction): Use
 	simplifyVMForm in lieu of optimize.

Modified: jap-sandbox/src/algebra/alql.spad.pamphlet
===================================================================
--- jap-sandbox/src/algebra/alql.spad.pamphlet	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/alql.spad.pamphlet	2010-07-29 21:06:32 UTC (rev 1729)
@@ -55,6 +55,7 @@
       ++ \axiom{s} is not of the right format then an error will occur when using
       ++ it.
   Implementation == add
+    macro I == Integer
     Rep == String
 
     x<y == rep x < rep y
@@ -63,15 +64,15 @@
 
     display(x) ==
       name : OutputForm := dbName(x)$Lisp
-      type : OutputForm := dbPart(x,4,1$Lisp)$Lisp
+      type : OutputForm := dbPart(x,4,1@...
       output(hconcat(name,hconcat(" : ",type)))$OutputPackage
 
     fullDisplay(x) ==
       name : OutputForm := dbName(x)$Lisp
-      type : OutputForm := dbPart(x,4,1$Lisp)$Lisp
+      type : OutputForm := dbPart(x,4,1@...
       origin:OutputForm := hconcat(alqlGetOrigin(x$Lisp)$Lisp,alqlGetParams(x$Lisp)$Lisp)
       fromPart : OutputForm := hconcat(" from ",origin)
-      condition : String := dbPart(x,6,1$Lisp)$Lisp
+      condition : String := dbPart(x,6,1@...
       ifPart : OutputForm :=
         condition = "" => empty()
         hconcat(" if ",condition::OutputForm)
@@ -89,14 +90,14 @@
 
     elt(x,sel) ==
       sel = 'name => dbName(x)$Lisp
-      sel = 'nargs => dbPart(x,2,1$Lisp)$Lisp
+      sel = 'nargs => dbPart(x,2,1@...
       sel = 'exposed => SUBSTRING(dbPart(x,3,1)$Lisp,0,1)$Lisp 
-      sel = 'type => dbPart(x,4,1$Lisp)$Lisp
-      sel = 'abbreviation => dbPart(x,5,1$Lisp)$Lisp
+      sel = 'type => dbPart(x,4,1@...
+      sel = 'abbreviation => dbPart(x,5,1@...
       sel = 'kind => alqlGetKindString(x)$Lisp
       sel = 'origin => alqlGetOrigin(x)$Lisp
       sel = 'params => alqlGetParams(x)$Lisp
-      sel = 'condition => dbPart(x,6,1$Lisp)$Lisp
+      sel = 'condition => dbPart(x,6,1@...
       sel = 'doc => dbComments(x)$Lisp
       userError "unknown selector"
 

Modified: jap-sandbox/src/algebra/array1.spad.pamphlet
===================================================================
--- jap-sandbox/src/algebra/array1.spad.pamphlet	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/array1.spad.pamphlet	2010-07-29 21:06:32 UTC (rev 1729)
@@ -15,8 +15,10 @@
 ++ This provides a fast array type with no bound checking on elt's.
 ++ Minimum index is 0 in this type, cannot be changed
 PrimitiveArray(S:Type): OneDimensionalArrayAggregate S == add
+   macro NNI == NonNegativeInteger
    import %vlength: % -> NonNegativeInteger from Foreign Builtin
    import %vref: (%,Integer) -> S           from Foreign Builtin
+   import makeSimpleArray: (Domain,NNI) -> % from Foreign Builtin
 
    #x == %vlength x
 
@@ -24,7 +26,7 @@
      0
  
    empty() == 
-     makeSimpleArray(getVMType(S)$Lisp,0$Lisp)$Lisp
+     makeSimpleArray(getVMType(S)$Lisp,0)
 
    construct l ==
      makeSimpleArrayFromList(getVMType(S)$Foreign(Builtin),l)$Foreign(Builtin)
@@ -429,12 +431,12 @@
      qsetelt!(x, i, s) == Qsetelt(x, i-1, s)
 
      elt(x:%, i:I) ==
-       QSLESSP(i,1$Lisp)$Lisp or QSLESSP(%vlength x,i)$Lisp =>
+       QSLESSP(i,1@... or QSLESSP(%vlength x,i)$Lisp =>
          error "index out of range"
        %vref(x, i-1)
 
      setelt(x:%, i:I, s:S) ==
-       QSLESSP(i,1$Lisp)$Lisp or QSLESSP(%vlength x,i)$Lisp =>
+       QSLESSP(i,1@... or QSLESSP(%vlength x,i)$Lisp =>
          error "index out of range"
        Qsetelt(x, i-1, s)
 

Modified: jap-sandbox/src/algebra/c02.spad.pamphlet
===================================================================
--- jap-sandbox/src/algebra/c02.spad.pamphlet	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/c02.spad.pamphlet	2010-07-29 21:06:32 UTC (rev 1729)
@@ -48,6 +48,7 @@
     import AnyFunctions1(Matrix DoubleFloat)
     import AnyFunctions1(Integer)
     import AnyFunctions1(Boolean)
+    macro I == Integer
 
 
     c02aff(aArg:Matrix DoubleFloat,nArg:Integer,scaleArg:Boolean,_
@@ -56,8 +57,8 @@
 	"c02aff",_
 	["n"::S,"scale"::S,"ifail"::S,"a"::S,"z"::S,"w"::S]$Lisp,_
 	["z"::S,"w"::S]$Lisp,_
-	[["double"::S,["a"::S,2$Lisp,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp_
-	,["z"::S,2$Lisp,"n"::S]$Lisp,["w"::S,["*"::S,["+"::S,"n"::S,1$Lisp]$Lisp,4$Lisp]$Lisp]$Lisp]$Lisp_
+	[["double"::S,["a"::S,2$Lisp,["+"::S,"n"::S,1@..._
+	,["z"::S,2$Lisp,"n"::S]$Lisp,["w"::S,["*"::S,["+"::S,"n"::S,1@..._
 	,["integer"::S,"n"::S,"ifail"::S]$Lisp_
 	,["logical"::S,"scale"::S]$Lisp_
 	]$Lisp,_
@@ -74,8 +75,8 @@
 	"c02agf",_
 	["n"::S,"scale"::S,"ifail"::S,"a"::S,"z"::S,"w"::S]$Lisp,_
 	["z"::S,"w"::S]$Lisp,_
-	[["double"::S,["a"::S,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp_
-	,["z"::S,2$Lisp,"n"::S]$Lisp,["w"::S,["*"::S,["+"::S,"n"::S,1$Lisp]$Lisp,2$Lisp]$Lisp]$Lisp]$Lisp_
+	[["double"::S,["a"::S,["+"::S,"n"::S,1@..._
+	,["z"::S,2$Lisp,"n"::S]$Lisp,["w"::S,["*"::S,["+"::S,"n"::S,1@..._
 	,["integer"::S,"n"::S,"ifail"::S]$Lisp_
 	,["logical"::S,"scale"::S]$Lisp_
 	]$Lisp,_

Modified: jap-sandbox/src/algebra/d03.spad.pamphlet
===================================================================
--- jap-sandbox/src/algebra/d03.spad.pamphlet	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/d03.spad.pamphlet	2010-07-29 21:06:32 UTC (rev 1729)
@@ -64,6 +64,7 @@
     import FortranPackage
     import Union(fn:FileName,fp:Asp73(PDEF))
     import Union(fn:FileName,fp:Asp74(BNDY))
+    macro I == Integer
 
 
 
@@ -136,11 +137,11 @@
 	,"lwrk"::S,"pertrb"::S,"ifail"::S,"bdxs"::S,"bdxf"::S,"bdys"::S,"bdyf"::S,"bdzs"::S_
 	,"bdzf"::S,"f"::S,"w"::S]$Lisp,_
 	["pertrb"::S,"w"::S]$Lisp,_
-	[["double"::S,"xs"::S,"xf"::S,["bdxs"::S,"mdimf"::S,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp_
-	,["bdxf"::S,"mdimf"::S,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp,"ys"::S,"yf"::S,["bdys"::S,"ldimf"::S,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp_
-	,["bdyf"::S,"ldimf"::S,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp,"zs"::S_
-	,"zf"::S,["bdzs"::S,"ldimf"::S,["+"::S,"m"::S,1$Lisp]$Lisp]$Lisp,["bdzf"::S,"ldimf"::S,["+"::S,"m"::S,1$Lisp]$Lisp]$Lisp_
-	,"lambda"::S,"pertrb"::S,["f"::S,"ldimf"::S,"mdimf"::S,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp,["w"::S,"lwrk"::S]$Lisp]$Lisp_
+	[["double"::S,"xs"::S,"xf"::S,["bdxs"::S,"mdimf"::S,["+"::S,"n"::S,1@..._
+	,["bdxf"::S,"mdimf"::S,["+"::S,"n"::S,1@..._
+	,["bdyf"::S,"ldimf"::S,["+"::S,"n"::S,1@..._
+	,"zf"::S,["bdzs"::S,"ldimf"::S,["+"::S,"m"::S,1@..._
+	,"lambda"::S,"pertrb"::S,["f"::S,"ldimf"::S,"mdimf"::S,["+"::S,"n"::S,1@..._
 	,["integer"::S,"l"::S,"lbdcnd"::S,"m"::S,"mbdcnd"::S_
 	,"n"::S,"nbdcnd"::S,"ldimf"::S,"mdimf"::S,"lwrk"::S,"ifail"::S]$Lisp_
 	]$Lisp,_

Modified: jap-sandbox/src/algebra/e04.spad.pamphlet
===================================================================
--- jap-sandbox/src/algebra/e04.spad.pamphlet	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/e04.spad.pamphlet	2010-07-29 21:06:32 UTC (rev 1729)
@@ -115,6 +115,7 @@
     import AnyFunctions1(Boolean)
     import AnyFunctions1(Matrix DoubleFloat)
     import AnyFunctions1(Matrix Integer)
+    macro I == Integer
 
 
     e04dgf(nArg:Integer,esArg:DoubleFloat,fuArg:DoubleFloat,_
@@ -139,7 +140,7 @@
 	,"op"::S,"objf"::S,["objgrd"::S,"n"::S]$Lisp,["x"::S,"n"::S]$Lisp,["work"::S,["*"::S,13$Lisp,"n"::S]$Lisp]$Lisp,["user"::S,"*"::S]$Lisp_
 	,"objfun"::S]$Lisp_
 	,["integer"::S,"n"::S,"it"::S,"pr"::S,"sta"::S_
-	,"sto"::S,"ve"::S,"iter"::S,"ifail"::S,["iwork"::S,["+"::S,"n"::S,1$Lisp]$Lisp]$Lisp,["iuser"::S,"*"::S]$Lisp]$Lisp_
+	,"sto"::S,"ve"::S,"iter"::S,"ifail"::S,["iwork"::S,["+"::S,"n"::S,1@..._
 	,["logical"::S,"list"::S]$Lisp_
 	]$Lisp,_
 	["iter"::S,"objf"::S,"objgrd"::S,"x"::S,"ifail"::S]$Lisp,_
@@ -321,11 +322,11 @@
 	,"cra"::S,"fea"::S,"fun"::S,"infb"::S,"infs"::S,"linf"::S,"lint"::S,"nonf"::S,"opt"::S,"ste"::S_
 	,["c"::S,"ncnln"::S]$Lisp,"objf"::S,["objgrd"::S,"n"::S]$Lisp,["cjac"::S,"nrowj"::S,"n"::S]$Lisp,["clamda"::S,["+"::S,["+"::S,"nclin"::S,"ncnln"::S]$Lisp,"n"::S]$Lisp]$Lisp_
 	,["r"::S,"nrowr"::S,"n"::S]$Lisp,["x"::S,"n"::S]$Lisp,["work"::S,"lwork"::S]$Lisp_
-	,["user"::S,1$Lisp]$Lisp,"confun"::S,"objfun"::S]$Lisp_
+	,["user"::S,1@..._
 	,["integer"::S,"n"::S,"nclin"::S,"ncnln"::S_
 	,"nrowa"::S,"nrowj"::S,"nrowr"::S,"liwork"::S,"lwork"::S,"der"::S,"maji"::S,"majp"::S,"mini"::S,"minp"::S,"mon"::S,"stao"::S_
 	,"stac"::S,"stoo"::S,"stoc"::S,"ve"::S,"iter"::S,["istate"::S,["+"::S,["+"::S,"nclin"::S,"ncnln"::S]$Lisp,"n"::S]$Lisp]$Lisp_
-	,"ifail"::S,["iwork"::S,"liwork"::S]$Lisp,["iuser"::S,1$Lisp]$Lisp]$Lisp_
+	,"ifail"::S,["iwork"::S,"liwork"::S]$Lisp,["iuser"::S,1@..._
 	,["logical"::S,"sta"::S,"hes"::S,"list"::S]$Lisp_
 	]$Lisp,_
 	["iter"::S,"c"::S,"objf"::S,"objgrd"::S,"istate"::S,"cjac"::S,"clamda"::S,"r"::S,"x"::S,"ifail"::S]$Lisp,_

Modified: jap-sandbox/src/algebra/integer.spad.pamphlet
===================================================================
--- jap-sandbox/src/algebra/integer.spad.pamphlet	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/integer.spad.pamphlet	2010-07-29 21:06:32 UTC (rev 1729)
@@ -82,17 +82,31 @@
  == add
       ZP ==> SparseUnivariatePolynomial %
       ZZP ==> SparseUnivariatePolynomial Integer
+      import %icst0: %                 from Foreign Builtin
+      import %icst1: %                 from Foreign Builtin
       import %ineg: % -> %             from Foreign Builtin
+      import %iabs: % -> %             from Foreign Builtin
+      import %iodd?: % -> Boolean      from Foreign Builtin
       import %hash: % -> SingleInteger from Foreign Builtin
       import %iadd: (%,%) -> %         from Foreign Builtin
       import %isub: (%,%) -> %         from Foreign Builtin
       import %imul: (%,%) -> %         from Foreign Builtin
+      import %irem: (%,%) -> %         from Foreign Builtin
+      import %iquo: (%,%) -> %         from Foreign Builtin
+      import %imax: (%,%) -> %         from Foreign Builtin
+      import %imin: (%,%) -> %         from Foreign Builtin
+      import %igcd: (%,%) -> %         from Foreign Builtin
+      import %ieq: (%,%) -> Boolean    from Foreign Builtin
+      import %ilt: (%,%) -> Boolean    from Foreign Builtin
+      import %ile: (%,%) -> Boolean    from Foreign Builtin
+      import %igt: (%,%) -> Boolean    from Foreign Builtin
+      import %ige: (%,%) -> Boolean    from Foreign Builtin
 
       x,y: %
       n: NonNegativeInteger
 
       writeOMInt(dev: OpenMathDevice, x: %): Void ==
-        if x < 0 then
+        if negative? x then
           OMputApp(dev)
           OMputSymbol(dev, "arith1", "unary__minus")
           OMputInteger(dev, (-x) pretend Integer)
@@ -102,27 +116,25 @@
 
       OMwrite(x: %): String ==
         s: String := ""
-        sp := OM_-STRINGTOSTRINGPTR(s)$Lisp
-        dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML())
+        sp: String := OM_-STRINGTOSTRINGPTR(s)$Lisp
+        dev: OpenMathDevice := OMopenString(sp, OMencodingXML())
         OMputObject(dev)
         writeOMInt(dev, x)
         OMputEndObject(dev)
         OMclose(dev)
-        s := OM_-STRINGPTRTOSTRING(sp)$Lisp pretend String
-        s
+        OM_-STRINGPTRTOSTRING(sp)$Lisp
 
       OMwrite(x: %, wholeObj: Boolean): String ==
         s: String := ""
-        sp := OM_-STRINGTOSTRINGPTR(s)$Lisp
-        dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML())
+        sp: String := OM_-STRINGTOSTRINGPTR(s)$Lisp
+        dev: OpenMathDevice := OMopenString(sp, OMencodingXML())
         if wholeObj then
           OMputObject(dev)
         writeOMInt(dev, x)
         if wholeObj then
           OMputEndObject(dev)
         OMclose(dev)
-        s := OM_-STRINGPTRTOSTRING(sp)$Lisp pretend String
-        s
+        OM_-STRINGPTRTOSTRING(sp)$Lisp
 
       OMwrite(dev: OpenMathDevice, x: %): Void ==
         OMputObject(dev)
@@ -136,34 +148,36 @@
         if wholeObj then
           OMputEndObject(dev)
 
-      zero? x == ZEROP(x)$Lisp
-      one? x == x = 1
-      0 == 0$Lisp
-      1 == 1$Lisp
-      base()  == 2$Lisp
+      zero? x == x = 0@%
+      one? x == x = 1@%
+      0 == %icst0
+      1 == %icst1
+      base()  == 2 pretend %
       copy x  == x
-      inc  x  == x + 1
-      dec  x  == x - 1
+      inc  x  == x + 1@%
+      dec  x  == x - 1@%
       hash x == %hash x
-      negative? x == x < 0
+      negative? x == x < 0@%
       coerce(x):OutputForm == outputForm(x pretend Integer)
       coerce(m:Integer):% == m pretend %
       convert(x:%):Integer == x pretend Integer
       length a == INTEGER_-LENGTH(a)$Lisp
       addmod(a, b, p) ==
-         (c := %iadd(a,b)) >= p => c - p
+         c := %iadd(a,b)
+         c >= p => c - p
          c
       submod(a, b, p) ==
-         (c := %isub(a,b)) < 0 => c + p
+         c := %isub(a,b)
+         negative? c => c + p
          c
       mulmod(a, b, p) == %imul(a,b) rem p
-      convert(x:%):Float       == coerce(x pretend Integer)$Float
-      convert(x:%):DoubleFloat  == coerce(x pretend Integer)$DoubleFloat
-      convert(x:%):InputForm   == convert(x pretend Integer)$InputForm
-      convert(x:%):String      == string(x pretend Integer)$String
+      convert(x:%):Float       == coerce(x)$Float
+      convert(x:%):DoubleFloat  == coerce(x)$DoubleFloat
+      convert(x:%):InputForm   == convert(x)$InputForm
+      convert(x:%):String      == string(x)$String
 
       latex(x:%):String ==
-        s : String := string(x pretend Integer)$String
+        s : String := string(x)$String
         (-1 < (x pretend Integer)) and ((x  pretend Integer) < 10) => s
         concat("{", concat(s, "}")$String)$String
 
@@ -180,33 +194,33 @@
        Record(mat:Matrix(Integer), vec:Vector(Integer)) ==
         [m pretend Matrix(Integer), vec pretend Vector(Integer)]
 
-      abs(x) == %iabs(x)$Foreign(Builtin)
+      abs(x) == %iabs x
       random() == random()$Lisp
       random(x) == RANDOM(x)$Lisp
-      x = y == %ieq(x,y)$Foreign(Builtin)
-      x < y == %ilt(x,y)$Foreign(Builtin)
-      x > y == %igt(x,y)$Foreign(Builtin)
-      x <= y == %ile(x,y)$Foreign(Builtin)
-      x >= y == %ige(x,y)$Foreign(Builtin)
+      x = y == %ieq(x,y)
+      x < y == %ilt(x,y)
+      x > y == %igt(x,y)
+      x <= y == %ile(x,y)
+      x >= y == %ige(x,y)
       - x == %ineg x
       x + y == %iadd(x,y)
       x - y == %isub(x,y)
       x * y == %imul(x,y)
       (m:Integer) * (y:%) == %imul(m,y) -- for subsumption problem
       x ** n == %ipow(x,n)$Foreign(Builtin)
-      odd? x == %iodd?(x)$Foreign(Builtin)
-      max(x,y) == %imax(x,y)$Foreign(Builtin)
-      min(x,y) == %imin(x,y)$Foreign(Builtin)
-      divide(x,y) == DIVIDE2(x,y)$Lisp
-      x quo y == QUOTIENT2(x,y)$Lisp
-      x rem y == REMAINDER2(x,y)$Lisp
+      odd? x == %iodd? x
+      max(x,y) == %imax(x,y)
+      min(x,y) == %imin(x,y)
+      divide(x,y) == %idivide(x,y)$Foreign(Builtin)
+      x quo y == %iquo(x,y)
+      x rem y == %irem(x,y)
       shift(x, y) == ASH(x,y)$Lisp
       recip(x) == if one? x or x=-1 then x else "failed"
-      gcd(x,y) == %igcd(x,y)$Foreign(Builtin)
+      gcd(x,y) == %igcd(x,y)
       UCA ==> Record(unit:%,canonical:%,associate:%)
       unitNormal x ==
-         x < 0 => [-1,-x,-1]$UCA
-         [1,x,1]$UCA
+         negative? x => [-1@...
+         [1@...
       unitCanonical x == abs x
       solveLinearPolynomialEquation(lp:List ZP,p:ZP):Union(List ZP,"failed") ==
          solveLinearPolynomialEquation(lp pretend List ZZP,

Modified: jap-sandbox/src/algebra/sf.spad.pamphlet
===================================================================
--- jap-sandbox/src/algebra/sf.spad.pamphlet	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/sf.spad.pamphlet	2010-07-29 21:06:32 UTC (rev 1729)
@@ -279,6 +279,7 @@
 
  == add
    MER ==> Record(MANTISSA:Integer,EXPONENT:Integer)
+   import %hash: % -> SingleInteger     from Foreign Builtin
    import %fminval: () -> %             from Foreign Builtin
    import %fmaxval: () -> %             from Foreign Builtin
    import %fbase: () -> PositiveInteger from Foreign Builtin
@@ -298,6 +299,22 @@
    import %fle: (%,%) -> Boolean        from Foreign Builtin
    import %fgt: (%,%) -> Boolean        from Foreign Builtin
    import %fge: (%,%) -> Boolean        from Foreign Builtin
+   import %fsin: % -> %                 from Foreign Builtin
+   import %fcos: % -> %                 from Foreign Builtin
+   import %ftan: % -> %                 from Foreign Builtin
+   import %fcot: % -> %                 from Foreign Builtin
+   import %fsec: % -> %                 from Foreign Builtin
+   import %fcsc: % -> %                 from Foreign Builtin
+   import %fatan: % -> %                from Foreign Builtin
+   import %facot: % -> %                from Foreign Builtin
+   import %fsinh: % -> %                from Foreign Builtin
+   import %fcosh: % -> %                from Foreign Builtin
+   import %ftanh: % -> %                from Foreign Builtin
+   import %fcsch: % -> %                from Foreign Builtin
+   import %fcoth: % -> %                from Foreign Builtin
+   import %fsech: % -> %                from Foreign Builtin
+   import %fasinh: % -> %               from Foreign Builtin
+   import %facsch: % -> %               from Foreign Builtin
 
    manexp: % -> MER
 
@@ -381,35 +398,35 @@
    exp x            == EXP(x)$Lisp
    log x            == checkComplex LN(x)$Lisp
    log2 x           == checkComplex LOG2(x)$Lisp
-   sin x            == SIN(x)$Lisp
-   cos x            == COS(x)$Lisp
-   tan x            == TAN(x)$Lisp
-   cot x            == COT(x)$Lisp
-   sec x            == SEC(x)$Lisp
-   csc x            == CSC(x)$Lisp
+   sin x            == %fsin x
+   cos x            == %fcos x
+   tan x            == %ftan x
+   cot x            == %fcot x
+   sec x            == %fsec x
+   csc x            == %fcsc x
    asin x           == checkComplex ASIN(x)$Lisp -- can be complex
    acos x           == checkComplex ACOS(x)$Lisp -- can be complex
-   atan x           == ATAN(x)$Lisp
+   atan x           == %fatan x
    acsc x           == checkComplex ACSC(x)$Lisp
-   acot x           == ACOT(x)$Lisp
+   acot x           == %facot x
    asec x           == checkComplex ASEC(x)$Lisp
-   sinh x           == SINH(x)$Lisp
-   cosh x           == COSH(x)$Lisp
-   tanh x           == TANH(x)$Lisp
-   csch x           == CSCH(x)$Lisp
-   coth x           == COTH(x)$Lisp
-   sech x           == SECH(x)$Lisp
-   asinh x          == ASINH(x)$Lisp
+   sinh x           == %fsinh x
+   cosh x           == %fcosh x
+   tanh x           == %ftanh x
+   csch x           == %fcsch x
+   coth x           == %fcoth x
+   sech x           == %fsech x
+   asinh x          == %fasinh x
    acosh x          == checkComplex ACOSH(x)$Lisp -- can be complex
    atanh x          == checkComplex ATANH(x)$Lisp -- can be complex
-   acsch x          == ACSCH(x)$Lisp
+   acsch x          == %facsch x
    acoth x          == checkComplex ACOTH(x)$Lisp
    asech x          == checkComplex ASECH(x)$Lisp
    x:% / y:%        == %fdiv(x,y)
    negative? x      == x < 0
    zero? x          == x = 0
    one? x           == x = 1
-   hash x           == HASHEQ(x)$Lisp
+   hash x           == %hash x
    recip(x)         == (zero? x => "failed"; 1 / x)
    differentiate x  == 0
 

Modified: jap-sandbox/src/algebra/si.spad.pamphlet
===================================================================
--- jap-sandbox/src/algebra/si.spad.pamphlet	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/si.spad.pamphlet	2010-07-29 21:06:32 UTC (rev 1729)
@@ -181,9 +181,9 @@
 
 
 -- Lisp dependencies
--- EQ, ABSVAL, TIMES, INTEGER-LENGTH, HASHEQ, REMAINDER
+-- EQ, ABSVAL, TIMES, INTEGER-LENGTH, HASHEQ, 
 -- QSLESSP, QSGREATERP, QSADD1, QSSUB1, QSMINUS, QSPLUS, QSDIFFERENCE
--- QSTIMES, QSREMAINDER, QSODDP, QSZEROP, QSMAX, QSMIN, QSNOT, QSAND
+-- QSTIMES,, QSODDP, QSZEROP, QSMAX, QSMIN, QSNOT, QSAND
 -- QSOR, QSXOR, QSLEFTSHIFT, QSADDMOD, QSDIFMOD, QSMULTMOD
 
 
@@ -210,7 +210,27 @@
 
  == SubDomain(Integer, SMINTP(#1)$Lisp) add
 
-   seed : % := 1$Lisp               -- for random()
+   import %icst0: %                 from Foreign Builtin
+   import %icst1: %                 from Foreign Builtin
+   import %iadd: (%,%) -> %         from Foreign Builtin
+   import %isub: (%,%) -> %         from Foreign Builtin
+   import %imul: (%,%) -> %         from Foreign Builtin
+   import %irem: (%,%) -> %         from Foreign Builtin
+   import %iquo: (%,%) -> %         from Foreign Builtin
+   import %ineg: % -> %             from Foreign Builtin
+   import %iabs: % -> %             from Foreign Builtin
+   import %imax: (%,%) -> %         from Foreign Builtin
+   import %imin: (%,%) -> %         from Foreign Builtin
+   import %igcd: (%,%) -> %         from Foreign Builtin
+   import %hash: % -> SingleInteger from Foreign Builtin
+   import %iodd?: % -> Boolean      from Foreign Builtin
+   import %ieq: (%,%) -> Boolean    from Foreign Builtin
+   import %ilt: (%,%) -> Boolean    from Foreign Builtin
+   import %ile: (%,%) -> Boolean    from Foreign Builtin
+   import %igt: (%,%) -> Boolean    from Foreign Builtin
+   import %ige: (%,%) -> Boolean    from Foreign Builtin
+
+   seed : % := %icst1               -- for random()
    MAXINT ==> _$ShortMaximum$Lisp
    MININT ==> _$ShortMinimum$Lisp
    BASE ==> 67108864$Lisp           -- 2**26
@@ -218,7 +238,7 @@
    MODULUS ==> 2147483647$Lisp      -- 2**31-1
 
    writeOMSingleInt(dev: OpenMathDevice, x: %): Void ==
-    if x < 0 then
+    if negative? x then
       OMputApp(dev)
       OMputSymbol(dev, "arith1", "unary_minus")
       OMputInteger(dev, convert(-x))
@@ -265,13 +285,13 @@
    reducedSystem(m: Matrix %) == m pretend Matrix(Integer)
    coerce(x):OutputForm == rep(x)::OutputForm
    convert(x:%):Integer == rep x
-   i:Integer * y:%      == i::% * y
-   0         == 0$Lisp
-   1         == 1$Lisp
-   base()    == 2$Lisp
+   i:Integer * y:%      == %imul(i::%,y)
+   0         == %icst0
+   1         == %icst1
+   base()    == per 2
    max()     == MAXINT
    min()     == MININT
-   x = y     == %ieq(x,y)$Foreign(Builtin)
+   x = y     == %ieq(x,y)
    ~ x       == LOGNOT(x)$Lisp
    not(x)    == LOGNOT(x)$Lisp
    x /\ y    == LOGAND(x,y)$Lisp
@@ -282,29 +302,29 @@
    Or(x,y)   == LOGIOR(x,y)$Lisp
    x or y    == Or(x,y)
    xor(x,y)  == LOGXOR(x,y)$Lisp
-   x < y     == QSLESSP(x,y)$Lisp
-   x > y     == QSGREATERP(x,y)$Lisp
-   x <= y    == %ile(x,y)$Foreign(Builtin)
-   x >= y    == %ige(x,y)$Foreign(Builtin)
+   x < y     == %ilt(x,y)
+   x > y     == %igt(x,y)
+   x <= y    == %ile(x,y)
+   x >= y    == %ige(x,y)
    inc x     == QSADD1(x)$Lisp
    dec x     == QSSUB1(x)$Lisp
-   - x       == QSMINUS(x)$Lisp
-   x + y     == QSPLUS(x,y)$Lisp
-   x:% - y:% == QSDIFFERENCE(x,y)$Lisp
-   x:% * y:% == QSTIMES(x,y)$Lisp
+   - x       == %ineg x
+   x + y     == %iadd(x,y)
+   x:% - y:% == %isub(x,y)
+   x:% * y:% == %imul(x,y)
    x:% ** n:NonNegativeInteger == 
       (%ipow(x, n)$Foreign(Builtin) pretend Integer)::%
-   x quo y   == QSQUOTIENT(x,y)$Lisp
-   x rem y   == QSREMAINDER(x,y)$Lisp
-   divide(x, y)   == CONS(QSQUOTIENT(x,y)$Lisp,QSREMAINDER(x,y)$Lisp)$Lisp
-   gcd(x,y)  == %igcd(x,y)$Foreign(Builtin)
-   abs(x)    == QSABSVAL(x)$Lisp
-   odd?(x)   == QSODDP(x)$Lisp
+   x quo y   == %iquo(x,y)
+   x rem y   == %irem(x,y)
+   divide(x, y)   == %idivide(x,y)$Foreign(Builtin)
+   gcd(x,y)  == %igcd(x,y)
+   abs(x)    == %iabs x
+   odd?(x)   == %iodd? x
    zero?(x)  == QSZEROP(x)$Lisp
-   one?(x)   == x = 1
-   max(x,y)  == QSMAX(x,y)$Lisp
-   min(x,y)  == QSMIN(x,y)$Lisp
-   hash(x)   == HASHEQ(x)$Lisp
+   one?(x)   == x = 1@%
+   max(x,y)  == %imax(x,y)
+   min(x,y)  == %imin(x,y)
+   hash(x)   == %hash x
    length(x) == INTEGER_-LENGTH(x)$Lisp
    shift(x,n)    == QSLEFTSHIFT(x,n)$Lisp
    mulmod(a,b,p) == QSMULTMOD(a,b,p)$Lisp
@@ -321,24 +341,24 @@
         [m pretend Matrix(Integer), v pretend Vector(Integer)]
 
    positiveRemainder(x,n) ==
-      r := QSREMAINDER(x,n)$Lisp
-      QSMINUSP(r)$Lisp =>
-          QSMINUSP(n)$Lisp => QSDIFFERENCE(x, n)$Lisp
-          QSPLUS(r, n)$Lisp
+      r := %irem(x,n)
+      negative? r =>
+        negative? n => x - n 
+        r + n
       r
 
    coerce(x:Integer):% == per x
 
    random() ==
-      seed := REMAINDER(TIMES(MULTIPLIER,seed)$Lisp,MODULUS)$Lisp
-      REMAINDER(seed,BASE)$Lisp
+      seed := TIMES(MULTIPLIER,seed)$Lisp rem MODULUS
+      seed rem BASE
 
    random(n) == RANDOM(n)$Lisp
 
    UCA ==> Record(unit:%,canonical:%,associate:%)
    unitNormal x ==
-      x < 0 => [-1,-x,-1]$UCA
-      [1,x,1]$UCA
+      negative? x => [-1@...
+      [1@...
 
 @
 

Modified: jap-sandbox/src/algebra/strap/CHAR.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/CHAR.lsp	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/strap/CHAR.lsp	2010-07-29 21:06:32 UTC (rev 1729)
@@ -51,15 +51,15 @@
 
 (DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Char|) |CHAR;space;$;12|)) 
 
-(PUT '|CHAR;space;$;12| '|SPADreplace| '(XLAM NIL (CHAR "   " 0))) 
+(PUT '|CHAR;space;$;12| '|SPADreplace| '(XLAM NIL (|%ccst| " "))) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Char|) |CHAR;quote;$;13|)) 
 
-(PUT '|CHAR;quote;$;13| '|SPADreplace| '(XLAM NIL (CHAR "\" " 0))) 
+(PUT '|CHAR;quote;$;13| '|SPADreplace| '(XLAM NIL (|%ccst| "\""))) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Shell|) |%Char|) |CHAR;escape;$;14|)) 
 
-(PUT '|CHAR;escape;$;14| '|SPADreplace| '(XLAM NIL (CHAR "_ " 0))) 
+(PUT '|CHAR;escape;$;14| '|SPADreplace| '(XLAM NIL (|%ccst| "_"))) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Char| |%Shell|) |%Thing|)
                 |CHAR;coerce;$Of;15|)) 
@@ -141,11 +141,11 @@
 
 (DEFUN |CHAR;random;$;11| ($) (CODE-CHAR (RANDOM 256))) 
 
-(DEFUN |CHAR;space;$;12| ($) (DECLARE (IGNORE $)) (CHAR "   " 0)) 
+(DEFUN |CHAR;space;$;12| ($) (DECLARE (IGNORE $)) #\Space) 
 
-(DEFUN |CHAR;quote;$;13| ($) (DECLARE (IGNORE $)) (CHAR "\" " 0)) 
+(DEFUN |CHAR;quote;$;13| ($) (DECLARE (IGNORE $)) #\") 
 
-(DEFUN |CHAR;escape;$;14| ($) (DECLARE (IGNORE $)) (CHAR "_ " 0)) 
+(DEFUN |CHAR;escape;$;14| ($) (DECLARE (IGNORE $)) #\_) 
 
 (DEFUN |CHAR;coerce;$Of;15| (|c| $) (DECLARE (IGNORE $)) |c|) 
 

Modified: jap-sandbox/src/algebra/strap/DFLOAT.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/DFLOAT.lsp	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/strap/DFLOAT.lsp	2010-07-29 21:06:32 UTC (rev 1729)
@@ -184,32 +184,32 @@
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;sin;2$;41|)) 
 
-(PUT '|DFLOAT;sin;2$;41| '|SPADreplace| 'SIN) 
+(PUT '|DFLOAT;sin;2$;41| '|SPADreplace| '|%fsin|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;cos;2$;42|)) 
 
-(PUT '|DFLOAT;cos;2$;42| '|SPADreplace| 'COS) 
+(PUT '|DFLOAT;cos;2$;42| '|SPADreplace| '|%fcos|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;tan;2$;43|)) 
 
-(PUT '|DFLOAT;tan;2$;43| '|SPADreplace| 'TAN) 
+(PUT '|DFLOAT;tan;2$;43| '|SPADreplace| '|%ftan|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;cot;2$;44|)) 
 
-(PUT '|DFLOAT;cot;2$;44| '|SPADreplace| 'COT) 
+(PUT '|DFLOAT;cot;2$;44| '|SPADreplace| '|%fcot|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;sec;2$;45|)) 
 
-(PUT '|DFLOAT;sec;2$;45| '|SPADreplace| 'SEC) 
+(PUT '|DFLOAT;sec;2$;45| '|SPADreplace| '|%fsec|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;csc;2$;46|)) 
 
-(PUT '|DFLOAT;csc;2$;46| '|SPADreplace| 'CSC) 
+(PUT '|DFLOAT;csc;2$;46| '|SPADreplace| '|%fcsc|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;asin;2$;47|)) 
@@ -220,7 +220,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;atan;2$;49|)) 
 
-(PUT '|DFLOAT;atan;2$;49| '|SPADreplace| 'ATAN) 
+(PUT '|DFLOAT;atan;2$;49| '|SPADreplace| '|%fatan|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;acsc;2$;50|)) 
@@ -228,7 +228,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;acot;2$;51|)) 
 
-(PUT '|DFLOAT;acot;2$;51| '|SPADreplace| 'ACOT) 
+(PUT '|DFLOAT;acot;2$;51| '|SPADreplace| '|%facot|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;asec;2$;52|)) 
@@ -236,37 +236,37 @@
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;sinh;2$;53|)) 
 
-(PUT '|DFLOAT;sinh;2$;53| '|SPADreplace| 'SINH) 
+(PUT '|DFLOAT;sinh;2$;53| '|SPADreplace| '|%fsinh|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;cosh;2$;54|)) 
 
-(PUT '|DFLOAT;cosh;2$;54| '|SPADreplace| 'COSH) 
+(PUT '|DFLOAT;cosh;2$;54| '|SPADreplace| '|%fcosh|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;tanh;2$;55|)) 
 
-(PUT '|DFLOAT;tanh;2$;55| '|SPADreplace| 'TANH) 
+(PUT '|DFLOAT;tanh;2$;55| '|SPADreplace| '|%ftanh|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;csch;2$;56|)) 
 
-(PUT '|DFLOAT;csch;2$;56| '|SPADreplace| 'CSCH) 
+(PUT '|DFLOAT;csch;2$;56| '|SPADreplace| '|%fcsch|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;coth;2$;57|)) 
 
-(PUT '|DFLOAT;coth;2$;57| '|SPADreplace| 'COTH) 
+(PUT '|DFLOAT;coth;2$;57| '|SPADreplace| '|%fcoth|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;sech;2$;58|)) 
 
-(PUT '|DFLOAT;sech;2$;58| '|SPADreplace| 'SECH) 
+(PUT '|DFLOAT;sech;2$;58| '|SPADreplace| '|%fsech|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;asinh;2$;59|)) 
 
-(PUT '|DFLOAT;asinh;2$;59| '|SPADreplace| 'ASINH) 
+(PUT '|DFLOAT;asinh;2$;59| '|SPADreplace| '|%fasinh|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;acosh;2$;60|)) 
@@ -277,7 +277,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;acsch;2$;62|)) 
 
-(PUT '|DFLOAT;acsch;2$;62| '|SPADreplace| 'ACSCH) 
+(PUT '|DFLOAT;acsch;2$;62| '|SPADreplace| '|%facsch|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%DoubleFloat|)
                 |DFLOAT;acoth;2$;63|)) 
@@ -303,7 +303,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Short|)
                 |DFLOAT;hash;$Si;69|)) 
 
-(PUT '|DFLOAT;hash;$Si;69| '|SPADreplace| 'HASHEQ) 
+(PUT '|DFLOAT;hash;$Si;69| '|SPADreplace| '|%hash|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%DoubleFloat| |%Shell|) |%Pair|)
                 |DFLOAT;recip;$U;70|)) 
@@ -590,7 +590,7 @@
 
 (DEFUN |DFLOAT;one?;$B;68| (|x| $) (DECLARE (IGNORE $)) (= |x| 1.0)) 
 
-(DEFUN |DFLOAT;hash;$Si;69| (|x| $) (DECLARE (IGNORE $)) (HASHEQ |x|)) 
+(DEFUN |DFLOAT;hash;$Si;69| (|x| $) (DECLARE (IGNORE $)) (SXHASH |x|)) 
 
 (DEFUN |DFLOAT;recip;$U;70| (|x| $)
   (COND ((ZEROP |x|) (CONS 1 "failed")) (T (CONS 0 (/ 1.0 |x|))))) 
@@ -748,7 +748,9 @@
                                             (T
                                              (SEQ
                                               (LETT |#G107|
-                                               (DIVIDE2 |s| |t|)
+                                               (MULTIPLE-VALUE-CALL
+                                                #'CONS
+                                                (TRUNCATE |s| |t|))
                                                |DFLOAT;rationalApproximation;$2NniF;87|)
                                               (LETT |q| (CAR |#G107|)
                                                |DFLOAT;rationalApproximation;$2NniF;87|)
@@ -810,41 +812,33 @@
                 (T 0.0)))
              ((OR (SPADCALL |r| (|getShellEntry| $ 145)) (= |x| 1.0))
               1.0)
-             (T (COND
-                  ((SPADCALL |r| (|getShellEntry| $ 147)) |x|)
-                  (T (SEQ (LETT |n|
-                                (SPADCALL |r| (|getShellEntry| $ 148))
-                                |DFLOAT;**;$F$;88|)
-                          (LETT |d|
-                                (SPADCALL |r| (|getShellEntry| $ 149))
-                                |DFLOAT;**;$F$;88|)
-                          (EXIT (COND
-                                  ((MINUSP |x|)
-                                   (COND
-                                     ((ODDP |d|)
-                                      (COND
-                                        ((ODDP |n|)
-                                         (RETURN-FROM
-                                          |DFLOAT;**;$F$;88|
-                                           (-
-                                            (|DFLOAT;**;$F$;88| (- |x|)
-                                             |r| $))))
-                                        (T
-                                         (RETURN-FROM
-                                          |DFLOAT;**;$F$;88|
-                                           (|DFLOAT;**;$F$;88| (- |x|)
-                                            |r| $)))))
-                                     (T (|error| "negative root"))))
-                                  ((EQL |d| 2)
-                                   (EXPT (|DFLOAT;sqrt;2$;33| |x| $)
-                                    |n|))
-                                  (T (|DFLOAT;**;3$;36| |x|
-                                      (/
-                                       (FLOAT |n|
-                                        |$DoubleFloatMaximum|)
-                                       (FLOAT |d|
-                                        |$DoubleFloatMaximum|))
-                                      $))))))))))))) 
+             ((SPADCALL |r| (|getShellEntry| $ 147)) |x|)
+             (T (SEQ (LETT |n| (SPADCALL |r| (|getShellEntry| $ 148))
+                           |DFLOAT;**;$F$;88|)
+                     (LETT |d| (SPADCALL |r| (|getShellEntry| $ 149))
+                           |DFLOAT;**;$F$;88|)
+                     (EXIT (COND
+                             ((MINUSP |x|)
+                              (COND
+                                ((ODDP |d|)
+                                 (COND
+                                   ((ODDP |n|)
+                                    (RETURN-FROM |DFLOAT;**;$F$;88|
+                                      (-
+                                       (|DFLOAT;**;$F$;88| (- |x|) |r|
+                                        $))))
+                                   (T
+                                    (RETURN-FROM |DFLOAT;**;$F$;88|
+                                      (|DFLOAT;**;$F$;88| (- |x|) |r|
+                                       $)))))
+                                (T (|error| "negative root"))))
+                             ((EQL |d| 2)
+                              (EXPT (|DFLOAT;sqrt;2$;33| |x| $) |n|))
+                             (T (|DFLOAT;**;3$;36| |x|
+                                    (/
+                                     (FLOAT |n| |$DoubleFloatMaximum|)
+                                     (FLOAT |d| |$DoubleFloatMaximum|))
+                                    $))))))))))) 
 
 (DEFUN |DoubleFloat| ()
   (DECLARE (SPECIAL |$ConstructorCache|))

Modified: jap-sandbox/src/algebra/strap/EUCDOM-.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/EUCDOM-.lsp	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/strap/EUCDOM-.lsp	2010-07-29 21:06:32 UTC (rev 1729)
@@ -299,7 +299,7 @@
           (T (SEQ (LETT |l1| (SPADCALL |l| (|getShellEntry| $ 58))
                         |EUCDOM-;multiEuclidean;LSU;11|)
                   (LETT |l2|
-                        (SPADCALL |l1| (QUOTIENT2 |n| 2)
+                        (SPADCALL |l1| (TRUNCATE |n| 2)
                             (|getShellEntry| $ 61))
                         |EUCDOM-;multiEuclidean;LSU;11|)
                   (LETT |u|

Modified: jap-sandbox/src/algebra/strap/FFIELDC-.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/FFIELDC-.lsp	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/strap/FFIELDC-.lsp	2010-07-29 21:06:32 UTC (rev 1729)
@@ -79,7 +79,7 @@
 
 (DEFUN |FFIELDC-;charthRoot;2S;6| (|x| $)
   (SPADCALL |x|
-      (QUOTIENT2 (SPADCALL (|getShellEntry| $ 40))
+      (TRUNCATE (SPADCALL (|getShellEntry| $ 40))
           (|spadConstant| $ 41))
       (|getShellEntry| $ 43))) 
 
@@ -137,7 +137,7 @@
                            (T (SETQ |equalone|
                                     (SPADCALL
                                      (SPADCALL |a|
-                                      (QUOTIENT2 |q| (CAR |exp|))
+                                      (TRUNCATE |q| (CAR |exp|))
                                       (|getShellEntry| $ 58))
                                      (|getShellEntry| $ 59)))))
                          (SETQ #0# (CDR #0#))))
@@ -161,7 +161,7 @@
                            ((ATOM #0#) (RETURN NIL))
                            (T (LET ((|rec| (CAR #0#)))
                                 (SEQ (LETT |a|
-                                      (QUOTIENT2 |ord|
+                                      (TRUNCATE |ord|
                                        (LETT |primeDivisor| (CAR |rec|)
                                         |FFIELDC-;order;SPi;10|))
                                       |FFIELDC-;order;SPi;10|)
@@ -182,7 +182,7 @@
                                            (T
                                             (SEQ (SETQ |ord| |a|)
                                              (SETQ |a|
-                                              (QUOTIENT2 |ord|
+                                              (TRUNCATE |ord|
                                                |primeDivisor|))
                                              (EXIT
                                               (SETQ |goon|
@@ -245,7 +245,7 @@
                                                       (T
                                                        (SEQ
                                                         (SETQ |exp|
-                                                         (QUOTIENT2
+                                                         (TRUNCATE
                                                           |exp| |fac|))
                                                         (LETT
                                                          |exptable|
@@ -267,7 +267,7 @@
                                                            $ 58))
                                                          |FFIELDC-;discreteLog;SNni;11|)
                                                         (LETT |end|
-                                                         (QUOTIENT2
+                                                         (TRUNCATE
                                                           (- |fac| 1)
                                                           |n|)
                                                          |FFIELDC-;discreteLog;SNni;11|)
@@ -330,7 +330,7 @@
                                                                       (SPADCALL
                                                                        |gen|
                                                                        (*
-                                                                        (QUOTIENT2
+                                                                        (TRUNCATE
                                                                          |groupord|
                                                                          |fac|)
                                                                         (-
@@ -392,13 +392,12 @@
              ((SPADCALL |b| |logbase| (|getShellEntry| $ 63))
               (CONS 0 1))
              (T (COND
-                  ((NOT (ZEROP (REMAINDER2
-                                   (LETT |groupord|
-                                    (SPADCALL |logbase|
-                                     (|getShellEntry| $ 19))
-                                    |FFIELDC-;discreteLog;2SU;12|)
-                                   (SPADCALL |b|
-                                    (|getShellEntry| $ 19)))))
+                  ((NOT (ZEROP (REM (LETT |groupord|
+                                     (SPADCALL |logbase|
+                                      (|getShellEntry| $ 19))
+                                     |FFIELDC-;discreteLog;2SU;12|)
+                                    (SPADCALL |b|
+                                     (|getShellEntry| $ 19)))))
                    (SEQ (SPADCALL
                             "discreteLog: second argument not in cyclic group generated by first argument"
                             (|getShellEntry| $ 83))
@@ -425,7 +424,7 @@
                                        |FFIELDC-;discreteLog;2SU;12|)
                                       (LETT |primroot|
                                        (SPADCALL |logbase|
-                                        (QUOTIENT2 |groupord| |fac|)
+                                        (TRUNCATE |groupord| |fac|)
                                         (|getShellEntry| $ 58))
                                        |FFIELDC-;discreteLog;2SU;12|)
                                       (EXIT
@@ -438,7 +437,7 @@
                                              (T
                                               (SEQ
                                                (SETQ |exp|
-                                                (QUOTIENT2 |exp| |fac|))
+                                                (TRUNCATE |exp| |fac|))
                                                (LETT |rhoHelp|
                                                 (SPADCALL |primroot|
                                                  (SPADCALL |a| |exp|

Modified: jap-sandbox/src/algebra/strap/FPS-.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/FPS-.lsp	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/strap/FPS-.lsp	2010-07-29 21:06:32 UTC (rev 1729)
@@ -14,7 +14,7 @@
 (DEFUN |FPS-;digits;Pi;2| ($)
   (LET ((#0=#:G1402
             (MAX 1
-                 (QUOTIENT2
+                 (TRUNCATE
                      (SPADCALL 4004
                          (- (SPADCALL (|getShellEntry| $ 14)) 1)
                          (|getShellEntry| $ 16))

Modified: jap-sandbox/src/algebra/strap/ILIST.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/ILIST.lsp	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/strap/ILIST.lsp	2010-07-29 21:06:32 UTC (rev 1729)
@@ -401,7 +401,7 @@
            (EXIT (COND
                    ((< |n| 3) |p|)
                    (T (SEQ (LETT |l|
-                                 (LET ((#0=#:G1511 (QUOTIENT2 |n| 2)))
+                                 (LET ((#0=#:G1511 (TRUNCATE |n| 2)))
                                    (|check-subtype| (NOT (MINUSP #0#))
                                     '(|NonNegativeInteger|) #0#))
                                  |ILIST;mergeSort|)

Modified: jap-sandbox/src/algebra/strap/INT.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/INT.lsp	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/strap/INT.lsp	2010-07-29 21:06:32 UTC (rev 1729)
@@ -20,8 +20,6 @@
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Boolean|)
                 |INT;zero?;$B;6|)) 
 
-(PUT '|INT;zero?;$B;6| '|SPADreplace| 'ZEROP) 
-
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Boolean|)
                 |INT;one?;$B;7|)) 
 
@@ -209,17 +207,17 @@
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Pair|)
                 |INT;divide;2$R;48|)) 
 
-(PUT '|INT;divide;2$R;48| '|SPADreplace| 'DIVIDE2) 
+(PUT '|INT;divide;2$R;48| '|SPADreplace| '|%idivide|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
                 |INT;quo;3$;49|)) 
 
-(PUT '|INT;quo;3$;49| '|SPADreplace| 'QUOTIENT2) 
+(PUT '|INT;quo;3$;49| '|SPADreplace| '|%iquo|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
                 |INT;rem;3$;50|)) 
 
-(PUT '|INT;rem;3$;50| '|SPADreplace| 'REMAINDER2) 
+(PUT '|INT;rem;3$;50| '|SPADreplace| '|%irem|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Shell|) |%Integer|)
                 |INT;shift;3$;51|)) 
@@ -255,6 +253,8 @@
 (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
                 |INT;gcdPolynomial;3Sup;60|)) 
 
+(PUT '|INT;zero?;$B;6| '|SPADreplace| '(XLAM (|x|) (|%ieq| |x| 0))) 
+
 (PUT '|INT;one?;$B;7| '|SPADreplace| '(XLAM (|x|) (|%ieq| |x| 1))) 
 
 (PUT '|INT;inc;2$;12| '|SPADreplace| '(XLAM (|x|) (|%iadd| |x| 1))) 
@@ -264,48 +264,51 @@
 (PUT '|INT;negative?;$B;15| '|SPADreplace|
      '(XLAM (|x|) (|%ilt| |x| 0))) 
 
+(PUT '|INT;mulmod;4$;22| '|SPADreplace|
+     '(XLAM (|a| |b| |p|) (|%irem| (|%imul| |a| |b|) |p|))) 
+
 (PUT '|INT;unitCanonical;2$;55| '|SPADreplace| '|%iabs|) 
 
 (DEFUN |INT;writeOMInt| (|dev| |x| $)
   (SEQ (COND
          ((MINUSP |x|)
-          (SEQ (SPADCALL |dev| (|getShellEntry| $ 13))
+          (SEQ (SPADCALL |dev| (|getShellEntry| $ 10))
                (SPADCALL |dev| "arith1" "unary_minus"
-                   (|getShellEntry| $ 15))
-               (SPADCALL |dev| (- |x|) (|getShellEntry| $ 18))
-               (EXIT (SPADCALL |dev| (|getShellEntry| $ 19)))))
-         (T (SPADCALL |dev| |x| (|getShellEntry| $ 18)))))) 
+                   (|getShellEntry| $ 12))
+               (SPADCALL |dev| (- |x|) (|getShellEntry| $ 15))
+               (EXIT (SPADCALL |dev| (|getShellEntry| $ 16)))))
+         (T (SPADCALL |dev| |x| (|getShellEntry| $ 15)))))) 
 
 (DEFUN |INT;OMwrite;$S;2| (|x| $)
   (LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
-         (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 21))
-                    (|getShellEntry| $ 22))))
-    (SEQ (SPADCALL |dev| (|getShellEntry| $ 23))
+         (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 18))
+                    (|getShellEntry| $ 19))))
+    (SEQ (SPADCALL |dev| (|getShellEntry| $ 20))
          (|INT;writeOMInt| |dev| |x| $)
-         (SPADCALL |dev| (|getShellEntry| $ 24))
-         (SPADCALL |dev| (|getShellEntry| $ 25))
-         (SETQ |s| (OM-STRINGPTRTOSTRING |sp|)) (EXIT |s|)))) 
+         (SPADCALL |dev| (|getShellEntry| $ 21))
+         (SPADCALL |dev| (|getShellEntry| $ 22))
+         (EXIT (OM-STRINGPTRTOSTRING |sp|))))) 
 
 (DEFUN |INT;OMwrite;$BS;3| (|x| |wholeObj| $)
   (LET* ((|s| "") (|sp| (OM-STRINGTOSTRINGPTR |s|))
-         (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 21))
-                    (|getShellEntry| $ 22))))
-    (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23))))
+         (|dev| (SPADCALL |sp| (SPADCALL (|getShellEntry| $ 18))
+                    (|getShellEntry| $ 19))))
+    (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 20))))
          (|INT;writeOMInt| |dev| |x| $)
-         (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 24))))
-         (SPADCALL |dev| (|getShellEntry| $ 25))
-         (SETQ |s| (OM-STRINGPTRTOSTRING |sp|)) (EXIT |s|)))) 
+         (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 21))))
+         (SPADCALL |dev| (|getShellEntry| $ 22))
+         (EXIT (OM-STRINGPTRTOSTRING |sp|))))) 
 
 (DEFUN |INT;OMwrite;Omd$V;4| (|dev| |x| $)
-  (SEQ (SPADCALL |dev| (|getShellEntry| $ 23))
+  (SEQ (SPADCALL |dev| (|getShellEntry| $ 20))
        (|INT;writeOMInt| |dev| |x| $)
-       (EXIT (SPADCALL |dev| (|getShellEntry| $ 24))))) 
+       (EXIT (SPADCALL |dev| (|getShellEntry| $ 21))))) 
 
 (DEFUN |INT;OMwrite;Omd$BV;5| (|dev| |x| |wholeObj| $)
-  (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 23))))
+  (SEQ (COND (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 20))))
        (|INT;writeOMInt| |dev| |x| $)
        (EXIT (COND
-               (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 24))))))) 
+               (|wholeObj| (SPADCALL |dev| (|getShellEntry| $ 21))))))) 
 
 (DEFUN |INT;zero?;$B;6| (|x| $) (DECLARE (IGNORE $)) (ZEROP |x|)) 
 
@@ -330,7 +333,7 @@
   (MINUSP |x|)) 
 
 (DEFUN |INT;coerce;$Of;16| (|x| $)
-  (SPADCALL |x| (|getShellEntry| $ 45))) 
+  (SPADCALL |x| (|getShellEntry| $ 42))) 
 
 (DEFUN |INT;coerce;2$;17| (|m| $) (DECLARE (IGNORE $)) |m|) 
 
@@ -348,17 +351,18 @@
   (LET ((|c| (- |a| |b|))) (COND ((MINUSP |c|) (+ |c| |p|)) (T |c|)))) 
 
 (DEFUN |INT;mulmod;4$;22| (|a| |b| |p| $)
-  (REMAINDER2 (* |a| |b|) |p|)) 
+  (DECLARE (IGNORE $))
+  (REM (* |a| |b|) |p|)) 
 
 (DEFUN |INT;convert;$F;23| (|x| $)
-  (SPADCALL |x| (|getShellEntry| $ 56))) 
+  (SPADCALL |x| (|getShellEntry| $ 53))) 
 
 (DEFUN |INT;convert;$Df;24| (|x| $)
   (DECLARE (IGNORE $))
   (FLOAT |x| |$DoubleFloatMaximum|)) 
 
 (DEFUN |INT;convert;$If;25| (|x| $)
-  (SPADCALL |x| (|getShellEntry| $ 62))) 
+  (SPADCALL |x| (|getShellEntry| $ 59))) 
 
 (DEFUN |INT;convert;$S;26| (|x| $)
   (DECLARE (IGNORE $))
@@ -374,9 +378,7 @@
     (RETURN
       (COND
         ((|INT;negative?;$B;15|
-             (LETT |r| (REMAINDER2 |a| |b|)
-                   |INT;positiveRemainder;3$;28|)
-             $)
+             (LETT |r| (REM |a| |b|) |INT;positiveRemainder;3$;28|) $)
          (COND ((MINUSP |b|) (- |r| |b|)) (T (+ |r| |b|))))
         (T |r|))))) 
 
@@ -428,15 +430,13 @@
 
 (DEFUN |INT;divide;2$R;48| (|x| |y| $)
   (DECLARE (IGNORE $))
-  (DIVIDE2 |x| |y|)) 
+  (MULTIPLE-VALUE-CALL #'CONS (TRUNCATE |x| |y|))) 
 
 (DEFUN |INT;quo;3$;49| (|x| |y| $)
   (DECLARE (IGNORE $))
-  (QUOTIENT2 |x| |y|)) 
+  (TRUNCATE |x| |y|)) 
 
-(DEFUN |INT;rem;3$;50| (|x| |y| $)
-  (DECLARE (IGNORE $))
-  (REMAINDER2 |x| |y|)) 
+(DEFUN |INT;rem;3$;50| (|x| |y| $) (DECLARE (IGNORE $)) (REM |x| |y|)) 
 
 (DEFUN |INT;shift;3$;51| (|x| |y| $)
   (DECLARE (IGNORE $))
@@ -457,50 +457,50 @@
   (ABS |x|)) 
 
 (DEFUN |INT;solveLinearPolynomialEquation| (|lp| |p| $)
-  (SPADCALL |lp| |p| (|getShellEntry| $ 102))) 
+  (SPADCALL |lp| |p| (|getShellEntry| $ 101))) 
 
 (DEFUN |INT;squareFreePolynomial| (|p| $)
-  (SPADCALL |p| (|getShellEntry| $ 106))) 
+  (SPADCALL |p| (|getShellEntry| $ 105))) 
 
 (DEFUN |INT;factorPolynomial| (|p| $)
-  (LET ((|pp| (SPADCALL |p| (|getShellEntry| $ 107))))
+  (LET ((|pp| (SPADCALL |p| (|getShellEntry| $ 106))))
     (COND
-      ((EQL (SPADCALL |pp| (|getShellEntry| $ 108))
-            (SPADCALL |p| (|getShellEntry| $ 108)))
-       (SPADCALL |p| (|getShellEntry| $ 110)))
-      (T (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 110))
+      ((EQL (SPADCALL |pp| (|getShellEntry| $ 107))
+            (SPADCALL |p| (|getShellEntry| $ 107)))
+       (SPADCALL |p| (|getShellEntry| $ 109)))
+      (T (SPADCALL (SPADCALL |pp| (|getShellEntry| $ 109))
              (SPADCALL (CONS #'|INT;factorPolynomial!0| $)
                  (SPADCALL
-                     (LET ((#0=#:G1499
+                     (LET ((#0=#:G1504
                                (SPADCALL
                                    (SPADCALL |p|
-                                    (|getShellEntry| $ 108))
+                                    (|getShellEntry| $ 107))
                                    (SPADCALL |pp|
-                                    (|getShellEntry| $ 108))
-                                   (|getShellEntry| $ 112))))
+                                    (|getShellEntry| $ 107))
+                                   (|getShellEntry| $ 111))))
                        (|check-union| (ZEROP (CAR #0#)) $ #0#)
                        (CDR #0#))
-                     (|getShellEntry| $ 114))
-                 (|getShellEntry| $ 118))
-             (|getShellEntry| $ 120)))))) 
+                     (|getShellEntry| $ 113))
+                 (|getShellEntry| $ 117))
+             (|getShellEntry| $ 119)))))) 
 
 (DEFUN |INT;factorPolynomial!0| (|#1| $)
-  (SPADCALL |#1| (|getShellEntry| $ 111))) 
+  (SPADCALL |#1| (|getShellEntry| $ 110))) 
 
 (DEFUN |INT;factorSquareFreePolynomial| (|p| $)
-  (SPADCALL |p| (|getShellEntry| $ 121))) 
+  (SPADCALL |p| (|getShellEntry| $ 120))) 
 
 (DEFUN |INT;gcdPolynomial;3Sup;60| (|p| |q| $)
   (COND
-    ((SPADCALL |p| (|getShellEntry| $ 122))
-     (SPADCALL |q| (|getShellEntry| $ 123)))
-    ((SPADCALL |q| (|getShellEntry| $ 122))
-     (SPADCALL |p| (|getShellEntry| $ 123)))
-    (T (SPADCALL (LIST |p| |q|) (|getShellEntry| $ 126))))) 
+    ((SPADCALL |p| (|getShellEntry| $ 121))
+     (SPADCALL |q| (|getShellEntry| $ 122)))
+    ((SPADCALL |q| (|getShellEntry| $ 121))
+     (SPADCALL |p| (|getShellEntry| $ 122)))
+    (T (SPADCALL (LIST |p| |q|) (|getShellEntry| $ 125))))) 
 
 (DEFUN |Integer| ()
   (DECLARE (SPECIAL |$ConstructorCache|))
-  (PROG (#0=#:G1528)
+  (PROG (#0=#:G1536)
     (RETURN
       (COND
         ((SETQ #0# (HGET |$ConstructorCache| '|Integer|))
@@ -512,50 +512,49 @@
              (COND ((NOT #0#) (HREM |$ConstructorCache| '|Integer|))))))))) 
 
 (DEFUN |Integer;| ()
-  (LET ((|dv$| (LIST '|Integer|)) ($ (|newShell| 141))
+  (LET ((|dv$| (LIST '|Integer|)) ($ (|newShell| 140))
         (|pv$| (|buildPredVector| 0 0 NIL)))
     (DECLARE (SPECIAL |$ConstructorCache|))
     (|setShellEntry| $ 0 |dv$|)
     (|setShellEntry| $ 3 |pv$|)
     (|haddProp| |$ConstructorCache| '|Integer| NIL (CONS 1 $))
     (|stuffDomainSlots| $)
-    (|setShellEntry| $ 83
-        (|setShellEntry| $ 82
+    (|setShellEntry| $ 82
+        (|setShellEntry| $ 81
             (CONS (|dispatchFunction| |INT;*;3$;43|) $)))
     $)) 
 
 (MAKEPROP '|Integer| '|infovec|
-    (LIST '#(NIL NIL NIL NIL NIL NIL
+    (LIST '#(NIL NIL NIL NIL NIL NIL (|Boolean|) |INT;negative?;$B;15|
+             (|Void|) (|OpenMathDevice|) (0 . |OMputApp|) (|String|)
+             (5 . |OMputSymbol|) |INT;-;2$;39| (|Integer|)
+             (12 . |OMputInteger|) (18 . |OMputEndApp|)
+             (|OpenMathEncoding|) (23 . |OMencodingXML|)
+             (27 . |OMopenString|) (33 . |OMputObject|)
+             (38 . |OMputEndObject|) (43 . |OMclose|)
+             |INT;OMwrite;$S;2| |INT;OMwrite;$BS;3|
+             |INT;OMwrite;Omd$V;4| |INT;OMwrite;Omd$BV;5|
              (CONS IDENTITY
                    (FUNCALL (|dispatchFunction| |INT;Zero;$;8|) $))
-             (|NonNegativeInteger|) (0 . |Zero|) (|Boolean|)
-             |INT;<;2$B;35| (|Void|) (|OpenMathDevice|)
-             (4 . |OMputApp|) (|String|) (9 . |OMputSymbol|)
-             |INT;-;2$;39| (|Integer|) (16 . |OMputInteger|)
-             (22 . |OMputEndApp|) (|OpenMathEncoding|)
-             (27 . |OMencodingXML|) (31 . |OMopenString|)
-             (37 . |OMputObject|) (42 . |OMputEndObject|)
-             (47 . |OMclose|) |INT;OMwrite;$S;2| |INT;OMwrite;$BS;3|
-             |INT;OMwrite;Omd$V;4| |INT;OMwrite;Omd$BV;5|
-             |INT;zero?;$B;6|
+             |INT;=;2$B;34| |INT;zero?;$B;6|
              (CONS IDENTITY
                    (FUNCALL (|dispatchFunction| |INT;One;$;9|) $))
-             (52 . |One|) |INT;=;2$B;34| |INT;one?;$B;7|
-             |INT;base;$;10| |INT;copy;2$;11| |INT;+;3$;40|
-             |INT;inc;2$;12| |INT;-;3$;41| |INT;dec;2$;13|
-             (|SingleInteger|) |INT;hash;$Si;14| |INT;negative?;$B;15|
-             (|OutputForm|) (56 . |outputForm|) |INT;coerce;$Of;16|
-             |INT;coerce;2$;17| |INT;convert;2$;18| |INT;length;2$;19|
-             |INT;>=;2$B;38| |INT;addmod;4$;20| |INT;submod;4$;21|
-             |INT;rem;3$;50| |INT;mulmod;4$;22| (|Float|)
-             (61 . |coerce|) |INT;convert;$F;23| (|DoubleFloat|)
-             (66 . |coerce|) |INT;convert;$Df;24| (|InputForm|)
-             (71 . |convert|) |INT;convert;$If;25| (76 . |string|)
-             |INT;convert;$S;26| (81 . <) (87 . |concat|)
-             |INT;latex;$S;27| |INT;positiveRemainder;3$;28|
-             (|Matrix| 17) (|Matrix| $) |INT;reducedSystem;2M;29|
-             (|Vector| 17) (|Record| (|:| |mat| 70) (|:| |vec| 73))
-             (|Vector| $) |INT;reducedSystem;MVR;30| |INT;abs;2$;31|
+             |INT;one?;$B;7| |INT;base;$;10| |INT;copy;2$;11|
+             |INT;+;3$;40| |INT;inc;2$;12| |INT;-;3$;41|
+             |INT;dec;2$;13| (|SingleInteger|) |INT;hash;$Si;14|
+             |INT;<;2$B;35| (|OutputForm|) (48 . |outputForm|)
+             |INT;coerce;$Of;16| |INT;coerce;2$;17| |INT;convert;2$;18|
+             |INT;length;2$;19| |INT;>=;2$B;38| |INT;addmod;4$;20|
+             |INT;submod;4$;21| |INT;rem;3$;50| |INT;mulmod;4$;22|
+             (|Float|) (53 . |coerce|) |INT;convert;$F;23|
+             (|DoubleFloat|) (58 . |coerce|) |INT;convert;$Df;24|
+             (|InputForm|) (63 . |convert|) |INT;convert;$If;25|
+             (68 . |string|) |INT;convert;$S;26| (|NonNegativeInteger|)
+             (73 . |One|) (77 . <) (83 . |concat|) |INT;latex;$S;27|
+             |INT;positiveRemainder;3$;28| (|Matrix| 14) (|Matrix| $)
+             |INT;reducedSystem;2M;29| (|Vector| 14)
+             (|Record| (|:| |mat| 69) (|:| |vec| 72)) (|Vector| $)
+             |INT;reducedSystem;MVR;30| |INT;abs;2$;31|
              |INT;random;$;32| |INT;random;2$;33| |INT;>;2$B;36|
              |INT;<=;2$B;37| NIL NIL |INT;**;$Nni$;44| |INT;odd?;$B;45|
              |INT;max;3$;46| |INT;min;3$;47|
@@ -565,52 +564,52 @@
              (|Record| (|:| |unit| $) (|:| |canonical| $)
                  (|:| |associate| $))
              |INT;unitNormal;$R;54| |INT;unitCanonical;2$;55|
-             (|SparseUnivariatePolynomial| 17) (|List| 98)
-             (|Union| 99 '"failed")
+             (|SparseUnivariatePolynomial| 14) (|List| 97)
+             (|Union| 98 '"failed")
              (|IntegerSolveLinearPolynomialEquation|)
-             (93 . |solveLinearPolynomialEquation|)
-             (|SparseUnivariatePolynomial| $$) (|Factored| 103)
-             (|UnivariatePolynomialSquareFree| $$ 103)
-             (99 . |squareFree|) (104 . |primitivePart|)
-             (109 . |leadingCoefficient|) (|GaloisGroupFactorizer| 103)
-             (114 . |factor|) (119 . |coerce|) (124 . |exquo|)
-             (|Factored| $) (130 . |factor|) (|Mapping| 103 $$)
-             (|Factored| $$) (|FactoredFunctions2| $$ 103)
-             (135 . |map|) (|FactoredFunctionUtilities| 103)
-             (141 . |mergeFactors|) (147 . |factorSquareFree|)
-             (152 . |zero?|) (157 . |unitCanonical|) (|List| 103)
-             (|HeuGcd| 103) (162 . |gcd|)
+             (89 . |solveLinearPolynomialEquation|)
+             (|SparseUnivariatePolynomial| $$) (|Factored| 102)
+             (|UnivariatePolynomialSquareFree| $$ 102)
+             (95 . |squareFree|) (100 . |primitivePart|)
+             (105 . |leadingCoefficient|) (|GaloisGroupFactorizer| 102)
+             (110 . |factor|) (115 . |coerce|) (120 . |exquo|)
+             (|Factored| $) (126 . |factor|) (|Mapping| 102 $$)
+             (|Factored| $$) (|FactoredFunctions2| $$ 102)
+             (131 . |map|) (|FactoredFunctionUtilities| 102)
+             (137 . |mergeFactors|) (143 . |factorSquareFree|)
+             (148 . |zero?|) (153 . |unitCanonical|) (|List| 102)
+             (|HeuGcd| 102) (158 . |gcd|)
              (|SparseUnivariatePolynomial| $)
-             |INT;gcdPolynomial;3Sup;60| (|Fraction| 17)
-             (|Union| 129 '"failed") (|Pattern| 17)
-             (|PatternMatchResult| 17 $) (|Union| 17 '"failed")
-             (|List| $) (|Record| (|:| |coef| 134) (|:| |generator| $))
-             (|Union| 134 '"failed")
+             |INT;gcdPolynomial;3Sup;60| (|Fraction| 14)
+             (|Union| 128 '"failed") (|Pattern| 14)
+             (|PatternMatchResult| 14 $) (|Union| 14 '"failed")
+             (|List| $) (|Record| (|:| |coef| 133) (|:| |generator| $))
+             (|Union| 133 '"failed")
              (|Record| (|:| |coef1| $) (|:| |coef2| $)
                  (|:| |generator| $))
              (|Record| (|:| |coef1| $) (|:| |coef2| $))
-             (|Union| 138 '"failed") (|PositiveInteger|))
-          '#(~= 167 |zero?| 173 |unitNormal| 178 |unitCanonical| 183
-             |unit?| 188 |symmetricRemainder| 193 |subtractIfCan| 199
-             |submod| 205 |squareFreePart| 212 |squareFree| 217
-             |sizeLess?| 222 |sign| 228 |shift| 233 |sample| 239
-             |retractIfCan| 243 |retract| 248 |rem| 253 |reducedSystem|
-             259 |recip| 270 |rationalIfCan| 275 |rational?| 280
-             |rational| 285 |random| 290 |quo| 299 |principalIdeal| 305
-             |prime?| 310 |powmod| 315 |positiveRemainder| 322
-             |positive?| 328 |permutation| 333 |patternMatch| 339
-             |one?| 346 |odd?| 351 |nextItem| 356 |negative?| 361
-             |multiEuclidean| 366 |mulmod| 372 |min| 379 |max| 385
-             |mask| 391 |length| 396 |leftReducedSystem| 401 |lcm| 412
-             |latex| 423 |invmod| 428 |init| 434 |inc| 438 |hash| 443
-             |gcdPolynomial| 448 |gcd| 454 |factorial| 465 |factor| 470
-             |extendedEuclidean| 475 |exquo| 488 |expressIdealMember|
-             494 |even?| 500 |euclideanSize| 505 |divide| 510
-             |differentiate| 516 |dec| 527 |copy| 532 |convert| 537
-             |coerce| 567 |characteristic| 587 |bit?| 591 |binomial|
-             597 |before?| 603 |base| 609 |associates?| 613 |addmod|
-             619 |abs| 626 |Zero| 631 |One| 635 |OMwrite| 639 D 663 >=
-             674 > 680 = 686 <= 692 < 698 - 704 + 715 ** 721 * 733)
+             (|Union| 137 '"failed") (|PositiveInteger|))
+          '#(~= 163 |zero?| 169 |unitNormal| 174 |unitCanonical| 179
+             |unit?| 184 |symmetricRemainder| 189 |subtractIfCan| 195
+             |submod| 201 |squareFreePart| 208 |squareFree| 213
+             |sizeLess?| 218 |sign| 224 |shift| 229 |sample| 235
+             |retractIfCan| 239 |retract| 244 |rem| 249 |reducedSystem|
+             255 |recip| 266 |rationalIfCan| 271 |rational?| 276
+             |rational| 281 |random| 286 |quo| 295 |principalIdeal| 301
+             |prime?| 306 |powmod| 311 |positiveRemainder| 318
+             |positive?| 324 |permutation| 329 |patternMatch| 335
+             |one?| 342 |odd?| 347 |nextItem| 352 |negative?| 357
+             |multiEuclidean| 362 |mulmod| 368 |min| 375 |max| 381
+             |mask| 387 |length| 392 |leftReducedSystem| 397 |lcm| 408
+             |latex| 419 |invmod| 424 |init| 430 |inc| 434 |hash| 439
+             |gcdPolynomial| 444 |gcd| 450 |factorial| 461 |factor| 466
+             |extendedEuclidean| 471 |exquo| 484 |expressIdealMember|
+             490 |even?| 496 |euclideanSize| 501 |divide| 506
+             |differentiate| 512 |dec| 523 |copy| 528 |convert| 533
+             |coerce| 563 |characteristic| 583 |bit?| 587 |binomial|
+             593 |before?| 599 |base| 605 |associates?| 609 |addmod|
+             615 |abs| 622 |Zero| 627 |One| 631 |OMwrite| 635 D 659 >=
+             670 > 676 = 682 <= 688 < 694 - 700 + 711 ** 717 * 729)
           '((|infinite| . 0) (|noetherian| . 0)
             (|canonicalsClosed| . 0) (|canonical| . 0)
             (|canonicalUnitNormal| . 0) (|multiplicativeValuation| . 0)
@@ -643,9 +642,9 @@
                                (|DifferentialRing|) (|OrderedRing|)
                                (|CommutativeRing|) (|EntireRing|)
                                (|Module| $$)
-                               (|LinearlyExplicitRingOver| 17)
+                               (|LinearlyExplicitRingOver| 14)
                                (|BiModule| $$ $$) (|Ring|)
-                               (|LeftModule| 17)
+                               (|LeftModule| 14)
                                (|OrderedAbelianGroup|)
                                (|LeftModule| $$) (|Rng|)
                                (|RightModule| $$)
@@ -656,75 +655,75 @@
                                (|OrderedAbelianSemiGroup|)
                                (|LinearSet| $$) (|AbelianMonoid|)
                                (|Monoid|) (|StepThrough|)
-                               (|PatternMatchable| 17) (|OrderedSet|)
+                               (|PatternMatchable| 14) (|OrderedSet|)
                                (|LeftLinearSet| $$)
                                (|RightLinearSet| $$)
                                (|AbelianSemiGroup|) (|SemiGroup|)
-                               (|LeftLinearSet| 17)
+                               (|LeftLinearSet| 14)
                                (|DifferentialSpace|) (|OrderedType|)
                                (|SetCategory|) (|RealConstant|)
-                               (|RetractableTo| 17)
+                               (|RetractableTo| 14)
                                (|DifferentialDomain| $$) (|BasicType|)
-                               (|OpenMath|) (|ConvertibleTo| 14)
+                               (|OpenMath|) (|ConvertibleTo| 11)
+                               (|ConvertibleTo| 52)
                                (|ConvertibleTo| 55)
-                               (|ConvertibleTo| 58)
                                (|CombinatorialFunctionCategory|)
-                               (|ConvertibleTo| 131)
-                               (|ConvertibleTo| 61)
-                               (|ConvertibleTo| 17)
+                               (|ConvertibleTo| 130)
+                               (|ConvertibleTo| 58)
+                               (|ConvertibleTo| 14)
                                (|CoercibleFrom| $$)
-                               (|CoercibleFrom| 17) (|Type|)
-                               (|CoercibleTo| 44))
-                            (|makeByteWordVec2| 140
-                                '(0 7 0 8 1 12 11 0 13 3 12 11 0 14 14
-                                  15 2 12 11 0 17 18 1 12 11 0 19 0 20
-                                  0 21 2 12 0 14 20 22 1 12 11 0 23 1
-                                  12 11 0 24 1 12 11 0 25 0 7 0 32 1 44
-                                  0 17 45 1 55 0 17 56 1 58 0 17 59 1
-                                  61 0 17 62 1 14 0 17 64 2 17 9 0 0 66
-                                  2 14 0 0 0 67 2 101 100 99 98 102 1
-                                  105 104 103 106 1 103 0 0 107 1 103 2
-                                  0 108 1 109 104 103 110 1 103 0 2 111
-                                  2 0 92 0 0 112 1 0 113 0 114 2 117
-                                  104 115 116 118 2 119 104 104 104 120
-                                  1 109 104 103 121 1 103 9 0 122 1 103
-                                  0 0 123 1 125 103 124 126 2 0 9 0 0 1
-                                  1 0 9 0 30 1 0 95 0 96 1 0 0 0 97 1 0
-                                  9 0 1 2 0 0 0 0 1 2 0 92 0 0 1 3 0 0
-                                  0 0 0 52 1 0 0 0 1 1 0 113 0 1 2 0 9
-                                  0 0 1 1 0 17 0 1 2 0 0 0 0 91 0 0 0 1
-                                  1 0 133 0 1 1 0 17 0 1 2 0 0 0 0 53 1
-                                  0 70 71 72 2 0 74 71 75 76 1 0 92 0
-                                  93 1 0 130 0 1 1 0 9 0 1 1 0 129 0 1
-                                  0 0 0 78 1 0 0 0 79 2 0 0 0 0 90 1 0
-                                  135 134 1 1 0 9 0 1 3 0 0 0 0 0 1 2 0
-                                  0 0 0 69 1 0 9 0 1 2 0 0 0 0 1 3 0
-                                  132 0 131 132 1 1 0 9 0 34 1 0 9 0 85
-                                  1 0 92 0 1 1 0 9 0 43 2 0 136 134 0 1
-                                  3 0 0 0 0 0 54 2 0 0 0 0 87 2 0 0 0 0
-                                  86 1 0 0 0 1 1 0 0 0 49 2 0 74 75 0 1
-                                  1 0 70 75 1 2 0 0 0 0 1 1 0 0 134 1 1
-                                  0 14 0 68 2 0 0 0 0 1 0 0 0 1 1 0 0 0
-                                  38 1 0 41 0 42 2 0 127 127 127 128 2
-                                  0 0 0 0 94 1 0 0 134 1 1 0 0 0 1 1 0
-                                  113 0 114 2 0 137 0 0 1 3 0 139 0 0 0
-                                  1 2 0 92 0 0 112 2 0 136 134 0 1 1 0
-                                  9 0 1 1 0 7 0 1 2 0 88 0 0 89 2 0 0 0
-                                  7 1 1 0 0 0 1 1 0 0 0 40 1 0 0 0 36 1
-                                  0 14 0 65 1 0 58 0 60 1 0 55 0 57 1 0
-                                  131 0 1 1 0 61 0 63 1 0 17 0 48 1 0 0
-                                  17 47 1 0 0 0 1 1 0 0 17 47 1 0 44 0
-                                  46 0 0 7 1 2 0 9 0 0 1 2 0 0 0 0 1 2
-                                  0 9 0 0 1 0 0 0 35 2 0 9 0 0 1 3 0 0
-                                  0 0 0 51 1 0 0 0 77 0 0 0 6 0 0 0 31
-                                  3 0 11 12 0 9 29 2 0 14 0 9 27 2 0 11
-                                  12 0 28 1 0 14 0 26 2 0 0 0 7 1 1 0 0
-                                  0 1 2 0 9 0 0 50 2 0 9 0 0 80 2 0 9 0
-                                  0 33 2 0 9 0 0 81 2 0 9 0 0 10 1 0 0
-                                  0 16 2 0 0 0 0 39 2 0 0 0 0 37 2 0 0
-                                  0 7 84 2 0 0 0 140 1 2 0 0 17 0 83 2
-                                  0 0 0 0 82 2 0 0 17 0 83 2 0 0 7 0 1
-                                  2 0 0 140 0 1)))))
+                               (|CoercibleFrom| 14) (|Type|)
+                               (|CoercibleTo| 41))
+                            (|makeByteWordVec2| 139
+                                '(1 9 8 0 10 3 9 8 0 11 11 12 2 9 8 0
+                                  14 15 1 9 8 0 16 0 17 0 18 2 9 0 11
+                                  17 19 1 9 8 0 20 1 9 8 0 21 1 9 8 0
+                                  22 1 41 0 14 42 1 52 0 14 53 1 55 0
+                                  14 56 1 58 0 14 59 1 11 0 14 61 0 63
+                                  0 64 2 14 6 0 0 65 2 11 0 0 0 66 2
+                                  100 99 98 97 101 1 104 103 102 105 1
+                                  102 0 0 106 1 102 2 0 107 1 108 103
+                                  102 109 1 102 0 2 110 2 0 91 0 0 111
+                                  1 0 112 0 113 2 116 103 114 115 117 2
+                                  118 103 103 103 119 1 108 103 102 120
+                                  1 102 6 0 121 1 102 0 0 122 1 124 102
+                                  123 125 2 0 6 0 0 1 1 0 6 0 29 1 0 94
+                                  0 95 1 0 0 0 96 1 0 6 0 1 2 0 0 0 0 1
+                                  2 0 91 0 0 1 3 0 0 0 0 0 49 1 0 0 0 1
+                                  1 0 112 0 1 2 0 6 0 0 1 1 0 14 0 1 2
+                                  0 0 0 0 90 0 0 0 1 1 0 132 0 1 1 0 14
+                                  0 1 2 0 0 0 0 50 1 0 69 70 71 2 0 73
+                                  70 74 75 1 0 91 0 92 1 0 129 0 1 1 0
+                                  6 0 1 1 0 128 0 1 0 0 0 77 1 0 0 0 78
+                                  2 0 0 0 0 89 1 0 134 133 1 1 0 6 0 1
+                                  3 0 0 0 0 0 1 2 0 0 0 0 68 1 0 6 0 1
+                                  2 0 0 0 0 1 3 0 131 0 130 131 1 1 0 6
+                                  0 31 1 0 6 0 84 1 0 91 0 1 1 0 6 0 7
+                                  2 0 135 133 0 1 3 0 0 0 0 0 51 2 0 0
+                                  0 0 86 2 0 0 0 0 85 1 0 0 0 1 1 0 0 0
+                                  46 2 0 73 74 0 1 1 0 69 74 1 2 0 0 0
+                                  0 1 1 0 0 133 1 1 0 11 0 67 2 0 0 0 0
+                                  1 0 0 0 1 1 0 0 0 35 1 0 38 0 39 2 0
+                                  126 126 126 127 2 0 0 0 0 93 1 0 0
+                                  133 1 1 0 0 0 1 1 0 112 0 113 2 0 136
+                                  0 0 1 3 0 138 0 0 0 1 2 0 91 0 0 111
+                                  2 0 135 133 0 1 1 0 6 0 1 1 0 63 0 1
+                                  2 0 87 0 0 88 2 0 0 0 63 1 1 0 0 0 1
+                                  1 0 0 0 37 1 0 0 0 33 1 0 11 0 62 1 0
+                                  55 0 57 1 0 52 0 54 1 0 130 0 1 1 0
+                                  58 0 60 1 0 14 0 45 1 0 0 14 44 1 0 0
+                                  0 1 1 0 0 14 44 1 0 41 0 43 0 0 63 1
+                                  2 0 6 0 0 1 2 0 0 0 0 1 2 0 6 0 0 1 0
+                                  0 0 32 2 0 6 0 0 1 3 0 0 0 0 0 48 1 0
+                                  0 0 76 0 0 0 27 0 0 0 30 3 0 8 9 0 6
+                                  26 2 0 11 0 6 24 2 0 8 9 0 25 1 0 11
+                                  0 23 2 0 0 0 63 1 1 0 0 0 1 2 0 6 0 0
+                                  47 2 0 6 0 0 79 2 0 6 0 0 28 2 0 6 0
+                                  0 80 2 0 6 0 0 40 1 0 0 0 13 2 0 0 0
+                                  0 36 2 0 0 0 0 34 2 0 0 0 63 83 2 0 0
+                                  0 139 1 2 0 0 14 0 82 2 0 0 0 0 81 2
+                                  0 0 14 0 82 2 0 0 63 0 1 2 0 0 139 0
+                                  1)))))
           '|lookupComplete|)) 
 
 (MAKEPROP '|Integer| 'NILADIC T) 

Modified: jap-sandbox/src/algebra/strap/ISTRING.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/ISTRING.lsp	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/strap/ISTRING.lsp	2010-07-29 21:06:32 UTC (rev 1729)
@@ -715,11 +715,11 @@
 (MAKEPROP '|IndexedString| '|infovec|
     (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|)
              (|NonNegativeInteger|) (|Character|) |ISTRING;new;NniC$;1|
-             |ISTRING;empty;$;2| (|Integer|) (0 . |Zero|) (|Boolean|)
+             (|Integer|) (0 . |Zero|) |ISTRING;empty;$;2| (|Boolean|)
              (4 . =) |ISTRING;empty?;$B;3| |ISTRING;#;$Nni;4|
              |ISTRING;=;2$B;5| |ISTRING;<;2$B;6| |ISTRING;concat;3$;7|
              |ISTRING;copy;2$;8| (10 . |One|) (14 . -)
-             (|UniversalSegment| 11) (20 . SEGMENT)
+             (|UniversalSegment| 10) (20 . SEGMENT)
              |ISTRING;elt;$Us$;31| (26 . SEGMENT)
              |ISTRING;insert;2$I$;9| (|String|) (|OutputForm|)
              (31 . |outputForm|) |ISTRING;coerce;$Of;10|
@@ -748,7 +748,7 @@
              |ISTRING;match?;2$CB;34| (|List| 8) (|Equation| 8)
              (|List| 91) (|Mapping| 8 8 8) (|InputForm|)
              (|Mapping| 13 8) (|Mapping| 13 8 8) (|Void|)
-             (|Union| 8 '"failed") (|List| 11))
+             (|Union| 8 '"failed") (|List| 10))
           '#(~= 185 |upperCase!| 191 |upperCase| 196 |trim| 201 |swap!|
              213 |suffix?| 220 |substring?| 226 |split| 233 |sorted?|
              245 |sort!| 256 |sort| 267 |size?| 278 |setelt| 284
@@ -783,61 +783,61 @@
                                (|OneDimensionalArrayAggregate| 8)
                                (|FiniteLinearAggregate| 8)
                                (|LinearAggregate| 8)
-                               (|IndexedAggregate| 11 8)
+                               (|IndexedAggregate| 10 8)
                                (|Collection| 8)
                                (|HomogeneousAggregate| 8)
-                               (|OrderedSet|) (|EltableAggregate| 11 8)
+                               (|OrderedSet|) (|EltableAggregate| 10 8)
                                (|SetCategory|) (|OrderedType|)
                                (|Eltable| 23 $$) (|Aggregate|)
-                               (|Eltable| 11 8) (|Evalable| 8)
+                               (|Eltable| 10 8) (|Evalable| 8)
                                (|BasicType|) (|Type|)
                                (|InnerEvalable| 8 8) (|CoercibleTo| 29)
                                (|ConvertibleTo| 94))
                             (|makeByteWordVec2| 99
-                                '(0 11 0 12 2 11 13 0 0 14 0 11 0 21 2
-                                  11 0 0 0 22 2 23 0 11 11 24 1 23 0 11
+                                '(0 10 0 11 2 10 13 0 0 14 0 10 0 21 2
+                                  10 0 0 0 22 2 23 0 10 10 24 1 23 0 10
                                   26 1 29 0 28 30 0 33 0 34 1 8 0 0 35
                                   2 0 0 36 0 37 0 33 0 39 1 8 0 0 40 2
-                                  28 0 0 0 42 1 23 11 0 44 1 23 13 0 45
-                                  1 23 11 0 46 1 0 11 0 47 0 7 0 48 2
-                                  11 13 0 0 49 2 11 13 0 0 50 0 7 0 51
-                                  2 11 0 0 0 52 0 8 0 53 0 54 0 55 2 7
-                                  0 0 0 56 2 11 13 0 0 58 0 13 0 60 0
+                                  28 0 0 0 42 1 23 10 0 44 1 23 13 0 45
+                                  1 23 10 0 46 1 0 10 0 47 0 7 0 48 2
+                                  10 13 0 0 49 2 10 13 0 0 50 0 7 0 51
+                                  2 10 0 0 0 52 0 8 0 53 0 54 0 55 2 7
+                                  0 0 0 56 2 10 13 0 0 58 0 13 0 60 0
                                   13 0 61 2 33 13 8 0 65 2 8 13 0 0 69
                                   0 70 0 71 2 70 0 2 0 72 1 70 0 0 73 2
-                                  11 0 0 0 83 2 11 13 0 0 87 2 0 13 0 0
+                                  10 0 0 0 83 2 10 13 0 0 87 2 0 13 0 0
                                   88 2 10 13 0 0 1 1 0 0 0 38 1 0 0 0 1
-                                  2 0 0 0 8 1 2 0 0 0 33 1 3 0 97 0 11
-                                  11 1 2 0 13 0 0 67 3 0 13 0 0 11 62 2
+                                  2 0 0 0 8 1 2 0 0 0 33 1 3 0 97 0 10
+                                  10 1 2 0 13 0 0 67 3 0 13 0 0 10 62 2
                                   0 74 0 33 76 2 0 74 0 8 75 1 5 13 0 1
                                   2 0 13 96 0 1 1 5 0 0 1 2 0 0 96 0 1
                                   1 5 0 0 1 2 0 0 96 0 1 2 0 13 0 7 1 3
-                                  0 8 0 23 8 1 3 0 8 0 11 8 59 2 0 0 95
+                                  0 8 0 23 8 1 3 0 8 0 10 8 59 2 0 0 95
                                   0 1 0 0 0 1 2 0 0 0 8 79 2 0 0 0 33
                                   80 1 0 0 0 1 1 0 0 0 1 3 0 0 0 23 0
                                   57 1 8 0 0 1 2 8 0 8 0 1 2 0 0 95 0 1
                                   4 8 8 93 0 8 8 1 3 0 8 93 0 8 1 2 0 8
-                                  93 0 1 3 0 8 0 11 8 1 2 0 8 0 11 1 2
-                                  0 13 0 0 88 3 8 11 8 0 11 64 2 8 11 8
-                                  0 1 3 0 11 33 0 11 66 3 0 11 0 0 11
-                                  63 2 0 11 95 0 1 1 0 90 0 1 2 0 0 7 8
-                                  9 2 0 13 0 7 1 1 7 11 0 32 2 5 0 0 0
+                                  93 0 1 3 0 8 0 10 8 1 2 0 8 0 10 1 2
+                                  0 13 0 0 88 3 8 10 8 0 10 64 2 8 10 8
+                                  0 1 3 0 10 33 0 10 66 3 0 10 0 0 10
+                                  63 2 0 10 95 0 1 1 0 90 0 1 2 0 0 7 8
+                                  9 2 0 13 0 7 1 1 7 10 0 32 2 5 0 0 0
                                   1 2 5 0 0 0 1 3 0 0 96 0 0 1 1 0 90 0
-                                  1 2 8 13 8 0 1 1 7 11 0 47 2 5 0 0 0
+                                  1 2 8 13 8 0 1 1 7 10 0 47 2 5 0 0 0
                                   1 3 0 13 0 0 8 89 3 0 7 0 0 8 86 2 0
                                   0 36 0 37 3 0 0 93 0 0 1 2 0 0 36 0 1
                                   1 0 0 0 41 1 0 0 0 1 2 0 13 0 7 1 2 0
                                   0 0 8 77 2 0 0 0 33 78 1 8 28 0 43 3
-                                  0 0 8 0 11 1 3 0 0 0 0 11 27 1 0 99 0
-                                  1 2 0 13 11 0 1 1 8 84 0 85 1 7 8 0 1
+                                  0 0 8 0 10 1 3 0 0 0 0 10 27 1 0 99 0
+                                  1 2 0 13 10 0 1 1 8 84 0 85 1 7 8 0 1
                                   2 0 98 95 0 1 2 0 0 0 8 1 2 0 13 95 0
                                   1 3 11 0 0 90 90 1 3 11 0 0 8 8 1 2
                                   11 0 0 92 1 2 11 0 0 91 1 2 0 13 0 0
                                   1 2 8 13 8 0 1 1 0 90 0 1 1 0 13 0 15
-                                  0 0 0 10 2 0 0 0 0 1 2 0 0 0 23 25 2
-                                  0 8 0 11 68 3 0 8 0 11 8 1 2 0 0 0 11
+                                  0 0 0 12 2 0 0 0 0 1 2 0 0 0 23 25 2
+                                  0 8 0 10 68 3 0 8 0 10 8 1 2 0 0 0 10
                                   1 2 0 0 0 23 1 2 8 7 8 0 1 2 0 7 95 0
-                                  1 3 0 0 0 0 11 81 1 0 0 0 20 1 3 94 0
+                                  1 3 0 0 0 0 10 81 1 0 0 0 20 1 3 94 0
                                   1 1 0 0 90 1 2 0 0 0 0 19 1 0 0 74 82
                                   2 0 0 8 0 1 2 0 0 0 8 1 1 9 29 0 31 1
                                   0 0 8 1 2 10 13 0 0 1 2 0 13 95 0 1 2

Modified: jap-sandbox/src/algebra/strap/LSAGG-.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/LSAGG-.lsp	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/strap/LSAGG-.lsp	2010-07-29 21:06:32 UTC (rev 1729)
@@ -405,7 +405,7 @@
            (EXIT (COND
                    ((< |n| 3) |p|)
                    (T (SEQ (LETT |l|
-                                 (LET ((#0=#:G1511 (QUOTIENT2 |n| 2)))
+                                 (LET ((#0=#:G1511 (TRUNCATE |n| 2)))
                                    (|check-subtype| (NOT (MINUSP #0#))
                                     '(|NonNegativeInteger|) #0#))
                                  |LSAGG-;mergeSort|)

Modified: jap-sandbox/src/algebra/strap/OUTFORM.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/OUTFORM.lsp	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/strap/OUTFORM.lsp	2010-07-29 21:06:32 UTC (rev 1729)
@@ -594,8 +594,8 @@
 
 (DEFUN |OUTFORM;center;$I$;22| (|a| |w| $)
   (|OUTFORM;hconcat;3$;48|
-      (|OUTFORM;hspace;I$;29|
-          (QUOTIENT2 (- |w| (|outformWidth| |a|)) 2) $)
+      (|OUTFORM;hspace;I$;29| (TRUNCATE (- |w| (|outformWidth| |a|)) 2)
+          $)
       |a| $)) 
 
 (DEFUN |OUTFORM;left;$I$;23| (|a| |w| $)

Modified: jap-sandbox/src/algebra/strap/POLYCAT-.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/POLYCAT-.lsp	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/strap/POLYCAT-.lsp	2010-07-29 21:06:32 UTC (rev 1729)
@@ -745,7 +745,7 @@
                                                            "failed")))
                                                        (T
                                                         (LET
-                                                         ((#10=#:G1612
+                                                         ((#10=#:G1610
                                                            (CDR |nd|)))
                                                           (|check-subtype|
                                                            (NOT
@@ -809,14 +809,14 @@
                      (T (SEQ (LETT |i| 0 |POLYCAT-;conditionP;MU;27|)
                              (EXIT (CONS 0
                                     (LET
-                                     ((#14=#:G1611
+                                     ((#14=#:G1612
                                        (|makeSimpleArray|
                                         (|getVMType|
                                          (|getShellEntry| $ 6))
                                         (SIZE |monslist|))))
                                       (LET
                                        ((#15=#:G1728 |monslist|)
-                                        (#16=#:G1610 0))
+                                        (#16=#:G1611 0))
                                         (LOOP
                                           (COND
                                             ((ATOM #15#) (RETURN #14#))

Modified: jap-sandbox/src/algebra/strap/SINT.lsp
===================================================================
--- jap-sandbox/src/algebra/strap/SINT.lsp	2010-07-29 19:52:43 UTC (rev 1728)
+++ jap-sandbox/src/algebra/strap/SINT.lsp	2010-07-29 21:06:32 UTC (rev 1729)
@@ -108,12 +108,13 @@
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|)
                 |SINT;<;2$B;26|)) 
 
-(PUT '|SINT;<;2$B;26| '|SPADreplace| 'QSLESSP) 
+(PUT '|SINT;<;2$B;26| '|SPADreplace| '|%ilt|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|)
                 |SINT;>;2$B;27|)) 
 
-(PUT '|SINT;>;2$B;27| '|SPADreplace| 'QSGREATERP) 
+(PUT '|SINT;>;2$B;27| '|SPADreplace|
+     '(XLAM (|x| |y|) (|%ilt| |y| |x|))) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Boolean|)
                 |SINT;<=;2$B;28|)) 
@@ -139,22 +140,22 @@
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|) |SINT;-;2$;32|)) 
 
-(PUT '|SINT;-;2$;32| '|SPADreplace| 'QSMINUS) 
+(PUT '|SINT;-;2$;32| '|SPADreplace| '|%ineg|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;+;3$;33|)) 
 
-(PUT '|SINT;+;3$;33| '|SPADreplace| 'QSPLUS) 
+(PUT '|SINT;+;3$;33| '|SPADreplace| '|%iadd|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;-;3$;34|)) 
 
-(PUT '|SINT;-;3$;34| '|SPADreplace| 'QSDIFFERENCE) 
+(PUT '|SINT;-;3$;34| '|SPADreplace| '|%isub|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;*;3$;35|)) 
 
-(PUT '|SINT;*;3$;35| '|SPADreplace| 'QSTIMES) 
+(PUT '|SINT;*;3$;35| '|SPADreplace| '|%imul|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| (|%IntegerSection| 0) |%Shell|)
                     |%Short|)
@@ -163,16 +164,18 @@
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;quo;3$;37|)) 
 
-(PUT '|SINT;quo;3$;37| '|SPADreplace| 'QSQUOTIENT) 
+(PUT '|SINT;quo;3$;37| '|SPADreplace| '|%iquo|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;rem;3$;38|)) 
 
-(PUT '|SINT;rem;3$;38| '|SPADreplace| 'QSREMAINDER) 
+(PUT '|SINT;rem;3$;38| '|SPADreplace| '|%irem|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Pair|)
                 |SINT;divide;2$R;39|)) 
 
+(PUT '|SINT;divide;2$R;39| '|SPADreplace| '|%idivide|) 
+
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;gcd;3$;40|)) 
 
@@ -181,12 +184,12 @@
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|)
                 |SINT;abs;2$;41|)) 
 
-(PUT '|SINT;abs;2$;41| '|SPADreplace| 'QSABSVAL) 
+(PUT '|SINT;abs;2$;41| '|SPADreplace| '|%iabs|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Boolean|)
                 |SINT;odd?;$B;42|)) 
 
-(PUT '|SINT;odd?;$B;42| '|SPADreplace| 'QSODDP) 
+(PUT '|SINT;odd?;$B;42| '|SPADreplace| '|%iodd?|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Boolean|)
                 |SINT;zero?;$B;43|)) 
@@ -199,17 +202,17 @@
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;max;3$;45|)) 
 
-(PUT '|SINT;max;3$;45| '|SPADreplace| 'QSMAX) 
+(PUT '|SINT;max;3$;45| '|SPADreplace| '|%imax|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;min;3$;46|)) 
 
-(PUT '|SINT;min;3$;46| '|SPADreplace| 'QSMIN) 
+(PUT '|SINT;min;3$;46| '|SPADreplace| '|%imin|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|)
                 |SINT;hash;2$;47|)) 
 
-(PUT '|SINT;hash;2$;47| '|SPADreplace| 'HASHEQ) 
+(PUT '|SINT;hash;2$;47| '|SPADreplace| '|%hash|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|)
                 |SINT;length;2$;48|)) 
@@ -288,54 +291,54 @@
 
 (DEFUN |SINT;writeOMSingleInt| (|dev| |x| $)
   (SEQ (COND
-         ((QSLESSP |x| 0)
-          (SEQ (SPADCALL |dev| (|getShellEntry| $ 13))
+         ((QSMINUSP |x|)
+          (SEQ (SPADCALL |dev| (|getShellEntry| $ 11))
                (SPADCALL |dev| "arith1" "unaryminus"
-                   (|getShellEntry| $ 15))
-               (SPADCALL |dev| (QSMINUS |x|) (|getShellEntry| $ 18))
-               (EXIT (SPADCALL |dev| (|getShellEntry| $ 19)))))
-         (T (SPADCALL |dev| |x| (|getShellEntry| $ 18)))))) 
+                   (|getShellEntry| $ 13))
+               (SPADCALL |dev| (- |x|) (|getShellEntry| $ 16))

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1728
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1728&view=rev
Author:   dos-reis
Date:     2010-07-29 19:52:43 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
	* lib/XSpadFill.c: Tidy.
	* lib/pixmap.c: Likewise.
	* lib/spadcolors.c: Likewise.
	* include/ReadBitmap.H1: Remove.
	* include/all_hyper_proto.H1: Likewise.
	* include/cond.H1: Likewise.
	* include/cursor.H1: Likewise.
	* include/dialog.H1: Likewise.
	* include/display.H1: Likewise.
	* include/event.H1: Likewise.
	* include/extent1.H1: Likewise.
	* include/extent2.H1: Likewise.
	* include/form_ext.H1: Likewise.
	* include/group.H1: Likewise.
	* include/htinp.H1: Likewise.
	* include/hyper.H1: Likewise.
	* include/initx.H1: Likewise.
	* include/input.H1: Likewise.
	* include/item.H1: Likewise.
	* include/keyin.H1: Likewise.
	* include/macro.H1: Likewise.
	* include/mem.H1: Likewise.
	* include/parse.H1: Likewise.
	* include/parse_aux.H1: Likewise.
	* include/parse_input.H1: Likewise.
	* include/parse_paste.H1: Likewise.
	* include/parse_types.H1: Likewise.
	* include/scrollbar.H1: Likewise.
	* include/show_types.H1: Likewise.
	* include/spadcolors.H1: Likewise.
	* include/spadint.H1: Likewise.
	* include/titlebar.H1: Likewise.
	* hyper/Makefile.in: Compile and Link with a C++ compiler.
	* hyper/ReadBitmap.c: Make it acceptable to a C++ compiler.
	* hyper/cond.c: Likewise.
	* hyper/dialog.c: Likewise.
	* hyper/display.c: Likewise.
	* hyper/display.h: Likewise.
	* hyper/event.c: Likewise.
	* hyper/event.h: Likewise.
	* hyper/extent.h: Likewise.
	* hyper/extent1.c: Likewise.
	* hyper/extent2.c: Likewise.
	* hyper/form-ext.c: Likewise.
	* hyper/group.c: Likewise.
	* hyper/group.h: Likewise.
	* hyper/htadd.c: Likewise.
	* hyper/htinp.c: Likewise.
	* hyper/hyper.c: Likewise.
	* hyper/hyper.h: Likewise.
	* hyper/initx.c: Likewise.
	* hyper/initx.h: Likewise.
	* hyper/input.c: Likewise.
	* hyper/item.c: Likewise.
	* hyper/keyin.h: Likewise.
	* hyper/keyin.c: Likewise.
	* hyper/macro.c: Likewise.
	* hyper/mem.c: Likewise.
	* hyper/parse-aux.c: Likewise.
	* hyper/parse-input.c: Likewise.
	* hyper/parse-paste.c: Likewise.
	* hyper/parse-paste.h: Likewise.
	* hyper/parse-types.h: Likewise.
	* hyper/parse-types.c: Likewise.
	* hyper/parse.h: Likewise.
	* hyper/parse.c: Likewise.
	* hyper/scrollbar.c: Likewise.
	* hyper/scrollbar.h: Likewise.
	* hyper/show-types.c: Likewise.
	* hyper/spadint.c: Likewise.
	* hyper/titlebar.c: Likewise.
	* hyper/titlebar.h: Likewise.
	* graph/view3D/smoothShade3d.c: Include spadcolors.h
	* graph/view3D/stuff3d.c: Likewise.
	* graph/include/view.h (saymem): #undef before #define.
	* graph/view2D/write2d.c: Include pixmap.h.
	* graph/view3D/process3d.c: Likewise.
	* graph/view3D/write3d.c: Likewise.
	* graph/view3D/header.h: Remove macro definition for endColor and
	colorStep. 
	* include/bsdsignal.h: Remove.
	* include/edin.H1: Likewise.
	* include/fnct_key.H1: Likewise.
	* include/halloc.h: Likewise.
	* include/hash.h: Likewise.
	* include/prt.H1: Likewise.
	* include/rgb.H1: Likewise.
	* include/sockio.h: Likewise.
	* include/util.h: Likewise.
	* include/pixmap.h: Rename from pixmap.H1

Modified Paths:
--------------
    trunk/configure
    trunk/configure.ac
    trunk/configure.ac.pamphlet
    trunk/src/ChangeLog
    trunk/src/graph/include/view.h
    trunk/src/graph/view2D/write2d.c
    trunk/src/graph/view3D/header.h
    trunk/src/graph/view3D/process3d.c
    trunk/src/graph/view3D/smoothShade3d.c
    trunk/src/graph/view3D/stuff3d.c
    trunk/src/graph/view3D/write3d.c
    trunk/src/hyper/Makefile.in
    trunk/src/hyper/ReadBitmap.c
    trunk/src/hyper/cond.c
    trunk/src/hyper/dialog.c
    trunk/src/hyper/display.c
    trunk/src/hyper/display.h
    trunk/src/hyper/event.c
    trunk/src/hyper/event.h
    trunk/src/hyper/extent.h
    trunk/src/hyper/extent1.c
    trunk/src/hyper/extent2.c
    trunk/src/hyper/form-ext.c
    trunk/src/hyper/group.c
    trunk/src/hyper/group.h
    trunk/src/hyper/htadd.c
    trunk/src/hyper/htinp.c
    trunk/src/hyper/hyper.c
    trunk/src/hyper/hyper.h
    trunk/src/hyper/initx.c
    trunk/src/hyper/initx.h
    trunk/src/hyper/input.c
    trunk/src/hyper/item.c
    trunk/src/hyper/keyin.c
    trunk/src/hyper/keyin.h
    trunk/src/hyper/macro.c
    trunk/src/hyper/mem.c
    trunk/src/hyper/parse-aux.c
    trunk/src/hyper/parse-input.c
    trunk/src/hyper/parse-paste.c
    trunk/src/hyper/parse-paste.h
    trunk/src/hyper/parse-types.c
    trunk/src/hyper/parse-types.h
    trunk/src/hyper/parse.c
    trunk/src/hyper/parse.h
    trunk/src/hyper/scrollbar.c
    trunk/src/hyper/scrollbar.h
    trunk/src/hyper/show-types.c
    trunk/src/hyper/spadint.c
    trunk/src/hyper/titlebar.c
    trunk/src/hyper/titlebar.h
    trunk/src/include/bsdsignal.h
    trunk/src/include/cursor.H1
    trunk/src/include/edin.H1
    trunk/src/include/fnct_key.H1
    trunk/src/include/halloc.h
    trunk/src/include/hash.h
    trunk/src/include/prt.H1
    trunk/src/include/rgb.h
    trunk/src/include/sockio.h
    trunk/src/include/spadcolors.h
    trunk/src/include/util.H1
    trunk/src/include/wct.H1
    trunk/src/lib/XSpadFill.c
    trunk/src/lib/pixmap.c
    trunk/src/lib/spadcolors.c

Added Paths:
-----------
    trunk/src/include/pixmap.h

Removed Paths:
-------------
    trunk/src/include/ReadBitmap.H1
    trunk/src/include/all_hyper_proto.H1
    trunk/src/include/cond.H1
    trunk/src/include/dialog.H1
    trunk/src/include/display.H1
    trunk/src/include/event.H1
    trunk/src/include/extent1.H1
    trunk/src/include/extent2.H1
    trunk/src/include/form_ext.H1
    trunk/src/include/group.H1
    trunk/src/include/htinp.H1
    trunk/src/include/hyper.H1
    trunk/src/include/initx.H1
    trunk/src/include/input.H1
    trunk/src/include/item.H1
    trunk/src/include/keyin.H1
    trunk/src/include/macro.H1
    trunk/src/include/mem.H1
    trunk/src/include/parse.H1
    trunk/src/include/parse_aux.H1
    trunk/src/include/parse_input.H1
    trunk/src/include/parse_paste.H1
    trunk/src/include/parse_types.H1
    trunk/src/include/pixmap.H1
    trunk/src/include/scrollbar.H1
    trunk/src/include/show_types.H1
    trunk/src/include/spadcolors.H1
    trunk/src/include/spadint.H1
    trunk/src/include/titlebar.H1

Modified: trunk/configure
===================================================================
--- trunk/configure	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/configure	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2010-07-18.
+# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2010-07-29.
 #
 # Report bugs to <open-axiom-bugs@...>.
 #
@@ -745,8 +745,8 @@
 # Identity of this package.
 PACKAGE_NAME='OpenAxiom'
 PACKAGE_TARNAME='openaxiom'
-PACKAGE_VERSION='1.4.0-2010-07-18'
-PACKAGE_STRING='OpenAxiom 1.4.0-2010-07-18'
+PACKAGE_VERSION='1.4.0-2010-07-29'
+PACKAGE_STRING='OpenAxiom 1.4.0-2010-07-29'
 PACKAGE_BUGREPORT='open-axiom-bugs@...'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1513,7 +1513,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenAxiom 1.4.0-2010-07-18 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.4.0-2010-07-29 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1583,7 +1583,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-07-18:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-07-29:";;
    esac
   cat <<\_ACEOF
 
@@ -1691,7 +1691,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.4.0-2010-07-18
+OpenAxiom configure 1.4.0-2010-07-29
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1705,7 +1705,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenAxiom $as_me 1.4.0-2010-07-18, which was
+It was created by OpenAxiom $as_me 1.4.0-2010-07-29, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -21182,7 +21182,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenAxiom $as_me 1.4.0-2010-07-18, which was
+This file was extended by OpenAxiom $as_me 1.4.0-2010-07-29, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21245,7 +21245,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-OpenAxiom config.status 1.4.0-2010-07-18
+OpenAxiom config.status 1.4.0-2010-07-29
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/configure.ac	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,6 +1,6 @@
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.4.0-2010-07-18], 
+AC_INIT([OpenAxiom], [1.4.0-2010-07-29], 
         [open-axiom-bugs@...])
 
 AC_CONFIG_AUX_DIR(config)

Modified: trunk/configure.ac.pamphlet
===================================================================
--- trunk/configure.ac.pamphlet	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/configure.ac.pamphlet	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1210,7 +1210,7 @@
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.4.0-2010-07-18], 
+AC_INIT([OpenAxiom], [1.4.0-2010-07-29], 
         [open-axiom-bugs@...])
 
 @

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/ChangeLog	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,5 +1,98 @@
 2010-07-29  Gabriel Dos Reis  <gdr@...>
 
+	* lib/XSpadFill.c: Tidy.
+	* lib/pixmap.c: Likewise.
+	* lib/spadcolors.c: Likewise.
+	* include/ReadBitmap.H1: Remove.
+	* include/all_hyper_proto.H1: Likewise.
+	* include/cond.H1: Likewise.
+	* include/cursor.H1: Likewise.
+	* include/dialog.H1: Likewise.
+	* include/display.H1: Likewise.
+	* include/event.H1: Likewise.
+	* include/extent1.H1: Likewise.
+	* include/extent2.H1: Likewise.
+	* include/form_ext.H1: Likewise.
+	* include/group.H1: Likewise.
+	* include/htinp.H1: Likewise.
+	* include/hyper.H1: Likewise.
+	* include/initx.H1: Likewise.
+	* include/input.H1: Likewise.
+	* include/item.H1: Likewise.
+	* include/keyin.H1: Likewise.
+	* include/macro.H1: Likewise.
+	* include/mem.H1: Likewise.
+	* include/parse.H1: Likewise.
+	* include/parse_aux.H1: Likewise.
+	* include/parse_input.H1: Likewise.
+	* include/parse_paste.H1: Likewise.
+	* include/parse_types.H1: Likewise.
+	* include/scrollbar.H1: Likewise.
+	* include/show_types.H1: Likewise.
+	* include/spadcolors.H1: Likewise.
+	* include/spadint.H1: Likewise.
+	* include/titlebar.H1: Likewise.
+	* hyper/Makefile.in: Compile and Link with a C++ compiler.
+	* hyper/ReadBitmap.c: Make it acceptable to a C++ compiler.
+	* hyper/cond.c: Likewise.
+	* hyper/dialog.c: Likewise.
+	* hyper/display.c: Likewise.
+	* hyper/display.h: Likewise.
+	* hyper/event.c: Likewise.
+	* hyper/event.h: Likewise.
+	* hyper/extent.h: Likewise.
+	* hyper/extent1.c: Likewise.
+	* hyper/extent2.c: Likewise.
+	* hyper/form-ext.c: Likewise.
+	* hyper/group.c: Likewise.
+	* hyper/group.h: Likewise.
+	* hyper/htadd.c: Likewise.
+	* hyper/htinp.c: Likewise.
+	* hyper/hyper.c: Likewise.
+	* hyper/hyper.h: Likewise.
+	* hyper/initx.c: Likewise.
+	* hyper/initx.h: Likewise.
+	* hyper/input.c: Likewise.
+	* hyper/item.c: Likewise.
+	* hyper/keyin.h: Likewise.
+	* hyper/keyin.c: Likewise.
+	* hyper/macro.c: Likewise.
+	* hyper/mem.c: Likewise.
+	* hyper/parse-aux.c: Likewise.
+	* hyper/parse-input.c: Likewise.
+	* hyper/parse-paste.c: Likewise.
+	* hyper/parse-paste.h: Likewise.
+	* hyper/parse-types.h: Likewise.
+	* hyper/parse-types.c: Likewise.
+	* hyper/parse.h: Likewise.
+	* hyper/parse.c: Likewise.
+	* hyper/scrollbar.c: Likewise.
+	* hyper/scrollbar.h: Likewise.
+	* hyper/show-types.c: Likewise.
+	* hyper/spadint.c: Likewise.
+	* hyper/titlebar.c: Likewise.
+	* hyper/titlebar.h: Likewise.
+	* graph/view3D/smoothShade3d.c: Include spadcolors.h
+	* graph/view3D/stuff3d.c: Likewise.
+	* graph/include/view.h (saymem): #undef before #define.
+	* graph/view2D/write2d.c: Include pixmap.h.
+	* graph/view3D/process3d.c: Likewise.
+	* graph/view3D/write3d.c: Likewise.
+	* graph/view3D/header.h: Remove macro definition for endColor and
+	colorStep. 
+	* include/bsdsignal.h: Remove.
+	* include/edin.H1: Likewise.
+	* include/fnct_key.H1: Likewise.
+	* include/halloc.h: Likewise.
+	* include/hash.h: Likewise.
+	* include/prt.H1: Likewise.
+	* include/rgb.H1: Likewise.
+	* include/sockio.h: Likewise.
+	* include/util.h: Likewise.
+	* include/pixmap.h: Rename from pixmap.H1
+
+2010-07-29  Gabriel Dos Reis  <gdr@...>
+
 	* algebra/sf.spad.pamphlet (DoubleFloat): Use builtin
 	trigonometric functions.
 	* interp/g-opt.boot ($VMsideEffectFreeOperators): Include them.

Modified: trunk/src/graph/include/view.h
===================================================================
--- trunk/src/graph/include/view.h	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/graph/include/view.h	2010-07-29 19:52:43 UTC (rev 1728)
@@ -34,6 +34,7 @@
 /* This file is to be included by all the viewport files */
 
 #define check(code)	checker(code,__LINE__,"")
+#undef saymem
 #define saymem(a,b,c)	saymemWithLine(a,b,c,__LINE__)
 #define exitWithAck(ACK,ACKsize,i) \
 		check(write(Socket,&(ACK),sizeof(ACKsize)));  exit(i);

Modified: trunk/src/graph/view2D/write2d.c
===================================================================
--- trunk/src/graph/view2D/write2d.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/graph/view2D/write2d.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #include "write.h"
 
 #include "all_2d.H1"
-#include "pixmap.H1"
+#include "pixmap.h"
 #include "Gfun.H1"
 
 

Modified: trunk/src/graph/view3D/header.h
===================================================================
--- trunk/src/graph/view3D/header.h	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/graph/view3D/header.h	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -139,6 +139,8 @@
 #define totalHuesConst  27
 
 #define hueEnd          360
+
+#undef hueStep
 #define hueStep         (hueEnd/totalHuesConst)
 
 #define black           BlackPixel(dsply,scrn)
@@ -146,12 +148,9 @@
 #define numPlanes       1
 #define numColors       10
 #define startColor      0
-#define endColor        (startColor+numColors)
 #define maxColors       (DisplayCells(dsply,scrn)-1)
 #define maxPlanes       (DefaultVisual((dpy),(scr))->bits_per_rgb)
 
-#define colorStep       ((maxColors+1)/numColors)
-
                       /**********************************/
                       /***    Screen and Window Sizes   */
                       /**********************************/

Modified: trunk/src/graph/view3D/process3d.c
===================================================================
--- trunk/src/graph/view3D/process3d.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/graph/view3D/process3d.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -56,7 +56,7 @@
 
 #include "util.H1"
 #include "Gfun.H1"
-#include "pixmap.H1"
+#include "pixmap.h"
 #include "XShade.H1"
 #include "XSpadFill.H1"
 #include "all_3d.H1"

Modified: trunk/src/graph/view3D/smoothShade3d.c
===================================================================
--- trunk/src/graph/view3D/smoothShade3d.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/graph/view3D/smoothShade3d.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 #include "volume.h"
 #include "mode.h"   /* for #define components */
 
-#include "spadcolors.H1"
+#include "spadcolors.h"
 #include "Gfun.H1"
 #include "util.H1"
 #include "XSpadFill.H1"

Modified: trunk/src/graph/view3D/stuff3d.c
===================================================================
--- trunk/src/graph/view3D/stuff3d.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/graph/view3D/stuff3d.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 
 
 #include "Gfun.H1"
-#include "spadcolors.H1"
+#include "spadcolors.h"
 #include "util.H1"
 
 #include "all_3d.H1"

Modified: trunk/src/graph/view3D/write3d.c
===================================================================
--- trunk/src/graph/view3D/write3d.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/graph/view3D/write3d.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@
 #include "mode.h"
 
 
-#include "pixmap.H1"
+#include "pixmap.h"
 #include "XShade.H1"
 #include "Gfun.H1"
 

Modified: trunk/src/hyper/Makefile.in
===================================================================
--- trunk/src/hyper/Makefile.in	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/Makefile.in	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2009, Gabriel Dos Reis.
+# Copyright (C) 2007-2010, Gabriel Dos Reis.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -141,7 +141,7 @@
 .PRECIOUS: %.lo %.$(OBJEXT)
 
 %.$(OBJEXT) %.lo: %.c $(HEADERS)
-	$(COMPILE) -o $@ $(CFLAGS) ${CCF} $(axiom_includes) $(AXIOM_X11_CFLAGS) -I. $<
+	$(CXXCOMPILE) -o $@ $(CFLAGS) ${CCF} $(axiom_includes) $(AXIOM_X11_CFLAGS) -I. $<
 
 ${HYPER}/pages/ht.db: all-hyper-pre $(srcdir)/pages/*.pht
 	@echo making ${HYPER}/pages from $(axiom_src_srcdir)/pages directory
@@ -169,17 +169,17 @@
 	cp -p $< $@ && chmod +x $@
 
 ${OUTLIB}/ex2ht$(EXEEXT): $(ex2ht_objects) $(ex2ht_DEPENDENCIES)
-	${LINK} -o $@ $(ex2ht_objects) $(ex2ht_LDADD)
+	${CXXLINK} -o $@ $(ex2ht_objects) $(ex2ht_LDADD)
 
 $(OUTLIB)/htadd$(EXEEXT): $(htadd_objects) $(htadd_DEPENDENCIES)
-	${LINK} -o $@ $(htadd_objects) $(htadd_LDADD)
+	${CXXLINK} -o $@ $(htadd_objects) $(htadd_LDADD)
 
 ${OUTLIB}/hthits$(EXEEXT): $(hthits_objects) $(hthits_DEPENDENCIES)
-	${LINK} -o $@ $(hthits_objects) $(hthits_LDADD)
+	${CXXLINK} -o $@ $(hthits_objects) $(hthits_LDADD)
 
 
 $(OUTLIB)/hypertex$(EXEEXT): $(hypertex_objects) $(hypertex_DEPENDENCIES)
-	 ${LINK} -o $@ $(hypertex_objects) $(hypertex_LDADD)
+	 ${CXXLINK} -o $@ $(hypertex_objects) $(hypertex_LDADD)
 
 ${OUTLIB}/spadbuf$(EXEEXT): $(spadbuf_objects) $(spadbuf_DEPENDENCIES)
-	${LINK} -o $@ $(spadbuf_objects) $(spadbuf_LDADD)
+	${CXXLINK} -o $@ $(spadbuf_objects) $(spadbuf_LDADD)

Modified: trunk/src/hyper/ReadBitmap.c
===================================================================
--- trunk/src/hyper/ReadBitmap.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/ReadBitmap.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -33,17 +33,14 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#define _READBITMAP_C
-
 #include "openaxiom-c-macros.h"
-
 #include "debug.h"
 #include "halloc.h"
 #include "sockio.h"
 #include "hyper.h"
 
-#include "all_hyper_proto.H1"
-#include "pixmap.H1"
+static int read_hot(FILE * fd , char Line[] , int * x_hot , int * y_hot);
+static int read_w_and_h(FILE * fd , unsigned int * width , unsigned int * height);
 
 #define MAXLINE      256
 

Modified: trunk/src/hyper/cond.c
===================================================================
--- trunk/src/hyper/cond.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/cond.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -40,19 +40,16 @@
  * Copyright The Numerical Algorithms Group Limited 1991, 1992, 1993.
  *
  ****************************************************************************/
-#define _COND_C
-#include "openaxiom-c-macros.h"
 
+#include "openaxiom-c-macros.h"
 #include "debug.h"
-
 #include "sockio.h"
 #include "halloc.h"
 #include "lex.h"
 #include "hyper.h"
-
-#include "all_hyper_proto.H1"
 #include "sockio.h"
 
+static int check_memostack(TextNode * node);
 
 void
 insert_cond(char *label, char *cond)

Modified: trunk/src/hyper/dialog.c
===================================================================
--- trunk/src/hyper/dialog.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/dialog.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -40,6 +40,8 @@
  * Copyright The Numerical Algorithms Group Limited 1991, 1992, 1993.
  *
  ****************************************************************************/
+#include <X11/keysym.h>
+
 #define _DIALOG_C
 #include "openaxiom-c-macros.h"
 
@@ -50,14 +52,41 @@
 #include "keyin.h"
 #include "display.h"
 #include "group.h"
+#include "event.h"
 
-#include <X11/keysym.h>
 
 #define min(x,y)     ( (x<y)?(x):(y))
 
-#include "all_hyper_proto.H1"
 
 
+static void back_over_char(InputItem * sym);
+static void back_over_eoln(InputItem * sym);
+static void clear_cursor(InputItem * sym);
+static void clear_cursorline(InputItem * sym);
+static void dec_line_numbers(LineStruct * line);
+static void decrease_line_numbers(LineStruct * line , int am);
+static void delete_char(InputItem * sym);
+static void delete_eoln(InputItem * sym);
+static int delete_one_char(InputItem * sym);
+static void delete_rest_of_line(InputItem * sym);
+static void draw_cursor(InputItem * sym);
+static void enter_new_line(InputItem * sym);
+static void inc_line_numbers(LineStruct * line);
+static void insert_buffer(char * buffer , InputItem * sym);
+static int move_back_one_char(InputItem * sym);
+static void move_cursor_backward(InputItem * sym);
+static void move_cursor_down(InputItem * sym);
+static void move_cursor_end(InputItem * sym);
+static void move_cursor_forward(InputItem * sym);
+static void move_cursor_home(InputItem * sym);
+static void move_cursor_up(InputItem * sym);
+static char move_rest_back(LineStruct * line , int size);
+static int move_sym_forward(LineStruct * line , int num , int size , InputItem * sym);
+static char * mystrncpy(char * buff1 , char * buff2 , int n);
+static void overwrite_buffer(char * buffer , InputItem * item);
+static void redraw_win(void);
+static void tough_enter(InputItem * sym);
+
 static void
 redraw_win()
 {

Modified: trunk/src/hyper/display.c
===================================================================
--- trunk/src/hyper/display.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/display.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -63,10 +63,9 @@
 #include "group.h"
 #include "scrollbar.h"
 #include "titlebar.h"
+#include "parse-types.h"
 
-#include "all_hyper_proto.H1"
 
-
 extern ItemStack *gTopOfItemStack;
 short int gDisplayRegion = 0;
 int gRegionOffset = 0;

Modified: trunk/src/hyper/display.h
===================================================================
--- trunk/src/hyper/display.h	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/display.h	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -38,6 +38,11 @@
 
 #include "hyper.h"
 
+extern void expose_page(HyperDocPage * page);
+extern void paste_page(TextNode * node);
+extern void scroll_page(HyperDocPage * page);
+extern void show_page(HyperDocPage * page);
+
 extern short int    gDisplayRegion;
 extern int          gRegionOffset;
 

Modified: trunk/src/hyper/event.c
===================================================================
--- trunk/src/hyper/event.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/event.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -34,13 +34,9 @@
 */
 
 #define _EVENT_C
+
 #include "openaxiom-c-macros.h"
 
-#include "debug.h"
-
-#include "sockio.h"
-#include "hyper.h"
-
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
@@ -49,6 +45,9 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
+#include "debug.h"
+#include "sockio.h"
+#include "hyper.h"
 #include "event.h"
 #include "keyin.h"
 #include "hyper.h"
@@ -59,8 +58,6 @@
 #include "scrollbar.h"
 #include "group.h"
 #include "lex.h"
-
-#include "all_hyper_proto.H1"
 #include "sockio.h"
 
 jmp_buf env;
@@ -71,317 +68,197 @@
 static HyperLink *gSavedInputAreaLink = NULL;
 
 
-
-/*
- * This is the main X loop. It keeps grabbing events. Since the only way the
- * window can die is through an event, it never actually end. One of the
- * subroutines it calls is responsible for killing everything
- */
-
-void
-mainEventLoop(void)
+static int
+HyperDocErrorHandler(Display *display, XErrorEvent *xe)
 {
-    XEvent event;
-    int  Xcon;
-    fd_set rd, dum1, dum2;
-    motion = 0;
-    gActiveWindow = -1;
-    set_error_handlers();
-    Xcon = ConnectionNumber(gXDisplay);
+    if (xe->request_code != 15) {
+        char buf[1024];
 
-    while (1) {
-/*        fprintf(stderr,"event:mainEventLoop: loop top\n");*/
-        while (gSessionHashTable.num_entries == 0)
-            pause();
+        XGetErrorText(display, xe->error_code, buf, sizeof(buf));
 
-        /* XFlush(gXDisplay);      */
+        fprintf(stderr, "error code = %d\n", xe->error_code);
+        fprintf(stderr, "major op code = %d\n", xe->request_code);
+        fprintf(stderr, "minor op code = %d\n", xe->minor_code);
+        fprintf(stderr, "XID = %ld\n", xe->resourceid);
+        fprintf(stderr, "%s\n", buf);
 
-        if (!motion)
-            init_cursor_states();
-        motion = 0;
-
-        if (!spad_socket == 0) {
-            FD_ZERO(&rd);
-            FD_ZERO(&dum1);
-            FD_ZERO(&dum2);
-            FD_CLR(0, &dum1);
-            FD_CLR(0, &dum2);
-            FD_CLR(0, &rd);
-            FD_SET(spad_socket->socket, &rd);
-            FD_SET(Xcon, &rd);
-            if (!session_server == 0) {
-                FD_SET(session_server->socket, &rd);
-            }
-            if (XEventsQueued(gXDisplay, QueuedAlready)) {
-                XNextEvent(gXDisplay, &event);
-                handle_event(&event);
-            }
-            else {
-              select(FD_SETSIZE,(void *)&rd,(void *)&dum1,(void *)&dum2,NULL);
-              if (FD_ISSET(Xcon, &rd) || 
-                  XEventsQueued(gXDisplay, QueuedAfterFlush)) {
-                    XNextEvent(gXDisplay, &event);
-                    handle_event(&event);
-                }
-              else if (FD_ISSET(spad_socket->socket, &rd))
-                    /*
-                     * Axiom Socket do what handle_event does The 100 is
-                     * $SpadStuff in hypertex.boot
-                     */
-                {
-                    if (100 == get_int(spad_socket)) {
-                        set_window(gParentWindow->fMainWindow);
-                        make_busy_cursors();
-                        get_new_window();
-                    }
-                }
-                /*
-                 * Session Socket Telling us about the death of a spadbuf
-                 * (plus maybe more later) service_session_socket in
-                 * spadint.c
-                 */
-                else 
-                 if (session_server && FD_ISSET(session_server->socket, &rd)) {
-                    service_session_socket();
-                 }
-            }
-        }
-        else {
-            XNextEvent(gXDisplay, &event);
-            handle_event(&event);
-        }
-    }
+        if (xe->request_code != 15)
+            exit(-1);
+      }
+    return(0);
 }
 
 static void
-handle_event(XEvent * event)
+set_error_handlers(void)
 {
-    XWindowAttributes wa;
-/*    fprintf(stderr,"event:handle_event entered\n");*/
-    set_window(event->xany.window);
-    if (event->type == MotionNotify) {
-/*        fprintf(stderr,"event:handle_event type=MotionNotify\n");*/
-        handle_motion_event((XMotionEvent *)event);
-        motion = 1;
-        return;
-    }
-    make_busy_cursors();
-    switch (event->type) {
-      case DestroyNotify:
-/*        fprintf(stderr,"event:handle_event type=DestroyNotify\n");*/
-        break;
-      case Expose:
-/*        fprintf(stderr,"event:handle_event type=Expose\n");*/
-        XGetWindowAttributes(gXDisplay, gWindow->fMainWindow, &wa);
-        if ((gWindow->width == 0 && gWindow->height == 0) ||
-            (wa.width != gWindow->width || wa.height != gWindow->height)) {
-            gWindow->width = wa.width;
-            gWindow->height = wa.height;
-            display_page(gWindow->page);
-            gWindow->fWindowHashTable = gWindow->page->fLinkHashTable;
-        }
-        else                    /** just redraw the thing **/
-            expose_page(gWindow->page);
-        XFlush(gXDisplay);
-        clear_exposures(gWindow->fMainWindow);
-        clear_exposures(gWindow->fScrollWindow);
-        break;
-      case ButtonPress:
-/*        fprintf(stderr,"event:handle_event type=ButtonPress\n");*/
-        handle_button(event->xbutton.button, (XButtonEvent *)event);
-        XFlush(gXDisplay);
-        if (gWindow) {
-            while (XCheckTypedWindowEvent(gXDisplay, gWindow->fMainWindow,
-                                          Expose, event));
-            while (XCheckTypedWindowEvent(gXDisplay, gWindow->fScrollWindow,
-                                          Expose, event));
-        }
-        break;
-      case KeyPress:
-/*        fprintf(stderr,"event:handle_event type=KeyPress\n");*/
-        handle_key(event);
-        if (gWindow) {
-            while (XCheckTypedWindowEvent(gXDisplay, gWindow->fMainWindow,
-                                          Expose, event));
-            while (XCheckTypedWindowEvent(gXDisplay, gWindow->fScrollWindow,
-                                          Expose, event));
-        }
-        break;
-      case MapNotify:
-/*        fprintf(stderr,"event:handle_event type=MapNotify\n");*/
-        create_window();
-        break;
+    XSetErrorHandler(HyperDocErrorHandler);
+}
 
-      case SelectionNotify:
-/*        fprintf(stderr,"event:handle_event type=SelectionNotify\n");*/
-        /* this is in response to a previous request in an input area */
-        if ( gSavedInputAreaLink ) {
-            XSelectionEvent *pSelEvent;
-            Atom dataProperty;
-            pSelEvent = (XSelectionEvent *) event;
-            dataProperty = XInternAtom(gXDisplay, "PASTE_SELECTION", False);
-            /* change the input focus */
+static int
+set_window(Window window)
+{
+    Window root, parent, *children, grandparent,myarg;
+    HDWindow *htw;
+    unsigned int nchildren;
+    int st;
 
-        /*  change_input_focus(gSavedInputAreaLink); */
+    myarg=window;
+    nchildren = 0;
+    htw = (HDWindow *) hash_find(&gSessionHashTable, (char *)&myarg);
+    if (htw != NULL) {
+        gWindow = htw;
+        return 1;
+    }
+    st = XQueryTree(gXDisplay, myarg, &root, &parent, &children, &nchildren);
+    if (st==0) goto ERROR;
+    if (nchildren > 0)
+        XFree(children);
+    htw = (HDWindow *) hash_find(&gSessionHashTable, (char *)&parent);
+    if (htw != NULL) {
+        gWindow = htw;
+        return 1;
 
-            /* try to get the selection as a window property */
+    }
+    else {
+        /* check for a grandparent */
+        st = XQueryTree(gXDisplay, parent, &root, &grandparent, &children, &nchildren);
+        if (st==0) goto ERROR;
+        if (nchildren > 0)
+            XFree(children);
+        htw = (HDWindow *) hash_find(&gSessionHashTable, (char *)&grandparent);
+        if (htw != NULL) {
+            gWindow = htw;
+            return 1;
+        }
+    }
 
-            if ( pSelEvent->requestor == gWindow->fMainWindow &&
-                 pSelEvent->selection == XA_PRIMARY &&
-            /*   pSelEvent->time      == CurrentTime && */
-                 pSelEvent->target    == XA_STRING &&
-                 pSelEvent->property == dataProperty )
-            {
-                Atom actual_type;
-                int  actual_format;
-                unsigned long nitems, leftover;
-                char *pSelection = NULL;
+    /*
+     * fprintf(stderr, "window(%d) and it's parent(%d) aren't in
+     * gSessionHashTable\n", window, parent);
+     
+     we never found that window. this happens if (not iff) we exit from 
+     an unfocused non-main window under certain wm's and click-to-type. the program returns here with
+     the window handle that was just destroyed. So let's set the global gWindow
+     to the main window.
+     */
 
-                if (Success == XGetWindowProperty(gXDisplay,
-                    gWindow->fMainWindow,
-                    pSelEvent->property, 0L, 100000000L, True,
-                    AnyPropertyType, &actual_type, &actual_format,
-                    &nitems, &leftover, (unsigned char **) &pSelection) )
-                {
-                    char *pBuffer;
-                    InputItem *item = gSavedInputAreaLink->reference.string;
+ERROR:
+    gWindow=gParentWindow;
+    return 0;
+}
 
-                    for (pBuffer = pSelection; *pBuffer; ++pBuffer)
-                        add_buffer_to_sym(pBuffer, item);
 
-                    XFree(pSelection);
-                }
-            }
+static HyperLink *
+findButtonInList(HDWindow * window, int x, int y)
+{
+    ButtonList *bl;
 
-            /* clear the link info */
+    if (!window || window->page->type == UnloadedPageType)
+        return NULL;
+    for (bl = window->page->s_button_list; bl != NULL; bl = bl->next)
+        if (x >= bl->x0 && x <= bl->x1 && y >= bl->y0 && y <= bl->y1)
+            return bl->link;
+    for (bl = window->page->button_list; bl != NULL; bl = bl->next)
+        if (x >= bl->x0 && x <= bl->x1 && y >= bl->y0 && y <= bl->y1)
+            return bl->link;
+    return NULL;
+}
 
-            gSavedInputAreaLink = NULL;
-        }
-        break;
-
-      default:
-/*        fprintf(stderr,"event:handle_event type=default\n");*/
-        break;
-    }
-
+static void
+set_cursor(HDWindow *window,Cursor state)
+{
+    if (state == gBusyCursor)
+        XDefineCursor(gXDisplay, window->fMainWindow, gBusyCursor);
+    else if (state == gActiveCursor)
+        XDefineCursor(gXDisplay, window->fMainWindow, gActiveCursor);
+    else
+        XDefineCursor(gXDisplay, window->fMainWindow, gNormalCursor);
+    XFlush(gXDisplay);
 }
 
 static void
-create_window(void)
+change_cursor(Cursor state, HDWindow *window)
 {
-    XWindowAttributes wa;
+    if (window->fDisplayedCursor == state)
+        return;
+    window->fDisplayedCursor = state;
+    set_cursor(window, state);
+}
 
-    XGetWindowAttributes(gXDisplay, gWindow->fMainWindow, &wa);
 
-    gWindow->width = wa.width;
-    gWindow->height = wa.height;
-    display_page(gWindow->page);
-    gWindow->fWindowHashTable = gWindow->page->fLinkHashTable;
+static void
+make_busy_cursor(HDWindow *window)
+{
+    change_cursor(gBusyCursor, window);
+}
 
-    /* then select for the events I normally would like to catch */
-    XSelectInput(gXDisplay, gWindow->fMainWindow, ButtonPress | KeyPressMask |
-                 PointerMotionMask |
-                 ExposureMask /* | EnterWindowMask | LeaveWindowMask */ );
-    XSelectInput(gXDisplay, gWindow->fScrollWindow, ExposureMask);
+static void
+make_busy_cursors(void)
+{
+    hash_map(&gSessionHashTable, (MappableFunction)make_busy_cursor);
+}
 
+static void
+handle_motion_event(XMotionEvent *event)
+{
+    if (!gWindow)
+        return;
+    if (findButtonInList(gWindow, event->x, event->y) != NULL)
+        change_cursor(gActiveCursor, gWindow);
+    else
+        change_cursor(gNormalCursor, gWindow);
 }
 
+
 /*
- * This routine is called when the quitbutton is hit. For the moment I am
- * just going to leave it all behind
+ * This procedure whips thru the stack and clears all expose events for the
+ * given routine
  */
+static void
+clear_exposures(Window w)
+{
+    XEvent report;
 
-void
-quitHyperDoc(void)
+    XFlush(gXDisplay);
+    while (XCheckTypedWindowEvent(gXDisplay, w, Expose, &report));
+}
+
+static HyperLink *
+get_hyper_link(XButtonEvent * event)
 {
-    HyperDocPage *page;
+    HyperLink *l1, *l2;
 
-    if (gSessionHashTable.num_entries == 1 || gParentWindow == gWindow) {
-        if (!strcmp(gWindow->page->name, "ProtectedQuitPage")){
-        exitHyperDoc();
-                }
-        page = (HyperDocPage *) hash_find(gWindow->fPageHashTable, "ProtectedQuitPage");
-        if (page == NULL) {
-            fprintf(stderr, "Unknown page name %s\n", "ProtectedQuitPage");
-            exitHyperDoc();
-            return;
-        }
-        if (gWindow->fDownLinkStackIndex == MaxDownlinkDepth)
-            fprintf(stderr, "exceeded maximum link nesting level\n");
-        else
-            gWindow->fDownLinkStack[gWindow->fDownLinkStackIndex++] = gWindow->page;
-        gWindow->page = page;
-        display_page(gWindow->page);
-        gWindow->fWindowHashTable = gWindow->page->fLinkHashTable;
-    }
-    else
-        exitHyperDoc();
+    l1 = (HyperLink *) hash_find(gWindow->fWindowHashTable, (char *)&(event->window));
+    if (l1)
+        return l1;
+    l2 = findButtonInList(gWindow, event->x, event->y);
+    return l2;
 }
 
 
-/*
- * find_page takes as an argument the HyperDoc for a page name and returns
- * the associated page
- */
-
 static HyperDocPage *
-find_page(TextNode * node)
+paste_button(PasteNode * paste)
 {
-    char *page_name;
-    HyperDocPage *page;
+    HyperDocPage *page = NULL;
+    int pastewhere=paste->where;
 
-    /* try and find the page name */
-    page_name = print_to_string(node);
-    page = (HyperDocPage *) hash_find(gWindow->fPageHashTable, page_name);
 
-    if (page == NULL) {
-        /* try to find the unknown page */
-        page = (HyperDocPage *) hash_find(gWindow->fPageHashTable, "UnknownPage");
-        if (page == NULL) {
-            /* Yikes, Even that could not be found */
-            fprintf(stderr, "Unknown page name %s\n", page_name);
+    if ( paste->end_node ==NULL || paste->begin_node==NULL || paste->arg_node==NULL ){
+        BeepAtTheUser();
+        return NULL;
         }
-        else {
-            if (page->type == UnloadedPageType)
-                page->type = UlUnknownPage;
-            else
-                page->type = UnknownPage;
-        }
-    }
-    return page;
-}
 
-/*
- * These are macros for taking care of the downlink stack, and the memolink
- * stack.
- */
+    page=parse_patch(paste);
+/* paste has changed after this call so use pastewhere*/
 
-#define NotSpecial(t) \
-  ((t == openaxiom_Quitbutton_token || t == openaxiom_Returnbutton_token \
-    || t == openaxiom_Upbutton_token || t == UnknownPage \
-    || t == UlUnknownPage || t == ErrorPage) \
-   ?(0):(1))
-
-/* pushes a page onto the down link stack */
-
-static void
-downlink(void)
-{
-    if (gWindow->fDownLinkStackIndex == MaxDownlinkDepth)
-        fprintf(stderr, "exceeded maximum link nesting level\n");
+    if (pastewhere && page ) {
+        if (0 == strcmp(page->name, "ErrorPage"))
+            page = NULL;
+    }
     else
-        gWindow->fDownLinkStack[gWindow->fDownLinkStackIndex++] = gWindow->page;
-}
+        BeepAtTheUser();
 
-static void
-memolink(void)
-{
-    if (gWindow->fMemoStackIndex == MaxMemoDepth)
-        fprintf(stderr, "exceeded maximum link nesting level\n");
-    else {
-        gWindow->fMemoStack[gWindow->fMemoStackIndex] = gWindow->page;
-        gWindow->fDownLinkStackTop[gWindow->fMemoStackIndex++] = gWindow->fDownLinkStackIndex;
-    }
+    return page;
 }
 
 static void
@@ -442,7 +319,61 @@
     }
 }
 
+/*
+ * find_page takes as an argument the HyperDoc for a page name and returns
+ * the associated page
+ */
+
+static HyperDocPage *
+find_page(TextNode * node)
+{
+    char *page_name;
+    HyperDocPage *page;
+
+    /* try and find the page name */
+    page_name = print_to_string(node);
+    page = (HyperDocPage *) hash_find(gWindow->fPageHashTable, page_name);
+
+    if (page == NULL) {
+        /* try to find the unknown page */
+        page = (HyperDocPage *) hash_find(gWindow->fPageHashTable, "UnknownPage");
+        if (page == NULL) {
+            /* Yikes, Even that could not be found */
+            fprintf(stderr, "Unknown page name %s\n", page_name);
+        }
+        else {
+            if (page->type == UnloadedPageType)
+                page->type = UlUnknownPage;
+            else
+                page->type = UnknownPage;
+        }
+    }
+    return page;
+}
+
+/* pushes a page onto the down link stack */
+
 static void
+downlink(void)
+{
+    if (gWindow->fDownLinkStackIndex == MaxDownlinkDepth)
+        fprintf(stderr, "exceeded maximum link nesting level\n");
+    else
+        gWindow->fDownLinkStack[gWindow->fDownLinkStackIndex++] = gWindow->page;
+}
+
+static void
+memolink(void)
+{
+    if (gWindow->fMemoStackIndex == MaxMemoDepth)
+        fprintf(stderr, "exceeded maximum link nesting level\n");
+    else {
+        gWindow->fMemoStack[gWindow->fMemoStackIndex] = gWindow->page;
+        gWindow->fDownLinkStackTop[gWindow->fMemoStackIndex++] = gWindow->fDownLinkStackIndex;
+    }
+}
+
+static void
 windowlink_handler(TextNode * node)
 {
     char *page_name;
@@ -456,14 +387,6 @@
 /*    gWindow->fWindowHashTable = gWindow->page->fLinkHashTable;*/
 }
 
-void
-make_window_link(char *name)
-{
-    if (init_top_window(name) != -1)
-{}/*        gWindow->fWindowHashTable = gWindow->page->fLinkHashTable; */
-}
-
-
 static void
 lispwindowlink_handler(HyperLink * link)
 {
@@ -484,87 +407,37 @@
     }
 }
 
-static HyperDocPage *
-paste_button(PasteNode * paste)
+static void
+create_window(void)
 {
-    HyperDocPage *page = NULL;
-    int pastewhere=paste->where;
+    XWindowAttributes wa;
 
+    XGetWindowAttributes(gXDisplay, gWindow->fMainWindow, &wa);
 
-    if ( paste->end_node ==NULL || paste->begin_node==NULL || paste->arg_node==NULL ){
-        BeepAtTheUser();
-        return NULL;
-        }
+    gWindow->width = wa.width;
+    gWindow->height = wa.height;
+    display_page(gWindow->page);
+    gWindow->fWindowHashTable = gWindow->page->fLinkHashTable;
 
-    page=parse_patch(paste);
-/* paste has changed after this call so use pastewhere*/
+    /* then select for the events I normally would like to catch */
+    XSelectInput(gXDisplay, gWindow->fMainWindow, ButtonPress | KeyPressMask |
+                 PointerMotionMask |
+                 ExposureMask /* | EnterWindowMask | LeaveWindowMask */ );
+    XSelectInput(gXDisplay, gWindow->fScrollWindow, ExposureMask);
 
-    if (pastewhere && page ) {
-        if (0 == strcmp(page->name, "ErrorPage"))
-            page = NULL;
-    }
-    else
-        BeepAtTheUser();
-
-    return page;
 }
 
-void
-helpForHyperDoc(void)
-{
-    HyperDocPage *page = NULL;
+/*
+ * These are macros for taking care of the downlink stack, and the memolink
+ * stack.
+ */
 
-    /* do not do anything if we are already at the "no more help" page */
+#define NotSpecial(t) \
+  ((t == openaxiom_Quitbutton_token || t == openaxiom_Returnbutton_token \
+    || t == openaxiom_Upbutton_token || t == UnknownPage \
+    || t == UlUnknownPage || t == ErrorPage) \
+   ?(0):(1))
 
-    if (0 == strcmp(gWindow->page->name, NoMoreHelpPage))
-        return;
-
-    /* if no help page recorded, use the standard "no more help" page */
-
-    if (!gWindow->page->helppage)
-        gWindow->page->helppage = alloc_string(NoMoreHelpPage);
-
-    /* if we are on the main help page, use "no more help" page */
-
-    if (0 == strcmp(gWindow->page->name, TopLevelHelpPage))
-        gWindow->page->helppage = alloc_string(NoMoreHelpPage);
-
-    page = (HyperDocPage *) hash_find(gWindow->fPageHashTable, gWindow->page->helppage);
-
-    if (page)
-        make_window_link(gWindow->page->helppage);
-    else
-        BeepAtTheUser();
-}
-
-static HyperLink *
-findButtonInList(HDWindow * window, int x, int y)
-{
-    ButtonList *bl;
-
-    if (!window || window->page->type == UnloadedPageType)
-        return NULL;
-    for (bl = window->page->s_button_list; bl != NULL; bl = bl->next)
-        if (x >= bl->x0 && x <= bl->x1 && y >= bl->y0 && y <= bl->y1)
-            return bl->link;
-    for (bl = window->page->button_list; bl != NULL; bl = bl->next)
-        if (x >= bl->x0 && x <= bl->x1 && y >= bl->y0 && y <= bl->y1)
-            return bl->link;
-    return NULL;
-}
-
-static HyperLink *
-get_hyper_link(XButtonEvent * event)
-{
-    HyperLink *l1, *l2;
-
-    l1 = (HyperLink *) hash_find(gWindow->fWindowHashTable, (char *)&(event->window));
-    if (l1)
-        return l1;
-    l2 = findButtonInList(gWindow, event->x, event->y);
-    return l2;
-}
-
 /*
  * Handle a button pressed event. window is the subwindow in which the event
  * occured, and button is the button which was pressed
@@ -736,7 +609,191 @@
 }
 
 
+static void
+handle_event(XEvent * event)
+{
+    XWindowAttributes wa;
+/*    fprintf(stderr,"event:handle_event entered\n");*/
+    set_window(event->xany.window);
+    if (event->type == MotionNotify) {
+/*        fprintf(stderr,"event:handle_event type=MotionNotify\n");*/
+        handle_motion_event((XMotionEvent *)event);
+        motion = 1;
+        return;
+    }
+    make_busy_cursors();
+    switch (event->type) {
+      case DestroyNotify:
+/*        fprintf(stderr,"event:handle_event type=DestroyNotify\n");*/
+        break;
+      case Expose:
+/*        fprintf(stderr,"event:handle_event type=Expose\n");*/
+        XGetWindowAttributes(gXDisplay, gWindow->fMainWindow, &wa);
+        if ((gWindow->width == 0 && gWindow->height == 0) ||
+            (wa.width != gWindow->width || wa.height != gWindow->height)) {
+            gWindow->width = wa.width;
+            gWindow->height = wa.height;
+            display_page(gWindow->page);
+            gWindow->fWindowHashTable = gWindow->page->fLinkHashTable;
+        }
+        else                    /** just redraw the thing **/
+            expose_page(gWindow->page);
+        XFlush(gXDisplay);
+        clear_exposures(gWindow->fMainWindow);
+        clear_exposures(gWindow->fScrollWindow);
+        break;
+      case ButtonPress:
+/*        fprintf(stderr,"event:handle_event type=ButtonPress\n");*/
+        handle_button(event->xbutton.button, (XButtonEvent *)event);
+        XFlush(gXDisplay);
+        if (gWindow) {
+            while (XCheckTypedWindowEvent(gXDisplay, gWindow->fMainWindow,
+                                          Expose, event));
+            while (XCheckTypedWindowEvent(gXDisplay, gWindow->fScrollWindow,
+                                          Expose, event));
+        }
+        break;
+      case KeyPress:
+/*        fprintf(stderr,"event:handle_event type=KeyPress\n");*/
+        handle_key(event);
+        if (gWindow) {
+            while (XCheckTypedWindowEvent(gXDisplay, gWindow->fMainWindow,
+                                          Expose, event));
+            while (XCheckTypedWindowEvent(gXDisplay, gWindow->fScrollWindow,
+                                          Expose, event));
+        }
+        break;
+      case MapNotify:
+/*        fprintf(stderr,"event:handle_event type=MapNotify\n");*/
+        create_window();
+        break;
+
+      case SelectionNotify:
+/*        fprintf(stderr,"event:handle_event type=SelectionNotify\n");*/
+        /* this is in response to a previous request in an input area */
+        if ( gSavedInputAreaLink ) {
+            XSelectionEvent *pSelEvent;
+            Atom dataProperty;
+            pSelEvent = (XSelectionEvent *) event;
+            dataProperty = XInternAtom(gXDisplay, "PASTE_SELECTION", False);
+            /* change the input focus */
+
+        /*  change_input_focus(gSavedInputAreaLink); */
+
+            /* try to get the selection as a window property */
+
+            if ( pSelEvent->requestor == gWindow->fMainWindow &&
+                 pSelEvent->selection == XA_PRIMARY &&
+            /*   pSelEvent->time      == CurrentTime && */
+                 pSelEvent->target    == XA_STRING &&
+                 pSelEvent->property == dataProperty )
+            {
+                Atom actual_type;
+                int  actual_format;
+                unsigned long nitems, leftover;
+                char *pSelection = NULL;
+
+                if (Success == XGetWindowProperty(gXDisplay,
+                    gWindow->fMainWindow,
+                    pSelEvent->property, 0L, 100000000L, True,
+                    AnyPropertyType, &actual_type, &actual_format,
+                    &nitems, &leftover, (unsigned char **) &pSelection) )
+                {
+                    char *pBuffer;
+                    InputItem *item = gSavedInputAreaLink->reference.string;
+
+                    for (pBuffer = pSelection; *pBuffer; ++pBuffer)
+                        add_buffer_to_sym(pBuffer, item);
+
+                    XFree(pSelection);
+                }
+            }
+
+            /* clear the link info */
+
+            gSavedInputAreaLink = NULL;
+        }
+        break;
+
+      default:
+/*        fprintf(stderr,"event:handle_event type=default\n");*/
+        break;
+    }
+
+}
+
+/*
+ * This routine is called when the quitbutton is hit. For the moment I am
+ * just going to leave it all behind
+ */
+
 void
+quitHyperDoc(void)
+{
+    HyperDocPage *page;
+
+    if (gSessionHashTable.num_entries == 1 || gParentWindow == gWindow) {
+        if (!strcmp(gWindow->page->name, "ProtectedQuitPage")){
+        exitHyperDoc();
+                }
+        page = (HyperDocPage *) hash_find(gWindow->fPageHashTable, "ProtectedQuitPage");
+        if (page == NULL) {
+            fprintf(stderr, "Unknown page name %s\n", "ProtectedQuitPage");
+            exitHyperDoc();
+            return;
+        }
+        if (gWindow->fDownLinkStackIndex == MaxDownlinkDepth)
+            fprintf(stderr, "exceeded maximum link nesting level\n");
+        else
+            gWindow->fDownLinkStack[gWindow->fDownLinkStackIndex++] = gWindow->page;
+        gWindow->page = page;
+        display_page(gWindow->page);
+        gWindow->fWindowHashTable = gWindow->page->fLinkHashTable;
+    }
+    else
+        exitHyperDoc();
+}
+
+
+
+void
+make_window_link(char *name)
+{
+    if (init_top_window(name) != -1)
+{}/*        gWindow->fWindowHashTable = gWindow->page->fLinkHashTable; */
+}
+
+
+void
+helpForHyperDoc(void)
+{
+    HyperDocPage *page = NULL;
+
+    /* do not do anything if we are already at the "no more help" page */
+
+    if (0 == strcmp(gWindow->page->name, NoMoreHelpPage))
+        return;
+
+    /* if no help page recorded, use the standard "no more help" page */
+
+    if (!gWindow->page->helppage)
+        gWindow->page->helppage = alloc_string(NoMoreHelpPage);
+
+    /* if we are on the main help page, use "no more help" page */
+
+    if (0 == strcmp(gWindow->page->name, TopLevelHelpPage))
+        gWindow->page->helppage = alloc_string(NoMoreHelpPage);
+
+    page = (HyperDocPage *) hash_find(gWindow->fPageHashTable, gWindow->page->helppage);
+
+    if (page)
+        make_window_link(gWindow->page->helppage);
+    else
+        BeepAtTheUser();
+}
+
+
+void
 exitHyperDoc(void)
 {
     XEvent event;
@@ -776,71 +833,6 @@
     XFlush(gXDisplay);
 }
 
-static int
-set_window(Window window)
-{
-    Window root, parent, *children, grandparent,myarg;
-    HDWindow *htw;
-    unsigned int nchildren;
-    int st;
-
-    myarg=window;
-    nchildren = 0;
-    htw = (HDWindow *) hash_find(&gSessionHashTable, (char *)&myarg);
-    if (htw != NULL) {
-        gWindow = htw;
-        return 1;
-    }
-    st = XQueryTree(gXDisplay, myarg, &root, &parent, &children, &nchildren);
-    if (st==0) goto ERROR;
-    if (nchildren > 0)
-        XFree(children);
-    htw = (HDWindow *) hash_find(&gSessionHashTable, (char *)&parent);
-    if (htw != NULL) {
-        gWindow = htw;
-        return 1;
-
-    }
-    else {
-        /* check for a grandparent */
-        st = XQueryTree(gXDisplay, parent, &root, &grandparent, &children, &nchildren);
-        if (st==0) goto ERROR;
-        if (nchildren > 0)
-            XFree(children);
-        htw = (HDWindow *) hash_find(&gSessionHashTable, (char *)&grandparent);
-        if (htw != NULL) {
-            gWindow = htw;
-            return 1;
-        }
-    }
-
-    /*
-     * fprintf(stderr, "window(%d) and it's parent(%d) aren't in
-     * gSessionHashTable\n", window, parent);
-     
-     we never found that window. this happens if (not iff) we exit from 
-     an unfocused non-main window under certain wm's and click-to-type. the program returns here with
-     the window handle that was just destroyed. So let's set the global gWindow
-     to the main window.
-     */
-
-ERROR:
-    gWindow=gParentWindow;
-    return 0;
-}
-
-/*
- * This procedure whips thru the stack and clears all expose events for the
- * given routine
- */
-static void
-clear_exposures(Window w)
-{
-    XEvent report;
-
-    XFlush(gXDisplay);
-    while (XCheckTypedWindowEvent(gXDisplay, w, Expose, &report));
-}
 void
 get_new_window(void)
 {
@@ -963,40 +955,9 @@
           }
         break;
     }
-  }
-static void
-set_cursor(HDWindow *window,Cursor state)
-{
-    if (state == gBusyCursor)
-        XDefineCursor(gXDisplay, window->fMainWindow, gBusyCursor);
-    else if (state == gActiveCursor)
-        XDefineCursor(gXDisplay, window->fMainWindow, gActiveCursor);
-    else
-        XDefineCursor(gXDisplay, window->fMainWindow, gNormalCursor);
-    XFlush(gXDisplay);
 }
 
 static void
-change_cursor(Cursor state, HDWindow *window)
-{
-    if (window->fDisplayedCursor == state)
-        return;
-    window->fDisplayedCursor = state;
-    set_cursor(window, state);
-}
-
-static void
-handle_motion_event(XMotionEvent *event)
-{
-    if (!gWindow)
-        return;
-    if (findButtonInList(gWindow, event->x, event->y) != NULL)
-        change_cursor(gActiveCursor, gWindow);
-    else
-        change_cursor(gNormalCursor, gWindow);
-}
-
-static void
 init_cursor_state(HDWindow *window)
 {
     if (window) {
@@ -1019,42 +980,83 @@
 }
 
 
-static void
-make_busy_cursor(HDWindow *window)
-{
-    change_cursor(gBusyCursor, window);
-}
+/*
+ * This is the main X loop. It keeps grabbing events. Since the only way the
+ * window can die is through an event, it never actually end. One of the
+ * subroutines it calls is responsible for killing everything
+ */
 
-static void
-make_busy_cursors(void)
+void
+mainEventLoop(void)
 {
-    hash_map(&gSessionHashTable, (MappableFunction)make_busy_cursor);
-}
+    XEvent event;
+    int  Xcon;
+    fd_set rd, dum1, dum2;
+    motion = 0;
+    gActiveWindow = -1;
+    set_error_handlers();
+    Xcon = ConnectionNumber(gXDisplay);
 
-static int
-HyperDocErrorHandler(Display *display, XErrorEvent *xe)
-{
-    if (xe->request_code != 15) {
-        char buf[1024];
+    while (1) {
+/*        fprintf(stderr,"event:mainEventLoop: loop top\n");*/
+        while (gSessionHashTable.num_entries == 0)
+            pause();
 
-        XGetErrorText(display, xe->error_code, buf, sizeof(buf));
+        /* XFlush(gXDisplay);      */
 
-        fprintf(stderr, "error code = %d\n", xe->error_code);
-        fprintf(stderr, "major op code = %d\n", xe->request_code);
-        fprintf(stderr, "minor op code = %d\n", xe->minor_code);
-        fprintf(stderr, "XID = %ld\n", xe->resourceid);
-        fprintf(stderr, "%s\n", buf);
+        if (!motion)
+            init_cursor_states();
+        motion = 0;
 
-        if (xe->request_code != 15)
-            exit(-1);
-      }
-    return(0);
+        if (!spad_socket == 0) {
+            FD_ZERO(&rd);
+            FD_ZERO(&dum1);
+            FD_ZERO(&dum2);
+            FD_CLR(0, &dum1);
+            FD_CLR(0, &dum2);
+            FD_CLR(0, &rd);
+            FD_SET(spad_socket->socket, &rd);
+            FD_SET(Xcon, &rd);
+            if (!session_server == 0) {
+                FD_SET(session_server->socket, &rd);
+            }
+            if (XEventsQueued(gXDisplay, QueuedAlready)) {
+                XNextEvent(gXDisplay, &event);
+                handle_event(&event);
+            }
+            else {
+              select(FD_SETSIZE, &rd, &dum1, &dum2, NULL);
+              if (FD_ISSET(Xcon, &rd) || 
+                  XEventsQueued(gXDisplay, QueuedAfterFlush)) {
+                    XNextEvent(gXDisplay, &event);
+                    handle_event(&event);
+                }
+              else if (FD_ISSET(spad_socket->socket, &rd))
+                    /*
+                     * Axiom Socket do what handle_event does The 100 is
+                     * $SpadStuff in hypertex.boot
+                     */
+                {
+                    if (100 == get_int(spad_socket)) {
+                        set_window(gParentWindow->fMainWindow);
+                        make_busy_cursors();
+                        get_new_window();
+                    }
+                }
+                /*
+                 * Session Socket Telling us about the death of a spadbuf
+                 * (plus maybe more later) service_session_socket in
+                 * spadint.c
+                 */
+                else 
+                 if (session_server && FD_ISSET(session_server->socket, &rd)) {
+                    service_session_socket();
+                 }
+            }
+        }
+        else {
+            XNextEvent(gXDisplay, &event);
+            handle_event(&event);
+        }
+    }
 }
-
-
-
-static void
-set_error_handlers(void)
-{
-    XSetErrorHandler(HyperDocErrorHandler);
-}

Modified: trunk/src/hyper/event.h
===================================================================
--- trunk/src/hyper/event.h	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/event.h	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserbed.
 
   Redistribution and use in source and binary forms, with or without
@@ -38,6 +38,16 @@
 
 #include "hyper.h"
 
+extern void sigusr2_handler(int sig);
+extern void sigcld_handler(int sig);
+extern void clean_socket(void);
+extern void init_page_structs(HDWindow * w);
+extern void helpForHyperDoc(void);
+extern void quitHyperDoc(void);
+extern void exitHyperDoc(void);
+extern void mainEventLoop(void);
+extern void make_window_link(char*);
+
 extern Window gActiveWindow;
 extern int    gNeedIconName;
 

Modified: trunk/src/hyper/extent.h
===================================================================
--- trunk/src/hyper/extent.h	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/extent.h	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,23 @@
 #define dash_width 5
 #define dash_y     4
 
+extern void compute_header_extent(HyperDocPage * page);
+extern void compute_footer_extent(HyperDocPage * page);
+extern void compute_scrolling_extent(HyperDocPage * page);
+extern void compute_title_extent(HyperDocPage * page);
+extern void compute_text_extent(TextNode * node);
+extern void init_extents(void );
+extern void init_text(void );
+extern void init_title_extents(HyperDocPage * page);
+extern void insert_bitmap_file(TextNode * node);
+extern void insert_pixmap_file(TextNode * node);
+extern int max_x(TextNode * node , int Ender);
+extern int plh(int height);
+extern void start_newline(int distance , TextNode * node);
+extern int text_height(TextNode * node , int Ender);
+extern int text_width(TextNode * node , int Ender);
+extern int total_width(TextNode * node , int Ender);
+extern int trailing_space(TextNode * node);
 
 /* next two from display.h. Reorg! */
 

Modified: trunk/src/hyper/extent1.c
===================================================================
--- trunk/src/hyper/extent1.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/extent1.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -40,12 +40,9 @@
  * Copyright The Numerical Algorithms Group Limited 1991, 1992, 1993.
  *
  ****************************************************************************/
-#define _EXTENT1_C
+
 #include "openaxiom-c-macros.h"
-
 #include "debug.h"
-
-
 #include "sockio.h"
 #include "extent.h"
 #include "hyper.h"
@@ -53,9 +50,37 @@
 #include "titlebar.h"
 #include "scrollbar.h"
 
-#include "all_hyper_proto.H1"
+static void compute_begin_items_extent(TextNode * node);
+static void compute_bf_extent(TextNode * node);
+static void compute_box_extent(TextNode * node);
+static void compute_button_extent(TextNode * node);
+static void compute_center_extent(TextNode * node);
+static void compute_dash_extent(TextNode * node);
+static void compute_em_extent(TextNode * node);
+static void compute_ifcond_extent(TextNode * node);
+static void compute_image_extent(TextNode * node);
+static void compute_input_extent(TextNode * node);
+static void compute_ir_extent(TextNode * node);
+static void compute_it_extent(TextNode * node);
+static void compute_item_extent(TextNode * node);
+static void compute_mbox_extent(TextNode * node);
+static void compute_mitem_extent(TextNode * node);
+static void compute_paste_extent(TextNode * node);
+static void compute_pastebutton_extent(TextNode * node);
+static void compute_punctuation_extent(TextNode * node);
+static void compute_rm_extent(TextNode * node);
+static void compute_spadcommand_extent(TextNode * node);
+static void compute_spadsrc_extent(TextNode * node);
+static void compute_spadsrctxt_extent(TextNode * node);
+static void compute_table_extent(TextNode * * node);
+static void compute_verbatim_extent(TextNode * node);
+static void compute_word_extent(TextNode * node);
+static void end_spadcommand_extent(TextNode * node);
+static void end_spadsrc_extent(TextNode * node);
+static void endbutton_extent(TextNode * node);
+static void endif_extent(TextNode * node);
+static void endpastebutton_extent(TextNode * node);
 
-
 /*
  * Now we declare all the values which are shared among the extent routines
  * and the showing routines

Modified: trunk/src/hyper/extent2.c
===================================================================
--- trunk/src/hyper/extent2.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/extent2.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -41,21 +41,23 @@
  *
  ****************************************************************************/
 
-#define _EXTENT2_C
 #include "openaxiom-c-macros.h"
-
 #include "debug.h"
-
 #include "halloc.h"
 #include "sockio.h"
 #include "extent.h"
 #include "group.h"
 #include "titlebar.h"
-
-#include "all_hyper_proto.H1"
-#include "pixmap.H1"
 #include "cfuns.h"
 
+static void center_nodes(TextNode * begin_node , TextNode * end_node);
+static int input_string_width(TextNode * node);
+static int punctuation_width(TextNode * node);
+static int text_height1(TextNode * node , int Ender);
+static int verbatim_width(TextNode * node);
+static int width_of_dash(TextNode * node);
+static int word_width(TextNode * node);
+static int x_value(TextNode * node);
 
 static int cur_height = 0;
 static int max_x_value = 0;

Modified: trunk/src/hyper/form-ext.c
===================================================================
--- trunk/src/hyper/form-ext.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/form-ext.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -33,18 +33,18 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#define _FORM_EXT_C
 #include "openaxiom-c-macros.h"
-
 #include "debug.h"
-
 #include "sockio.h"
 #include "extent.h"
 #include "group.h"
 #include "scrollbar.h"
 
-#include "all_hyper_proto.H1"
 
+static int window_height(HyperDocPage * page);
+static void form_header_extent(HyperDocPage * page);
+static void form_footer_extent(HyperDocPage * page);
+static void form_scrolling_extent(HyperDocPage * page);
 
 
 /*

Modified: trunk/src/hyper/group.c
===================================================================
--- trunk/src/hyper/group.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/group.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -41,17 +41,12 @@
  *
  ****************************************************************************/
 
-#define _GROUP_C
-
 #include "debug.h"
-
 #include "halloc.h"
 #include "sockio.h"
 #include "group.h"
 #include "initx.h"
 
-#include "all_hyper_proto.H1"
-
 GroupItem *gTopOfGroupStack = NULL;
 
 

Modified: trunk/src/hyper/group.h
===================================================================
--- trunk/src/hyper/group.h	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/group.h	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,21 @@
 #include "openaxiom-c-macros.h"
 #include "hyper.h"
 
+extern void bf_top_group(void );
+extern GroupItem * copy_group_stack(void );
+extern void em_top_group(void );
+extern void free_group_stack(GroupItem * g);
+extern void init_group_stack(void );
+extern void init_top_group(void );
+extern void line_top_group(void );
+extern int pop_group_stack(void );
+extern void push_active_group(void );
+extern void push_group_stack(void );
+extern void push_spad_group(void );
+extern void rm_top_group(void );
+extern void tt_top_group(void );
+extern void center_top_group(void );
+
 extern GroupItem   *gTopOfGroupStack;
 
 #endif

Modified: trunk/src/hyper/htadd.c
===================================================================
--- trunk/src/hyper/htadd.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/htadd.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2009, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -75,8 +75,6 @@
                                  * in a file. This way someone can start
                                  * including a line number counter into
                                  * HyperDoc. */
-/* for compatibility with HyperDoc */
-openaxiom_sio *spad_socket = NULL;
 int fresh = 0;
 
 #define Delete 1

Modified: trunk/src/hyper/htinp.c
===================================================================
--- trunk/src/hyper/htinp.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/htinp.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -33,15 +33,12 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#define _HTINP_C
-#include "openaxiom-c-macros.h"
-
-#include "debug.h"
-
 #include <sys/stat.h>
 #include <sys/signal.h>
 #include <setjmp.h>
 
+#include "openaxiom-c-macros.h"
+#include "debug.h"
 #include "halloc.h"
 #include "sockio.h"
 #include "hyper.h"
@@ -49,8 +46,6 @@
 #include "parse.h"
 #include "bsdsignal.h"
 #include "cfuns.h"
-
-#include "all_hyper_proto.H1"
 #include "sockio.h"
 
 extern char **input_file_list;
@@ -59,6 +54,15 @@
 extern int kill_spad;
 extern jmp_buf jmpbuf;
 
+static void make_input_file_list(void );
+static char * make_input_file_name(char * buf , char * filename);
+static char * make_paste_file_name(char * buf , char * filename);
+static void make_the_input_file(UnloadedPage * page);
+static void make_input_file_from_page(HyperDocPage * page);
+static int inListAndNewer(char * inputFile , char * htFile);
+static void print_paste(FILE * pfile , char * realcom , char * command , char * pagename , int com_type);
+static void print_graph_paste(FILE * pfile , char * realcom , char * command , char * pagename , int com_type);
+static void send_command(char * command , int com_type);
 
 #define MaxInputFiles 256
 char *active_file_list[MaxInputFiles];

Modified: trunk/src/hyper/hyper.c
===================================================================
--- trunk/src/hyper/hyper.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/hyper.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2009, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -43,14 +43,6 @@
 
 /* Include all the needed include files  */
 
-#define _HYPER_C
-
-#include "debug.h"
-
-#include "sockio.h"
-#include "hyper.h"
-#include "lex.h"
-
 #include <sys/signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -59,15 +51,25 @@
 #include <stdlib.h>
 #include <locale.h>
 
+#include "debug.h"
+#include "sockio.h"
+#include "hyper.h"
+#include "lex.h"
 #include "keyin.h"
 #include "initx.h"
 #include "event.h"
 #include "hyper.h"
 #include "bsdsignal.h"
-
-#include "all_hyper_proto.H1"
 #include "sockio.h"
+#include "parse.h"
 
+static void init_hash(void);
+static void make_server_connections(void);
+static void check_arguments(void);
+static void init_hash(void);
+static void make_server_connections(void);
+static void check_arguments(void);
+
 /*
  * Here is a flag used to tell me whether I made a good connection to the
  * menu server. Needed so I don't send spad commands when I should not

Modified: trunk/src/hyper/hyper.h
===================================================================
--- trunk/src/hyper/hyper.h	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/hyper.h	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -47,6 +47,7 @@
 #include "token.h"
 #include "hash.h"
 #include "node.h"
+#include "pixmap.h"
 
 #define boolean unsigned short int
 
@@ -57,6 +58,78 @@
 #define FALSE  ((boolean) 0x0)
 #endif
 
+extern void sigusr2_handler(int sig);
+extern void sigcld_handler(int sig);
+extern void clean_socket(void);
+extern void init_page_structs(HDWindow * w);
+extern void push_item_stack(void);
+extern void clear_item_stack(void);
+extern void pop_item_stack(void);
+extern ItemStack * copy_item_stack(void);
+extern void free_item_stack(ItemStack * is);
+extern ButtonList * alloc_button_list(void);
+extern CondNode * alloc_condnode(void);
+extern HDWindow * alloc_hd_window(void);
+extern IfNode * alloc_ifnode(void);
+extern InputBox * alloc_inputbox(void);
+extern LineStruct * alloc_inputline(int size);
+extern TextNode * alloc_node(void);
+extern HyperDocPage * alloc_page(char * name);
+extern PasteNode * alloc_paste_node(char * name);
+extern RadioBoxes * alloc_rbs(void);
+extern void free_button_list(ButtonList * bl);
+extern void free_hd_window(HDWindow * w);
+extern void free_input_item(InputItem * sym , short des);
+extern void free_input_list(InputItem * il);
+extern void free_node(TextNode * node , short des);
+extern void free_page(HyperDocPage * page);
+extern void free_patch(PatchStore * p);
+extern void free_string(char * str);
+extern char * resizeBuffer(int size , char * oldBuf , int * oldSize);
+extern PatchStore * alloc_patchstore(void);
+extern InputItem * return_item(char * name);
+extern void fill_box(Window w , ImageStruct * image);
+extern void toggle_input_box(HyperLink * link);
+extern void toggle_radio_box(HyperLink * link);
+extern void change_input_focus(HyperLink * link);
+extern void next_input_focus(void);
+extern void prev_input_focus(void);
+extern int delete_item(char * name);
+extern XImage * HTReadBitmapFile(Display * display , int screen , char * filename , int * width , int * height);
+extern ImageStruct * insert_image_struct(char * filename);
+extern void compute_form_page(HyperDocPage * page);
+extern int window_width(int cols);
+extern void ht2_input(void );
+extern void make_record(void );
+extern void verify_record(void );
+extern char * strCopy(char * s);
+extern void print_paste_line(FILE * pfile , char * str);
+extern void get_spad_output(FILE * pfile , char * command , int com_type);
+extern void get_graph_output(char * command , char * pagename , int com_type);
+extern void add_buffer_to_sym(char * buffer , InputItem * sym);
+extern void dialog(XEvent * event , KeySym keysym , char * buffer);
+extern void draw_inputsymbol(InputItem * sym);
+extern void update_inputsymbol(InputItem * sym);
+extern HyperDocPage * issue_server_command(HyperLink * link);
+extern HyperDocPage * issue_unixlink(TextNode * node);
+extern char * print_to_string(TextNode * command);
+extern void issue_spadcommand(HyperDocPage * page , TextNode * command , int immediate , int type);
+extern openaxiom_sio * accept_menu_connection(openaxiom_sio * server_sock);
+extern char * print_to_string1(TextNode * command , int * sizeBuf);
+extern int issue_serverpaste(TextNode * command);
+extern void issue_unixcommand(TextNode * node);
+extern int issue_unixpaste(TextNode * node);
+extern void service_session_socket(void);
+extern void send_lisp_command(char * command);
+extern void escape_string(char * s);
+extern void unescape_string(char * s);
+extern char * print_source_to_string1(TextNode * command , int * sizeBuf);
+extern char * print_source_to_string(TextNode * command);
+extern void change_cond(char * label , char * newcond);
+extern int check_condition(TextNode * node);
+extern void insert_cond(char * label , char * cond);
+
+
 #ifndef HTADD
 extern int MenuServerOpened;
 

Modified: trunk/src/hyper/initx.c
===================================================================
--- trunk/src/hyper/initx.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/initx.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,6 @@
 
 /* #define DEBUG  1 */
 
-#define _INITX_C
 #include "openaxiom-c-macros.h"
 
 #include <unistd.h>
@@ -67,18 +66,23 @@
 #include "hyper.h"
 #include "scrollbar.h"
 #include "titlebar.h"
-
-#include "all_hyper_proto.H1"
 #include "util.H1"
 #include "cfuns.h"
-
 #include "spadcolors.h"
-#include "spadcolors.H1"
 
-
 #include "mouse11.bitmap"
 #include "mouse11.mask"
 
+static void get_GCs(HDWindow * window);
+static int get_border_properties(void);
+static int get_color(char * , char * , int, Colormap*);
+static void ingItColors_and_fonts(void);
+static void load_font(XFontStruct * * font_info , char * fontname);
+static void mergeDatabases(void);
+static void open_form_window(void);
+static void open_window(Window w);
+static void set_name_and_icon(void);
+static void set_size_hints(Window w);
 
 static GContext server_font;
 unsigned long *spadColors;
@@ -893,7 +897,7 @@
  */
 
 static int
-get_color(char *name, char *class, int def, Colormap *map)
+get_color(char *name, char *klass, int def, Colormap *map)
 {
     char fullname[256];
     char fullclass[256];
@@ -911,7 +915,7 @@
     strcpy(fullname, "OpenAxiom.hyperdoc.");
     strcat(fullname, name);
     strcpy(fullclass,"OpenAxiom.hyperdoc.");
-    strcat(fullclass,class);
+    strcat(fullclass, klass);
 
     if (XrmGetResource(rDB, fullname, fullclass, str_type, &value) == True) {
         (void) strncpy(prop, value.addr, (int) value.size);

Modified: trunk/src/hyper/initx.h
===================================================================
--- trunk/src/hyper/initx.h	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/initx.h	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -38,6 +38,12 @@
 
 #include "hyper.h"
 
+extern void change_text(int color , XFontStruct * font);
+extern int init_form_window(char * name , int cols);
+extern int init_top_window(char * name);
+extern void initializeWindowSystem(void);
+extern int is_it_850(XFontStruct * fontarg);
+
 extern int gBorderColor;
 
 #endif

Modified: trunk/src/hyper/input.c
===================================================================
--- trunk/src/hyper/input.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/input.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -33,16 +33,13 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#define _INPUT_C
 #include "openaxiom-c-macros.h"
-
 #include "debug.h"
 #include "sockio.h"
 #include "hyper.h"
 
-#include "all_hyper_proto.H1"
+static void clear_rbs(InputBox * list);
 
-
 void
 fill_box(Window w,ImageStruct * image)
 {

Modified: trunk/src/hyper/item.c
===================================================================
--- trunk/src/hyper/item.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/item.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -35,13 +35,10 @@
 
 #include "openaxiom-c-macros.h"
 #include "sockio.h"
-#define _ITEM_C
 #include "debug.h"
 #include "halloc.h"
 #include "extent.h"
 
-#include "all_hyper_proto.H1"
-
 /*
  * Here are structures needed for manipulating the item stack
  */
@@ -92,25 +89,25 @@
 ItemStack *
 copy_item_stack(void)
 {
-    ItemStack *new = NULL;
+    ItemStack *stack = NULL;
     ItemStack *prev = NULL;
     ItemStack *trace = gTopOfItemStack;
     ItemStack *first = NULL;
 
     while (trace) {
-        new = (ItemStack *) halloc(sizeof(ItemStack), "Item stack");
-        new->indent = trace->indent;
-        new->item_indent = trace->item_indent;
-        new->in_item = gInItem;
+        stack = (ItemStack *) halloc(sizeof(ItemStack), "Item stack");
+        stack->indent = trace->indent;
+        stack->item_indent = trace->item_indent;
+        stack->in_item = gInItem;
         if (!first)
-            first = new;
+            first = stack;
         else
-            prev->next = new;
-        prev = new;
+            prev->next = stack;
+        prev = stack;
         trace = trace->next;
     }
-    if (new)
-        new->next = NULL;
+    if (stack)
+        stack->next = NULL;
     return first;
 }
 

Modified: trunk/src/hyper/keyin.c
===================================================================
--- trunk/src/hyper/keyin.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/keyin.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -40,11 +40,10 @@
  * Copyright The Numerical Algorithms Group Limited 1991, 1992, 1993.
  *
  ****************************************************************************/
-#define _KEYIN_C
-#include "openaxiom-c-macros.h"
 
+#include <X11/keysym.h>
+#include "openaxiom-c-macros.h"
 #include "debug.h"
-
 #include "halloc.h"
 #include "sockio.h"
 #include "hyper.h"
@@ -53,10 +52,7 @@
 #include "parse.h"
 #include "scrollbar.h"
 
-#include "all_hyper_proto.H1"
-#include <X11/keysym.h>
 
-
 #define min(x,y)     ( (x<y)?(x):(y))
 
 int in_cursor_height;

Modified: trunk/src/hyper/keyin.h
===================================================================
--- trunk/src/hyper/keyin.h	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/keyin.h	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -36,6 +36,9 @@
 #ifndef _KEYIN_H_
 #define _KEYIN_H_ 1
 
+extern void handle_key(XEvent * event);
+extern void init_keyin(void);
+
 extern int in_cursor_height;
 extern int in_cursor_width;
 extern int out_cursor_height;

Modified: trunk/src/hyper/macro.c
===================================================================
--- trunk/src/hyper/macro.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/macro.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -33,9 +33,7 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#define _MACRO_C
 #include "openaxiom-c-macros.h"
-
 #include "debug.h"
 #include "halloc.h"
 #include "sockio.h"
@@ -43,9 +41,9 @@
 #include "hyper.h"
 #include "lex.h"
 
-#include "all_hyper_proto.H1"
+static char * load_macro(MacroStore * macro);
+static void get_parameter_strings(int number , char * macro_name);
 
-
 /* #define DEBUG 1 */
 
 /*
@@ -178,35 +176,35 @@
 ParameterList
 init_parameter_elem(int number)
 {
-    ParameterList new;
+    ParameterList parms;
     int count;
 
     /** allocate the space neeeded **/
-    new = (ParameterList) halloc(sizeof(struct parameter_list_type),
+    parms = (ParameterList) halloc(sizeof(struct parameter_list_type),
                                  "ParameterList");
     /** now allocate the memeory  for the pointers to the  parameters **/
     if (number) {
-        new->list = (char **) halloc(number * sizeof(char *), "Parameter List");
+        parms->list = (char **) halloc(number * sizeof(char *), "Parameter List");
 
         /** initialize my pointers **/
         for (count = 0; count < number; count++)
-            (new->list)[count] = NULL;
+            (parms->list)[count] = NULL;
     }
-    new->number = number;
-    return new;
+    parms->number = number;
+    return parms;
 }
 
 int
-push_parameters(ParameterList new)
+push_parameters(ParameterList parms)
 {
 
-    if (new == NULL) {
+    if (parms == NULL) {
         fprintf(stderr, "Tried pushing a null list onto the parameter stack\n");
         longjmp(jmpbuf, 1);
     }
 
-    new->next = parameters;
-    parameters = new;
+    parms->next = parameters;
+    parameters = parms;
     return 1;
 }
 int
@@ -291,13 +289,13 @@
     int lbrace_counter;
     char c;
     int size;
-    ParameterList new = init_parameter_elem(number);
+    ParameterList parms = init_parameter_elem(number);
     int pnum;
     char pnum_chars[5];
     int pc;
 
     if (!number) {              /* nothing to be done */
-        push_parameters(new);
+        push_parameters(parms);
         return;
     }
     for (count = 0; count < number; count++) {
@@ -362,10 +360,10 @@
         *buffer_pntr = '\0';
         /*** Now add it to the current parameter list **/
         size = strlen(buffer) + 1;
-        new->list[count] = (char *) halloc(size, "Parameter Strings");
-        strcpy(new->list[count], buffer);
+        parms->list[count] = (char *) halloc(size, "Parameter Strings");
+        strcpy(parms->list[count], buffer);
     }
-    push_parameters(new);
+    push_parameters(parms);
     return ;
 }
 void

Modified: trunk/src/hyper/mem.c
===================================================================
--- trunk/src/hyper/mem.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/mem.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reversed.
 
   Redistribution and use in source and binary forms, with or without
@@ -40,20 +40,27 @@
  * Copyright The Numerical Algorithms Group Limited 1991, 1992, 1993.
  *
  ****************************************************************************/
-#define _MEM_C
 
 #include "debug.h"
-
 #include "halloc.h"
 #include "sockio.h"
 #include "hyper.h"
 #include "group.h"
 #include "event.h"
+#include "parse.h"
 
-#include "all_hyper_proto.H1"
+static void free_cond(CondNode * cond);
+static void free_depend(SpadcomDepend * sd);
+static void free_lines(LineStruct * lines);
+static void dont_free(void * link);
+static void free_if_non_NULL(void * p);
+static void free_input_box(InputBox * box);
+static void free_paste(PasteNode * paste , short des);
+static void free_pastearea(TextNode * node , short des);
+static void free_pastebutton(TextNode * node , short des);
+static void free_radio_boxes(RadioBoxes * radio);
 
 
-
 extern HashTable init_page_hash;
 extern HashTable init_macro_hash;
 extern HashTable init_patch_hash;

Modified: trunk/src/hyper/parse-aux.c
===================================================================
--- trunk/src/hyper/parse-aux.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/parse-aux.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reverved.
 
   Redistribution and use in source and binary forms, with or without
@@ -34,8 +34,6 @@
 */
 
 #include "openaxiom-c-macros.h"
-#define _PARSE_AUX_C
-
 #include "debug.h"
 #include "halloc.h"
 #include "sockio.h"
@@ -44,9 +42,9 @@
 #include "lex.h"
 #include "hyper.h"
 
-#include "all_hyper_proto.H1"
+static void read_ht_file(HashTable * page_hash , HashTable * macro_hash , HashTable * patch_hash , FILE * db_fp , char * db_file);
+static HyperDocPage * make_special_page(int type , char * name);
 
-
 extern int make_input_file;
 extern int gverify_dates;
 

Modified: trunk/src/hyper/parse-input.c
===================================================================
--- trunk/src/hyper/parse-input.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/parse-input.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -34,15 +34,12 @@
 */
 
 #include "openaxiom-c-macros.h"
-#define _PARSE_INPUT_C
 /***
   Contains all the code needed to parse input items,
   InputString
   SimpleBox
   RadioBox.
   ****/
-
-
 #include "debug.h"
 #include "halloc.h"
 #include "sockio.h"
@@ -50,7 +47,9 @@
 #include "lex.h"
 #include "hyper.h"
 
-#include "all_hyper_proto.H1"
+static void insert_item(InputItem * item);
+static void add_box_to_rb_list(char * name , InputBox * box);
+static int check_others(InputBox * list);
 
 /* create an unmapped input window for getting strings * */
 extern int make_input_file;

Modified: trunk/src/hyper/parse-paste.c
===================================================================
--- trunk/src/hyper/parse-paste.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/parse-paste.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -40,11 +40,9 @@
  * Copyright The Numerical Algorithms Group Limited 1991, 1992, 1993.
  *
  ****************************************************************************/
-#define _PARSE_PASTE_C
-#include "openaxiom-c-macros.h"
 
+#include "openaxiom-c-macros.h"
 #include "debug.h"
-
 #include "halloc.h"
 #include "sockio.h"
 #include "parse.h"
@@ -53,9 +51,8 @@
 #include "group.h"
 #include "lex.h"
 
-#include "all_hyper_proto.H1"
+static void load_patch(PatchStore * patch);
 
-
 short int gInPaste;
 
 
@@ -212,11 +209,11 @@
 HyperDocPage *
 parse_patch(PasteNode *paste)
 {
-    TextNode *new;
+    TextNode *new_paste;
     TextNode *end_node;
     TextNode *begin_node;
     TextNode *arg_node;
-    TextNode *throw;
+    TextNode *old;
     TextNode *next_node;
     InputItem *paste_item = paste->paste_item;
     int where = paste->where;
@@ -231,7 +228,7 @@
     next_node = end_node->next;
     begin_node = paste->begin_node;
     arg_node = paste->arg_node;
-    throw = begin_node->next;
+    old = begin_node->next;
 
     /* now read the new stuff and add it in between all this stuff */
 
@@ -289,7 +286,7 @@
 
 
     end_node->next = 0;
-    free_node(throw, 1);
+    free_node(old, 1);
 
     init_parse_patch(gWindow->page);
     init_paste_item(paste_item);
@@ -324,14 +321,14 @@
             jump();
         }
     }
-    new = alloc_node();
-    curr_node = new;
+    new_paste = alloc_node();
+    curr_node = new_paste;
     parse_HyperDoc();
 
     /* Once I am back, I need only reallign all the text structures */
     curr_node->type = openaxiom_Noop_token;
     curr_node->next = next_node;
-    begin_node->next = new;
+    begin_node->next = new_paste;
     begin_node->type = openaxiom_Noop_token;
     free(begin_node->data.text);
     begin_node->data.text = 0;

Modified: trunk/src/hyper/parse-paste.h
===================================================================
--- trunk/src/hyper/parse-paste.h	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/parse-paste.h	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyirght (C) 2007-2008, Gabriel Dos Reis.
+  Copyirght (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,10 @@
 #include "openaxiom-c-macros.h"
 #include "hyper.h"
 
+extern void parse_paste(void);
+extern void parse_pastebutton(void);
+extern HyperDocPage * parse_patch(PasteNode * paste);
+
 extern short int gInPaste;
 
 #endif

Modified: trunk/src/hyper/parse-types.c
===================================================================
--- trunk/src/hyper/parse-types.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/parse-types.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -40,9 +40,8 @@
  * Copyright The Numerical Algorithms Group Limited 1991, 1992, 1993.
  *
  ****************************************************************************/
-#define _PARSE_TYPES_C
+
 #include "openaxiom-c-macros.h"
-
 #include "debug.h"
 #include "halloc.h"
 #include "sockio.h"
@@ -53,7 +52,8 @@
 #include "extent.h"
 #include "cfuns.h"
 
-#include "all_hyper_proto.H1"
+static void parse_condnode(void );
+static void parse_hasreturnto(void );
 
 boolean gInButton = FALSE;
 boolean gInIf = FALSE;

Modified: trunk/src/hyper/parse-types.h
===================================================================
--- trunk/src/hyper/parse-types.h	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/parse-types.h	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -38,6 +38,29 @@
 
 #include "hyper.h"
 
+extern void parse_begin_items(void );
+extern void parse_box(void );
+extern void parse_button(void );
+extern void parse_centerline(void );
+extern void parse_command(void );
+extern void parse_env(TextNode * node);
+extern void parse_free(void );
+extern void parse_help(void );
+extern void parse_ifcond(void );
+extern void parse_input_pix(void );
+extern void parse_item(void );
+extern void parse_mbox(void );
+extern void parse_mitem(void );
+extern void parse_newcond(void );
+extern void parse_setcond(void );
+extern void parse_spadcommand(TextNode * spad_node);
+extern void parse_spadsrc(TextNode * spad_node);
+extern void parse_table(void );
+extern void parse_value1(void );
+extern void parse_value2(void );
+extern void parse_verbatim(int type);
+extern void show_text(TextNode * node , int Ender);
+
 extern boolean gInButton;
 extern boolean gInIf;
 extern boolean gInItems;

Modified: trunk/src/hyper/parse.c
===================================================================
--- trunk/src/hyper/parse.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/parse.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,6 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#define _PARSE_C
-
 #include "debug.h"
 #include "halloc.h"
 #include "sockio.h"
@@ -50,10 +48,19 @@
 #include "scrollbar.h"
 #include "titlebar.h"
 
-#include "all_hyper_proto.H1"
+static void end_a_page(void );
+static HyperDocPage * format_page(UnloadedPage * ulpage);
+static void parse_page(HyperDocPage * page);
+static void parse_replacepage(void );
+static void start_footer(void );
+static void start_scrolling(void );
+static void Push_MR(void );
+static void Pop_MR(void );
+static void parse_title(HyperDocPage * page);
+static void parse_header(HyperDocPage * page);
+static void init_parse_page(HyperDocPage * page);
 
 
-
 TextNode *curr_node;            /* current node being parsed. It is to be the
                                  * next one filled   */
 HashTable *gLinkHashTable;           /* the hash table of active link windows   */

Modified: trunk/src/hyper/parse.h
===================================================================
--- trunk/src/hyper/parse.h	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/parse.h	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -50,6 +50,46 @@
 
 #include <setjmp.h>
 
+extern void display_page(HyperDocPage * page);
+extern void init_parse_patch(HyperDocPage * page);
+extern void load_page(HyperDocPage * page);
+extern void parse_HyperDoc(void );
+extern void parse_from_string(char * str);
+extern HyperDocPage * parse_page_from_socket(void );
+extern HyperDocPage * parse_page_from_unixfd(void );
+extern HyperLink * make_input_window(InputItem * item);
+extern HyperLink * make_box_window(InputBox * box , int type);
+extern void initialize_default(InputItem * item , char * buff);
+extern void parse_inputstring(void);
+extern void parse_simplebox(void);
+extern void parse_radiobox(void);
+extern void init_paste_item(InputItem * item);
+extern void repaste_item(void);
+extern InputItem * current_item(void);
+extern int already_there(char * name);
+extern void parse_radioboxes(void);
+extern void add_dependencies(void );
+extern FILE * find_fp(FilePosition fp);
+extern char * get_input_string(void );
+extern HyperLink * make_link_window(TextNode * link_node , int type , int isSubWin);
+extern HyperLink * make_paste_window(PasteNode * paste);
+extern void make_special_pages(HashTable * pageHashTable);
+extern int window_code(Window * w , int size);
+extern int window_equal(Window * w1 , Window * w2);
+extern char * window_id(Window w);
+extern void read_ht_db(HashTable * page_hash , HashTable * macro_hash , HashTable * patch_hash);
+extern int get_filename(void);
+extern int is_number(char * str);
+extern void parser_error(char * str);
+extern int get_where(void);
+extern void scan_HyperDoc(void);
+extern int number(char * str);
+extern ParameterList init_parameter_elem(int number);
+extern int push_parameters(ParameterList);
+extern int pop_parameters(void);
+extern int parse_macro(void);
+extern void parse_parameters(void);
+
 extern jmp_buf  jmpbuf;
 extern int      vbuff;
 

Modified: trunk/src/hyper/scrollbar.c
===================================================================
--- trunk/src/hyper/scrollbar.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/scrollbar.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -40,9 +40,8 @@
  * Copyright The Numerical Algorithms Group Limited 1991, 1992, 1993.
  *
  ****************************************************************************/
-#define _SCROLLBAR_C
+
 #include "openaxiom-c-macros.h"
-
 #include "debug.h"
 #include "halloc.h"
 #include "sockio.h"
@@ -53,8 +52,6 @@
 #include "scrollbar.h"
 #include "parse.h"
 
-#include "all_hyper_proto.H1"
-
 /*************************************************************************
   Scrollbar Comments                                    10/08/89
 
@@ -95,6 +92,10 @@
 
   **************************************************************************/
 
+static int ch(int height);
+static void changeWindowBackgroundPixmap(Window window , Pixmap pixmap);
+static void drawScroller3DEffects(HDWindow * hdWindow , int x1 , int y1 , int x2 , int y2);
+
 static int  ch(int height);
 static void changeWindowBackgroundPixmap(Window window, Pixmap pixmap);
 

Modified: trunk/src/hyper/scrollbar.h
===================================================================
--- trunk/src/hyper/scrollbar.h	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/scrollbar.h	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -38,6 +38,21 @@
 
 #include "hyper.h"
 
+extern void calculateScrollBarMeasures(void );
+extern void drawScrollLines(void );
+extern void hideScrollBars(HDWindow * hdWindow);
+extern void getScrollBarMinimumSize(int * width , int * height);
+extern void linkScrollBars(void );
+extern void makeScrollBarWindows(void );
+extern void moveScroller(HDWindow * hdWindow);
+extern void scrollDown(void );
+extern void scrollDownPage(void );
+extern void scrollScroller(XButtonEvent * event);
+extern void scrollToFirstPage(void );
+extern void scrollUp(void );
+extern void scrollUpPage(void );
+extern void showScrollBars(HDWindow * hdWindow);
+
 extern int  gScrollbarWidth;
 
 #endif

Modified: trunk/src/hyper/show-types.c
===================================================================
--- trunk/src/hyper/show-types.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/show-types.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
-  Copyright (C) 2007-2008, Gabriel Dos Reis.
+  Copyright (C) 2007-2010, Gabriel Dos Reis.
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -40,21 +40,24 @@
  * Copyright The Numerical Algorithms Group Limited 1991, 1992, 1993.
  *
  ****************************************************************************/
-#define _SHOW_TYPES_C
+
 #include "openaxiom-c-macros.h"
-
 #include "debug.h"
-
 #include "sockio.h"
 #include "hyper.h"
 #include "display.h"
 #include "extent.h"
 #include "group.h"
 
-#include "all_hyper_proto.H1"
+static void show_image(TextNode * node , GC gc);
+static void show_input(TextNode * node);
+static void show_link(TextNode * node);
+static void show_paste(TextNode * node);
+static void show_pastebutton(TextNode * node);
+static void show_simple_box(TextNode * node);
+static void show_spadcommand(TextNode * node);
 
 
-
 /*
  * Display the page whose extent has been computed, using the actual size of
  * the window, and y_off to determine clipped areas

Modified: trunk/src/hyper/spadint.c
===================================================================
--- trunk/src/hyper/spadint.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/spadint.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
    Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
    All rights reserved.
-   Copyright (C) 2007-2008, Gabriel Dos Reis.
+   Copyright (C) 2007-2010, Gabriel Dos Reis.
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
@@ -36,22 +36,26 @@
 /* Still a problem with close_client */
 
 /* Communication interface for external OpenAxiom buffers */
-#define _SPADINT_C
 
 #include "open-axiom.h"
 #include "debug.h"
-
 #include <signal.h>
 #include "halloc.h"
 #include "sockio.h"
 #include "hyper.h"
 #include "parse.h"
 #include "bsdsignal.h"
-
-#include "all_hyper_proto.H1"
 #include "sockio.h"
 #include "cfuns.h"
 
+static void start_user_buffer(HyperDocPage * page);
+static void clear_execution_marks(HashTable * depend_hash);
+static void issue_dependent_commands(HyperDocPage * page , TextNode * command , int type);
+static void send_pile(openaxiom_sio * sock , char * str);
+static void mark_as_executed(HyperDocPage * page , TextNode * command , int type);
+static void accept_menu_server_connection(HyperDocPage * page);
+static void switch_frames(void );
+static void close_client(int pid);
 
 typedef struct sock_list {      /* linked list of openaxiom_sio */
     openaxiom_sio Socket;
@@ -59,9 +63,7 @@
 }   Sock_List;
 
 Sock_List *plSock = (Sock_List *) 0;
-openaxiom_sio *spad_socket = (openaxiom_sio *) 0; /* to_server socket for SpadServer */
 
-
 /* connect to OpenAxiom , return 0 if succesful, 1 if not */
 int
 connect_spad(void)

Modified: trunk/src/hyper/titlebar.c
===================================================================
--- trunk/src/hyper/titlebar.c	2010-07-29 15:43:35 UTC (rev 1727)
+++ trunk/src/hyper/titlebar.c	2010-07-29 19:52:43 UTC (rev 1728)
@@ -1,7 +1,7 @@
 /*
    Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
    All rights reserved.
-   Copyright (C) 2007-2008, Gabriel Dos Reis.
+   Copyright (C) 2007-2010, Gabriel Dos Reis.
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
@@ -40,13 +40,10 @@
  * Copyright The Numerical Algorithms Group Limited 1991, 1992, 1993.
  *
  ****************************************************************************/
-#define _TITLEBAR_C
-#include "openaxiom-c-macros.h"
 
-#include "debug.h"
-
 #include <stdlib.h>
-
+#include "openaxiom-c-macros.h"
+#include "debug.h"
 #include "halloc.h"
 #include "sockio.h"
 #include "titlebar.h"
@@ -55,8 +52,9 @@

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1718
          http://open-axiom.svn.sourceforge.net/open-axiom/?rev=1718&view=rev
Author:   yueli
Date:     2010-07-27 15:18:41 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
sync with mainline

Modified Paths:
--------------
    yli-sandbox/src/ChangeLog
    yli-sandbox/src/interp/c-util.boot
    yli-sandbox/src/interp/compiler.boot
    yli-sandbox/src/interp/define.boot
    yli-sandbox/src/interp/g-opt.boot
    yli-sandbox/src/interp/g-util.boot
    yli-sandbox/src/interp/types.boot

Property Changed:
----------------
    yli-sandbox/


Property changes on: yli-sandbox
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:1376-1713
   + /trunk:1376-1717

Modified: yli-sandbox/src/ChangeLog
===================================================================
--- yli-sandbox/src/ChangeLog	2010-07-27 14:42:33 UTC (rev 1717)
+++ yli-sandbox/src/ChangeLog	2010-07-27 15:18:41 UTC (rev 1718)
@@ -1,5 +1,16 @@
+2010-07-27  Gabriel Dos Reis  <gdr@...>
+
+	* interp/types.boot (%Code): Include %Char.
+	* interp/c-util.boot (middleEndExpand): Temporarilty Comment out
+	signature.
+
 2010-07-26  Gabriel Dos Reis  <gdr@...>
 
+	* interp/g-opt.boot (optCond): Work harder at denesting nested
+	if-expressions. 
+
+2010-07-26  Gabriel Dos Reis  <gdr@...>
+
 	* interp/g-opt.boot ($VMsideEffectFreeOperators): Include new
 	opcodes %icst0,	%icst1, %when, and %ccst.
 	* interp/g-util.boot: Expand %ccst.

Modified: yli-sandbox/src/interp/c-util.boot
===================================================================
--- yli-sandbox/src/interp/c-util.boot	2010-07-27 14:42:33 UTC (rev 1717)
+++ yli-sandbox/src/interp/c-util.boot	2010-07-27 15:18:41 UTC (rev 1718)
@@ -168,7 +168,7 @@
 ++ that are unused.
 declareUnusedParameters x == (augment x; x) where
   augment x == 
-    isAtomicForm x => nil
+    atomic? x => nil
     x is [op,parms,body] and op in $AbstractionOperator =>
       augment body
       unused := [p for p in parms | not usedSymbol?(p,body)]
@@ -1092,11 +1092,11 @@
 $middleEndMacroList == 
   '(COLLECT REPEAT SUCHTHATCLAUSE THETA THETA1 SPADREDUCE SPADDO)
 
-middleEndExpand: %Form -> %Form
+--middleEndExpand: %Form -> %Code
 middleEndExpand x ==
   x = '%false or x = '%nil => 'NIL
   IDENTP x and (x' := x has %Rename) => x'
-  isAtomicForm x => x
+  atomic? x => x
   [op,:args] := x
   IDENTP op and (fun := getOpcodeExpander op) =>
     middleEndExpand apply(fun,x,nil)
@@ -1135,7 +1135,7 @@
 
 ++ Walk `form' and replace simple functions as appropriate.
 replaceSimpleFunctions form ==
-  isAtomicForm form => form
+  atomic? form => form
   form is ["COND",:body] =>
     mutateCONDFormWithUnaryFunction(form,"replaceSimpleFunctions")
   form is ["LET",:.] =>
@@ -1145,7 +1145,7 @@
     -- Conservatively preserve object identity and storage 
     -- consumption by not folding non-atomic constant forms.
     getFunctionReplacement op isnt ['XLAM,=nil,body] => form
-    isAtomicForm body or isVMConstantForm body => body
+    atomic? body or isVMConstantForm body => body
     form
   -- 1. process argument first.
   for args in tails rest form repeat
@@ -1167,7 +1167,7 @@
       -- Identity function toos.
       parms is [=body] => first args
       -- conservatively approximate eager semantics
-      and/[isAtomicForm first as for as in tails args] =>
+      and/[atomic? first as for as in tails args] =>
         -- alpha rename before substitution.
 	newparms := [gensym() for p in parms]
 	body := eqSubstAndCopy(newparms,parms,body)
@@ -1190,7 +1190,7 @@
 
 ++ Return true if `form' has a linear usage of all variables in `vars'.
 usesVariablesLinearly?(form,vars) ==
-  isAtomicForm form => true
+  atomic? form => true
   and/[numOfOccurencesOf(var,form) < 2 for var in vars] 
 
 ++ We are processing a function definition with parameter list `vars'
@@ -1208,10 +1208,10 @@
     -- FIXME: This should be done only for constant creators.
     null vars' => semiSimpleRelativeTo?(body,$VMsideEffectFreeOperators)
 
-    isAtomicForm body => true
+    atomic? body => true
     [op,:args] := body
     not IDENTP op => false
-    and/[isAtomicForm x for x in args] 
+    and/[atomic? x for x in args] 
       or semiSimpleRelativeTo?(body,$simpleVMoperators) =>
                 usesVariablesLinearly?(body,vars')
     false
@@ -1224,7 +1224,7 @@
 ++ domain.  Conditional operations are not folded.
 foldSpadcall: %Form -> %Form
 foldSpadcall form ==
-  isAtomicForm form => form           -- leave atomic forms alone
+  atomic? form => form           -- leave atomic forms alone
   form is ["DECLARE",:.] => form      -- don't walk declarations
   form is ["LET",inits,:body] =>
     mutateLETFormWithUnaryFunction(form,"foldSpadcall")
@@ -1321,7 +1321,7 @@
 
 backendCompileNEWNAM: %Form -> %Void
 backendCompileNEWNAM x ==
-  isAtomicForm x => nil
+  atomic? x => nil
   atom(y := first x) =>
     backendCompileNEWNAM rest x
     if y = "CLOSEDFN" then
@@ -1422,7 +1422,7 @@
 backendFluidize x ==
   IDENTP x and x ~= "$" and x ~= "$$" and
     (PNAME x).0 = char "$" and not digit?((PNAME x).1) => x
-  isAtomicForm x => nil
+  atomic? x => nil
   first x = "FLUID" => second x
   a := backendFluidize first x
   b := backendFluidize rest x
@@ -1519,10 +1519,10 @@
 --%
 
 ++ Replace every middle end sub-forms in `x' with Lisp code.
-mutateToBackendCode: %Form -> %Void
-mutateToBackendCode x ==
+massageBackendCode: %Code -> %Void
+massageBackendCode x ==
   IDENTP x and isLispSpecialVariable x => noteSpecialVariable x
-  isAtomicForm x => nil
+  atomic? x => nil
   -- temporarily have TRACELET report MAKEPROPs.
   if (u := first x) = "MAKEPROP" and $TRACELETFLAG then
     x.first := "MAKEPROP-SAY"
@@ -1533,7 +1533,7 @@
         x.first := "LETT"
       $TRACELETFLAG => x.first := "/TRACE-LET"
       u = "%LET" => x.first := "SPADLET"
-    mutateToBackendCode CDDR x
+    massageBackendCode CDDR x
     if not (u in '(SETQ RELET)) then
       IDENTP second x => pushLocalVariable second x
       second x is ["FLUID",:.] =>
@@ -1542,15 +1542,15 @@
       MAPC(function pushLocalVariable, LISTOFATOMS second x)
   IDENTP u and GET(u,"ILAM") ~= nil =>
     x.first := eval u
-    mutateToBackendCode x
+    massageBackendCode x
   u in '(LET LET_*) =>
     oldVars := $LocalVars
     vars := nil
     for [var,init] in second x repeat
-      mutateToBackendCode init
+      massageBackendCode init
       $LocalVars := [var,:$LocalVars]
       vars := [var,:vars]
-    mutateToBackendCode x.rest.rest
+    massageBackendCode x.rest.rest
     newVars := setDifference($LocalVars,setUnion(vars,oldVars))
     $LocalVars := setUnion(oldVars,newVars)
   u in '(PROG LAMBDA) =>
@@ -1559,13 +1559,13 @@
       not (y in $LocalVars) =>
         $LocalVars := [y,:$LocalVars]
         newBindings := [y,:newBindings]
-    res := mutateToBackendCode CDDR x
+    res := massageBackendCode CDDR x
     $LocalVars := REMOVE_-IF(function (y +-> y in newBindings), 
                      $LocalVars)
     [u,second x,:res]
   u = "DECLARE" => nil       -- there is nothing to do convert there
-  mutateToBackendCode u
-  mutateToBackendCode rest x
+  massageBackendCode u
+  massageBackendCode rest x
 
 
 skipDeclarations: %List -> %List
@@ -1587,7 +1587,7 @@
   ["DECLARE",["SPECIAL",:vars]]
 
 simplifySEQ form ==
-  isAtomicForm form => form
+  atomic? form => form
   form is ["SEQ",[op,a]] and op in '(EXIT RETURN) => simplifySEQ a
   for stmts in tails form repeat
     stmts.first := simplifySEQ first stmts
@@ -1596,7 +1596,7 @@
 ++ Return true if the Lisp `form' has a `RETURN' form
 ++ that needs to be enclosed in a `PROG' form.
 needsPROG? form ==
-  isAtomicForm form => false
+  atomic? form => false
   op := form.op
   op = 'RETURN => true
   op in '(LOOP PROG) => false
@@ -1611,7 +1611,7 @@
   $LocalVars: fluid := nil
   $SpecialVars: fluid := nil
   x := middleEndExpand x
-  mutateToBackendCode CDDR x
+  massageBackendCode CDDR x
   body := skipDeclarations CDDR x
   -- Make it explicitly a sequence of statements if it is not a one liner.
   body := 

Modified: yli-sandbox/src/interp/compiler.boot
===================================================================
--- yli-sandbox/src/interp/compiler.boot	2010-07-27 14:42:33 UTC (rev 1717)
+++ yli-sandbox/src/interp/compiler.boot	2010-07-27 15:18:41 UTC (rev 1718)
@@ -1048,7 +1048,7 @@
 replaceExitEtc(x,tag,opFlag,opMode) ==
   (fn(x,tag,opFlag,opMode); x) where
     fn(x,tag,opFlag,opMode) ==
-      isAtomicForm x => nil
+      atomic? x => nil
       x is [ =opFlag,n,t] =>
         second(x.args).expr :=
           replaceExitEtc(second(x.args).expr,tag,opFlag,opMode)
@@ -2292,7 +2292,7 @@
     containsNonLocalControl?(body,nil) => systemErrorHere ['massageLoop,x]
     ['CATCH,tag,['%loop,:iters,body,'%nil]]
   replaceThrowWithLeave(x,tag) ==
-    isAtomicForm x => nil
+    atomic? x => nil
     x is ['THROW,=tag,expr] =>
       replaceThrowWithLeave(expr,tag)
       -- Avoid redudant THROW for return-expressions.
@@ -2304,7 +2304,7 @@
         x.args := rest x.args
     for x' in x repeat replaceThrowWithLeave(x',tag)
   containsNonLocalControl?(x,tags) ==
-    isAtomicForm x => false
+    atomic? x => false
     x is ['THROW,tag,x'] =>
       not(tag in tags) or containsNonLocalControl?(x',tags)
     x is ['CATCH,tag,x'] =>

Modified: yli-sandbox/src/interp/define.boot
===================================================================
--- yli-sandbox/src/interp/define.boot	2010-07-27 14:42:33 UTC (rev 1717)
+++ yli-sandbox/src/interp/define.boot	2010-07-27 15:18:41 UTC (rev 1718)
@@ -587,7 +587,7 @@
   IDENTP m and assoc(m,$whereDecls) =>
     get(m,'value,e) => nil  -- parameter was given value
     [[m,:reverse path],:typeDependencyPath(getmode(m,e),path,e)]
-  isAtomicForm m => nil
+  atomic? m => nil
   [ctor,:args] := m
   -- We don't expect implicit parameters in builtin constructors.
   ctor in $BuiltinConstructorNames => nil

Modified: yli-sandbox/src/interp/g-opt.boot
===================================================================
--- yli-sandbox/src/interp/g-opt.boot	2010-07-27 14:42:33 UTC (rev 1717)
+++ yli-sandbox/src/interp/g-opt.boot	2010-07-27 15:18:41 UTC (rev 1718)
@@ -70,7 +70,7 @@
 ++ updated as opposed to being defined. `vars' is the list of
 ++ all variable definitions in scope.
 changeVariableDefinitionToStore(form,vars) ==
-  isAtomicForm form => nil
+  atomic? form => nil
   form is ['%LET,v,expr] =>
     changeVariableDefinitionToStore(expr,vars)
     if v in vars then form.op := '%store
@@ -81,7 +81,7 @@
 
 ++ Return true if `x' contains control transfer to a point outside itself.
 jumpToToplevel? x ==
-  isAtomicForm x => false
+  atomic? x => false
   op := x.op
   op = 'SEQ => CONTAINED('THROW,x.args)
   op in '(EXIT THROW %leave) => true
@@ -94,7 +94,7 @@
 ++ Turns `form' into a `%bind'-expression if it starts with a
 ++ a sequence of first-time variable definitions.
 groupVariableDefinitions form ==
-  isAtomicForm form => form
+  atomic? form => form
   form isnt ['SEQ,:stmts,['EXIT,val]] => form
   defs := nil
   for x in stmts while singleAssignment? x  repeat
@@ -149,7 +149,7 @@
 simplifyVMForm x ==
   x = '%icst0 => 0
   x = '%icst1 => 1
-  isAtomicForm x => x
+  atomic? x => x
   x.op = 'CLOSEDFN => x
   atom x.op =>
     x is [op,vars,body] and op in $AbstractionOperator =>
@@ -195,7 +195,7 @@
 ++ out of the function body anyway.  Similarly, transform
 ++ reudant `(THROW tag (THROW tag expr))' to `(THROW tag expr)'.
 removeNeedlessThrow x ==
-  isAtomicForm x => x
+  atomic? x => x
   x is ['THROW,.,y] and y is ['%return,:.] =>
     removeNeedlessThrow third y
     x.op := y.op
@@ -301,23 +301,22 @@
   ["VECTOR",:u]
  
 optCond (x is ['COND,:l]) ==
-  if l is [a,[aa,b]] and aa = '%true and b is ["COND",:c] then
+  if l is [a,[aa,b]] and aa = '%true and b is ['COND,:c] then
     x.rest.rest := c
   if l is [[p1,:c1],[p2,:c2],:.] then
     if (p1 is ['%not,=p2]) or (p2 is ['%not,=p1]) then
       l:=[[p1,:c1],['%true,:c2]]
       x.rest := l
     c1 is ['NIL] and p2 = '%true and first c2 = '%true =>
-      p1 is ['%not,p1']=> return p1'
-      return ['%not,p1]
+      return optNot ['%not,p1]
   l is [[p1,:c1],[p2,:c2],[p3,:c3]] and p3 = '%true =>
     EqualBarGensym(c1,c3) =>
-      ["COND",[['%or,p1,['%not,p2]],:c1],['%true,:c2]]
-    EqualBarGensym(c1,c2) => ["COND",[['%or,p1,p2],:c1],['%true,:c3]]
+      optCond ['COND,[['%or,p1,['%not,p2]],:c1],['%true,:c2]]
+    EqualBarGensym(c1,c2) => optCond ['COND,[['%or,p1,p2],:c1],['%true,:c3]]
     x
   for y in tails l repeat
     while y is [[a1,c1],[a2,c2],:y'] and EqualBarGensym(c1,c2) repeat
-      a:=['%or,a1,a2]
+      a := ['%or,a1,a2]
       first(y).first := a
       y.rest := y'
   x
@@ -372,14 +371,14 @@
 replaceableTemporary?(g,x) ==
   GENSYMP g and numOfOccurencesOf(g,x) < 2 and not jumpTarget?(g,x) where
     jumpTarget?(g,x) ==
-      isAtomicForm x => false
+      atomic? x => false
       x is ['GO,=g] => true
       or/[jumpTarget?(g,x') for x' in x]
 
 optSEQ ["SEQ",:l] ==
   tryToRemoveSEQ SEQToCOND getRidOfTemps splicePROGN l where
     splicePROGN l ==
-      isAtomicForm l => l
+      atomic? l => l
       l is [["PROGN",:stmts],:l'] => [:stmts,:l']
       l.rest := splicePROGN rest l
     getRidOfTemps l ==
@@ -460,7 +459,7 @@
 ++ Return true if the `form' is semi-simple with respect to
 ++ to the list of operators `ops'.
 semiSimpleRelativeTo?(form,ops) ==
-  isAtomicForm form => true
+  atomic? form => true
   form isnt [op,:args] or not MEMQ(op,ops) => false
   and/[semiSimpleRelativeTo?(f,ops) for f in args]
 
@@ -501,7 +500,7 @@
 ++ Return true is `var' is the left hand side of an assignment
 ++ in `form'.
 varIsAssigned(var,form) ==
-  isAtomicForm form => false
+  atomic? form => false
   form is [op,=var,:.] and op in '(%LET LETT SETQ %store) => true
   or/[varIsAssigned(var,f) for f in form]
 
@@ -559,7 +558,7 @@
     continue => body
     u
   not MEMQ(op,$simpleVMoperators) => u
-  not(and/[isAtomicForm arg for arg in args]) => u
+  not(and/[atomic? arg for arg in args]) => u
   -- Inline only if all parameters are used.  Get cute later.
   not(and/[MEMQ(x,args) for [x,.] in inits]) => u
   -- Munge inits into list of dotted-pairs.  Lovely Lisp.

Modified: yli-sandbox/src/interp/g-util.boot
===================================================================
--- yli-sandbox/src/interp/g-util.boot	2010-07-27 14:42:33 UTC (rev 1717)
+++ yli-sandbox/src/interp/g-util.boot	2010-07-27 15:18:41 UTC (rev 1718)
@@ -38,7 +38,7 @@
 namespace BOOT
 
 module g_-util where
-  isAtomicForm: %Form -> %Boolean
+  atomic?: %Thing -> %Boolean
   getTypeOfSyntax: %Form -> %Mode
   pairList: (%List,%List) -> %List
   mkList: %List -> %List
@@ -145,13 +145,13 @@
   final := middleEndExpand final
   loopvar := [[id,lo]]
   inc :=
-    isAtomicForm step => step
+    atomic? step => step
     g1 := gensym()
     loopvar := [:loopvar,[g1,step]]
     g1
   final :=
     atom final => final
-    final is [hi] and isAtomicForm hi => hi
+    final is [hi] and atomic? hi => hi
     g2 := gensym()
     loopvar := [:loopvar,[g2,:final]]
     g2
@@ -492,7 +492,7 @@
 expandToVMForm x ==
   x = '%false or x = '%nil => 'NIL
   IDENTP x and (x' := x has %Rename) => x'
-  isAtomicForm x => x
+  atomic? x => x
   [op,:args] := x
   IDENTP op and (fun:= getOpcodeExpander op) => apply(fun,x,nil)
   op' := expandToVMForm op
@@ -530,9 +530,9 @@
     ok := digit? d => c := 10*c + DIG2FIX d
   if ok then c else nil
 
-++ Returns true if `form' is either an atom or a quotation.
-isAtomicForm form ==
-  atom form or first form = "QUOTE"
+++ Returns true if `x' is either an atom or a quotation.
+atomic? x ==
+  not cons? x or x.op = 'QUOTE
 
 
 --% Sub-domains information handlers

Modified: yli-sandbox/src/interp/types.boot
===================================================================
--- yli-sandbox/src/interp/types.boot	2010-07-27 14:42:33 UTC (rev 1717)
+++ yli-sandbox/src/interp/types.boot	2010-07-27 15:18:41 UTC (rev 1718)
@@ -129,7 +129,7 @@
 %Instantiation <=> [%Constructor,:%Form]       -- constructor instance
 %Env <=> %List                                 -- compiling env
 %Mode <=> %Symbol or %String or %List          -- type of forms
-%Code <=> %Form                                -- generated code
+%Code <=> %Form or %Char                       -- generated code
 %Triple <=>                                    -- form + type + env
   [%Code,:[%Mode,:[%Env,:null]]]
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.