diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-05-05 13:56:53 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-05-05 13:56:53 +0000 |
| commit | de2c2df64f452b8b50f94ebc1aec30830b6cc1e0 (patch) | |
| tree | fb54894ac4696bd2ffca55ee049b2bc98ca745c6 /src/algebra | |
| parent | b380d201d353795ee450ac686132f2849db08b88 (diff) | |
| download | open-axiom-de2c2df64f452b8b50f94ebc1aec30830b6cc1e0.tar.gz | |
* interp/compiler.boot (compSetq1): Call self, not compSetq.
* interp/c-util.boot (isAtomicForm): Move to g-util.boot.
* interp/g-opt.boot (optSEQ): Splice toplevel PROGN forms.
* interp/g-util.boot (isAtomicForm): Move from c-util.boot. Export.
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/strap/DFLOAT.lsp | 66 | ||||
| -rw-r--r-- | src/algebra/strap/EUCDOM-.lsp | 30 |
2 files changed, 43 insertions, 53 deletions
diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index 5609b7fc..776ae048 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -736,14 +736,13 @@ #0=#:G1538 |#G111| |#G112| |p0| |p1| |#G113| |#G114| |q0| |q1| |#G115| |#G116| |s| |t|) (RETURN - (SEQ (EXIT (SEQ (PROGN - (LETT |#G109| (|DFLOAT;manexp| |f| $) - |DFLOAT;rationalApproximation;$2NniF;87|) - (LETT |nu| (QCAR |#G109|) - |DFLOAT;rationalApproximation;$2NniF;87|) - (LETT |ex| (QCDR |#G109|) - |DFLOAT;rationalApproximation;$2NniF;87|) - |#G109|) + (SEQ (EXIT (SEQ (LETT |#G109| (|DFLOAT;manexp| |f| $) + |DFLOAT;rationalApproximation;$2NniF;87|) + (LETT |nu| (QCAR |#G109|) + |DFLOAT;rationalApproximation;$2NniF;87|) + (LETT |ex| (QCDR |#G109|) + |DFLOAT;rationalApproximation;$2NniF;87|) + |#G109| (LETT BASE (FLOAT-RADIX 0.0) |DFLOAT;rationalApproximation;$2NniF;87|) (EXIT (COND @@ -784,15 +783,14 @@ (EXIT (SEQ G190 NIL (SEQ - (PROGN - (LETT |#G110| - (DIVIDE2 |s| |t|) - |DFLOAT;rationalApproximation;$2NniF;87|) - (LETT |q| (QCAR |#G110|) - |DFLOAT;rationalApproximation;$2NniF;87|) - (LETT |r| (QCDR |#G110|) - |DFLOAT;rationalApproximation;$2NniF;87|) - |#G110|) + (LETT |#G110| + (DIVIDE2 |s| |t|) + |DFLOAT;rationalApproximation;$2NniF;87|) + (LETT |q| (QCAR |#G110|) + |DFLOAT;rationalApproximation;$2NniF;87|) + (LETT |r| (QCDR |#G110|) + |DFLOAT;rationalApproximation;$2NniF;87|) + |#G110| (LETT |p2| (+ (* |q| |p1|) |p0|) |DFLOAT;rationalApproximation;$2NniF;87|) @@ -817,24 +815,22 @@ 143)) |DFLOAT;rationalApproximation;$2NniF;87|) (GO #0#))))) - (PROGN - (LETT |#G111| |p1| - |DFLOAT;rationalApproximation;$2NniF;87|) - (LETT |#G112| |p2| - |DFLOAT;rationalApproximation;$2NniF;87|) - (LETT |p0| |#G111| - |DFLOAT;rationalApproximation;$2NniF;87|) - (LETT |p1| |#G112| - |DFLOAT;rationalApproximation;$2NniF;87|)) - (PROGN - (LETT |#G113| |q1| - |DFLOAT;rationalApproximation;$2NniF;87|) - (LETT |#G114| |q2| - |DFLOAT;rationalApproximation;$2NniF;87|) - (LETT |q0| |#G113| - |DFLOAT;rationalApproximation;$2NniF;87|) - (LETT |q1| |#G114| - |DFLOAT;rationalApproximation;$2NniF;87|)) + (LETT |#G111| |p1| + |DFLOAT;rationalApproximation;$2NniF;87|) + (LETT |#G112| |p2| + |DFLOAT;rationalApproximation;$2NniF;87|) + (LETT |p0| |#G111| + |DFLOAT;rationalApproximation;$2NniF;87|) + (LETT |p1| |#G112| + |DFLOAT;rationalApproximation;$2NniF;87|) + (LETT |#G113| |q1| + |DFLOAT;rationalApproximation;$2NniF;87|) + (LETT |#G114| |q2| + |DFLOAT;rationalApproximation;$2NniF;87|) + (LETT |q0| |#G113| + |DFLOAT;rationalApproximation;$2NniF;87|) + (LETT |q1| |#G114| + |DFLOAT;rationalApproximation;$2NniF;87|) (EXIT (PROGN (LETT |#G115| |t| diff --git a/src/algebra/strap/EUCDOM-.lsp b/src/algebra/strap/EUCDOM-.lsp index c7b5d022..adf7a481 100644 --- a/src/algebra/strap/EUCDOM-.lsp +++ b/src/algebra/strap/EUCDOM-.lsp @@ -76,13 +76,12 @@ (COND ((NULL (NOT (SPADCALL |y| (|getShellEntry| $ 8)))) (GO G191))) - (SEQ (PROGN - (LETT |#G13| |y| |EUCDOM-;gcd;3S;5|) - (LETT |#G14| - (SPADCALL |x| |y| (|getShellEntry| $ 24)) - |EUCDOM-;gcd;3S;5|) - (LETT |x| |#G13| |EUCDOM-;gcd;3S;5|) - (LETT |y| |#G14| |EUCDOM-;gcd;3S;5|)) + (SEQ (LETT |#G13| |y| |EUCDOM-;gcd;3S;5|) + (LETT |#G14| + (SPADCALL |x| |y| (|getShellEntry| $ 24)) + |EUCDOM-;gcd;3S;5|) + (LETT |x| |#G13| |EUCDOM-;gcd;3S;5|) + (LETT |y| |#G14| |EUCDOM-;gcd;3S;5|) (EXIT (LETT |y| (SPADCALL |y| (|getShellEntry| $ 22)) |EUCDOM-;gcd;3S;5|))) @@ -92,17 +91,12 @@ (DEFUN |EUCDOM-;unitNormalizeIdealElt| (|s| $) (PROG (|#G16| |u| |c| |a|) (RETURN - (SEQ (PROGN - (LETT |#G16| - (SPADCALL (QVELT |s| 2) (|getShellEntry| $ 27)) - |EUCDOM-;unitNormalizeIdealElt|) - (LETT |u| (QVELT |#G16| 0) - |EUCDOM-;unitNormalizeIdealElt|) - (LETT |c| (QVELT |#G16| 1) - |EUCDOM-;unitNormalizeIdealElt|) - (LETT |a| (QVELT |#G16| 2) - |EUCDOM-;unitNormalizeIdealElt|) - |#G16|) + (SEQ (LETT |#G16| (SPADCALL (QVELT |s| 2) (|getShellEntry| $ 27)) + |EUCDOM-;unitNormalizeIdealElt|) + (LETT |u| (QVELT |#G16| 0) |EUCDOM-;unitNormalizeIdealElt|) + (LETT |c| (QVELT |#G16| 1) |EUCDOM-;unitNormalizeIdealElt|) + (LETT |a| (QVELT |#G16| 2) |EUCDOM-;unitNormalizeIdealElt|) + |#G16| (EXIT (COND ((SPADCALL |a| (|getShellEntry| $ 28)) |s|) ('T |