diff options
28 files changed, 306 insertions, 227 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 59ddfda0..903e131f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,45 @@ 2010-02-16 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/compiler.boot (compAtomWithModemap): Reject niladic + functions used as constants. + * algebra/aggcat.spad.pamphlet (IndexedAggregate): Add parenthesis + for call to niladic function 'void'. + * algebra/algext.spad.pamphlet (SimpleAlgebraicExtension): Likewise. + * algebra/curve.spad.pamphlet (RadicalFunctionField): Likewise. + (AlgebraicFunctionField): Likewise. + * algebra/permgrps.spad.pamphlet (PermutationGroup): Likewise. + * algebra/pfo.spad.pamphlet (FunctionSpaceReduce): Likewise. + * algebra/setorder.spad.pamphlet: Likewise. + * algebra/ffcat.spad.pamphlet (FiniteFieldCategory): Add + parenthesis for call to niladic function 'representationType'. + * algebra/ffnb.spad.pamphlet + (FiniteFieldNormalBasisExtensionByPolynomial): Likewise for + normalElement. + * algebra/float.spad.pamphlet (Float): Likewise for OMencodingXML, + pi, log2, log10, digits. + * algebra/fnla.spad.pamphlet (FreeNilpotentLie): Likewise for + dimension. + * algebra/fraction.spad.pamphlet (Fraction): Likewise for + OMencodingXML. + * algebra/gaussian.spad.pamphlet (Complex): Likewise. + * algebra/integer.spad.pamphlet (Integer): Likewise. + * algebra/list.spad.pamphlet (List): Likewise. + * algebra/sf.spad.pamphlet (DoubleFloat): Likewise. + * algebra/si.spad.pamphlet (SingleInteger): Likewise. + * algebra/string.spad.pamphlet (String): Likewise. + * algebra/symbol.spad.pamphlet (Symbol): Likewise. + * algebra/intrf.spad.pamphlet (TranscendentalIntegration): + Likewise for empty. + * algebra/kl.spad.pamphlet (SortedCache): Likewise for cache, void. + * algebra/newdata.spad.pamphlet (TabulatedComputationPackage): + Likewise for usingTable?. + * algebra/omserver.spad.pamphlet (OpenMathServerPackage): Likewise + for OMencodingUnknown. + * algebra/plot.spad.pamphlet (Plot): Likewise for adaptive?. + * algebra/plot3d.spad.pamphlet (Plot3D): Likewise for adaptive3D?. + +2010-02-16 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/compiler.boot (compAtomWithModemap): Rewrite. (transImplementation): Remove. diff --git a/src/algebra/aggcat.spad.pamphlet b/src/algebra/aggcat.spad.pamphlet index d7cb421b..71553f6f 100644 --- a/src/algebra/aggcat.spad.pamphlet +++ b/src/algebra/aggcat.spad.pamphlet @@ -1040,7 +1040,7 @@ IndexedAggregate(Index: SetCategory, Entry: Type): Category == t := a.i qsetelt!(a, i, a.j) qsetelt!(a, j, t) - void + void() @ @@ -2717,6 +2717,8 @@ BitAggregate(): Category == <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +--Copyright (C) 2007-2010, Gabriel Dos Reis. +--All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/algext.spad.pamphlet b/src/algebra/algext.spad.pamphlet index bf73af55..c0e80cda 100644 --- a/src/algebra/algext.spad.pamphlet +++ b/src/algebra/algext.spad.pamphlet @@ -124,7 +124,7 @@ SimpleAlgebraicExtension(R:CommutativeRing, mkDisc b == nodisc?() := b disc() := discriminant M - void + void() traceMatrix() == if nodiscmat?() then mkDiscMat false @@ -136,7 +136,7 @@ SimpleAlgebraicExtension(R:CommutativeRing, for i in 0..d1 repeat for j in 0..d1 repeat qsetelt!(discmat,mr + i,mc + j,trace reduce monomial(1,i + j)) - void + void() trace x == --this could be coded perhaps more efficiently xn := x; ans := coefficient(lift xn, 0) @@ -201,6 +201,8 @@ SimpleAlgebraicExtension(R:CommutativeRing, <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +--Copyright (C) 2007-2010, Gabriel Dos Reis. +--All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/curve.spad.pamphlet b/src/algebra/curve.spad.pamphlet index a5eceb29..5a697c2b 100644 --- a/src/algebra/curve.spad.pamphlet +++ b/src/algebra/curve.spad.pamphlet @@ -686,7 +686,7 @@ RadicalFunctionField(F, UP, UPUP, radicnd, n): Exports == Impl where qsetelt!(v, k, (qelt(ib.basis, i, j) / ib.basisDen) * a) qsetelt!(w, k, qelt(ib.basisInv, i, j) * inv a) a := a * c - void + void() charPStartUp() == r := mkIntegral modulus @@ -704,7 +704,7 @@ RadicalFunctionField(F, UP, UPUP, radicnd, n): Exports == Impl where radicnd ** n1 * */[qelt(ibasis, i) ** 2 for i in mini..maxIndex ibasis] discPoly() := primitivePart(numer dsc) / denom(dsc) - void + void() char0StartUp() == rp := rootPoly(radicnd, n) @@ -719,7 +719,7 @@ RadicalFunctionField(F, UP, UPUP, radicnd, n): Exports == Impl where invden := invden / rp.coef -- always equals 1/rp.coef**(i-mini) qsetelt!(infbasis, i, a := qelt(infb, i)) qsetelt!(invinfbasis, i, inv a) - void + void() ramified?(p:UP) == (r := retractIfCan(p)@Union(F, "failed")) case F => @@ -821,7 +821,7 @@ AlgebraicFunctionField(F, UP, UPUP, modulus): Exports == Impl where for j in minColIndex ib .. maxColIndex ib repeat infbasis(i, j) := qelt(ib, i, j) invinfbasis(i, j) := invib(i, j) - void + void() getInfBasis() == x := inv(monomial(1, 1)$UP :: RF) @@ -844,7 +844,7 @@ AlgebraicFunctionField(F, UP, UPUP, modulus): Exports == Impl where for j in minColIndex ibasis .. maxColIndex ibasis repeat infbasis(i, j) := qelt(ib2, i, j) invinfbasis(i, j) := invib2(i, j) - void + void() startUp b == brandNew?() := b @@ -869,7 +869,7 @@ AlgebraicFunctionField(F, UP, UPUP, modulus): Exports == Impl where infBr?() := degree(numer dsc0) < degree(denom dsc0) dsc := dsc * determinant(ibasis) ** 2 discPoly() := primitivePart(numer dsc) / denom(dsc) - void + void() integralDerivationMatrix d == w := integralBasis() @@ -890,6 +890,8 @@ AlgebraicFunctionField(F, UP, UPUP, modulus): Exports == Impl where <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +--Copyright (C) 2007-2010, Gabriel Dos Reis. +--All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/ffcat.spad.pamphlet b/src/algebra/ffcat.spad.pamphlet index bba20f3e..2d1d6337 100644 --- a/src/algebra/ffcat.spad.pamphlet +++ b/src/algebra/ffcat.spad.pamphlet @@ -603,7 +603,7 @@ FiniteFieldCategory() : Category ==_ start : Integer := -- in the polynomial case, index from 1 to characteristic-1 -- gives prime field elements - representationType = "polynomial" => characteristic$% + representationType() = "polynomial" => characteristic$% 1 found : Boolean := false e : $ @@ -776,6 +776,8 @@ FiniteFieldSolveLinearPolynomialEquation(F:FiniteFieldCategory, <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +--Copyright (C) 2007-2010, Gabriel Dos Reis. +--All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/ffnb.spad.pamphlet b/src/algebra/ffnb.spad.pamphlet index fdf96d46..25c1e782 100644 --- a/src/algebra/ffnb.spad.pamphlet +++ b/src/algebra/ffnb.spad.pamphlet @@ -555,7 +555,7 @@ FiniteFieldNormalBasisExtensionByPolynomial(GF,uni): Exports == _ generator() == normalElement(extdeg)$INBFF basis(n:PI) == (extdeg rem n) ~= 0 => error "argument must divide extension degree" - [Frobenius(trace(normalElement,n),i) for i in 0..(n-1)]::(Vector $) + [Frobenius(trace(normalElement(),n),i) for i in 0..(n-1)]::(Vector $) a:GF * x:$ == a *$Rep x @@ -843,6 +843,8 @@ FiniteFieldNormalBasis(p,extdeg):_ <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +--Copyright (C) 2007-2010, Gabriel Dos Reis. +--All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/float.spad.pamphlet b/src/algebra/float.spad.pamphlet index 1f0bc0bd..32b0ae98 100644 --- a/src/algebra/float.spad.pamphlet +++ b/src/algebra/float.spad.pamphlet @@ -221,7 +221,7 @@ Float(): OMwrite(x: %): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) OMputObject(dev) writeOMFloat(dev, x) OMputEndObject(dev) @@ -232,7 +232,7 @@ Float(): OMwrite(x: %, wholeObj: Boolean): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) if wholeObj then OMputObject(dev) writeOMFloat(dev, x) @@ -290,7 +290,7 @@ Float(): inc 4 r := if zero? fractionPart x and x < [bits(),0] then atanInverse wholePart x else atan(1/x) - r := pi/2 - r + r := pi()/2 - r dec 4 return normalize r -- make |x| < O( 2**(-sqrt p) ) < 1/2 to speed series convergence @@ -330,9 +330,9 @@ Float(): sin x == s := sign x; x := abs x; p := bits(); inc 4 - if x > [6,0] then (inc p; x := 2*pi*fractionPart(x/pi/2); bits p) - if x > [3,0] then (inc p; s := -s; x := x - pi; bits p) - if x > [3,-1] then (inc p; x := pi - x; dec p) + if x > [6,0] then (inc p; x := 2*pi()*fractionPart(x/pi()/2); bits p) + if x > [3,0] then (inc p; s := -s; x := x - pi(); bits p) + if x > [3,-1] then (inc p; x := pi() - x; dec p) -- make |x| < O( 2**(-sqrt p) ) < 1/2 to speed series convergence -- by using the formula sin(3*x/3) = 3 sin(x/3) - 4 sin(x/3)**3 -- the running time is O( sqrt p M(p) ) assuming |x| < 1 @@ -359,11 +359,11 @@ Float(): cos x == s:I := 1; x := abs x; p := bits(); inc 4 - if x > [6,0] then (inc p; x := 2*pi*fractionPart(x/pi/2); dec p) - if x > [3,0] then (inc p; s := -s; x := x-pi; dec p) + if x > [6,0] then (inc p; x := 2*pi()*fractionPart(x/pi()/2); dec p) + if x > [3,0] then (inc p; s := -s; x := x-pi(); dec p) if x > [1,0] then -- take care of the accuracy problem near pi/2 - inc p; x := pi/2-x; bits p; x := normalize x + inc p; x := pi()/2-x; bits p; x := normalize x return (s * sin x) -- make |x| < O( 2**(-sqrt p) ) < 1/2 to speed series convergence -- by using the formula cos(2*x/2) = 2 cos(x/2)**2 - 1 @@ -467,7 +467,7 @@ Float(): p := bits(); inc 5 -- apply log(x) = n log 2 + log(x/2**n) so that 1/2 < x < 2 if (n := order x) < 0 then n := n+1 - l := if n = 0 then 0 else (x := shift(x,-n); n * log2) + l := if n = 0 then 0 else (x := shift(x,-n); n * log2()) -- speed the series convergence by finding m and k such that -- | exp(m/2**k) x - 1 | < 1 / 2 ** O(sqrt p) -- write log(exp(m/2**k) x) as m/2**k + log x @@ -525,17 +525,17 @@ Float(): s := s + t quo k t := t quo 81 -- We have log 10 = log 5 + log 2 and log 5/4 = log 5 - 2 log 2 - inc 2; L10 := [bits(),[s,-n] + 3*log2]; dec 2 + inc 2; L10 := [bits(),[s,-n] + 3*log2()]; dec 2 normalize L10.value - log2(x) == (inc 2; r := log(x)/log2; dec 2; normalize r) - log10(x) == (inc 2; r := log(x)/log10; dec 2; normalize r) + log2(x) == (inc 2; r := log(x)/log2(); dec 2; normalize r) + log10(x) == (inc 2; r := log(x)/log10(); dec 2; normalize r) exp(x) == -- exp(n+x) = exp(1)**n exp(x) for n such that |x| < 1 p := bits(); inc 5; e1:% := 1 if (n := wholePart x) ~= 0 then - inc LENGTH n; e1 := exp1 ** n; dec LENGTH n + inc LENGTH n; e1 := exp1() ** n; dec LENGTH n x := fractionPart x if zero? x then (bits p; return normalize e1) -- make |x| < O( 2**(-sqrt p) ) < 1/2 to speed series convergence @@ -865,13 +865,13 @@ Float(): zero? exponent f => padFromRight concat(convert(mantissa f)@S, ".0") negative? f => concat("-", fixed abs f) - d := if OUTPREC() = -1 then digits::I else OUTPREC() + d := if OUTPREC() = -1 then digits()::I else OUTPREC() -- g := convert10(abs f,digits); m := g.mantissa; e := g.exponent g := convert10(abs f,d); m := g.mantissa; e := g.exponent if OUTPREC() ~= -1 then -- round g to OUTPREC digits after the decimal point l := length10 m - if -e > OUTPREC() and -e < 2*digits::I then + if -e > OUTPREC() and -e < 2*digits()::I then g := normalize10(g,l+e+OUTPREC()) m := g.mantissa; e := g.exponent s := convert(m)@S; n := #s; o := e+n @@ -902,7 +902,7 @@ Float(): s := convert(mantissa f)@S concat ["0.", padFromLeft s, t, convert(#s)@S] -- base conversion to decimal rounded to the requested precision - d := if OUTPREC() = -1 then digits::I else OUTPREC() + d := if OUTPREC() = -1 then digits()::I else OUTPREC() g := convert10(f,d); m := g.mantissa; e := g.exponent -- I'm assuming that length10 m = # s given n > 0 s := convert(m)@S; n := #s; o := e+n @@ -912,7 +912,7 @@ Float(): general(f) == zero? f => "0.0" negative? f => concat("-", general abs f) - d := if OUTPREC() = -1 then digits::I else OUTPREC() + d := if OUTPREC() = -1 then digits()::I else OUTPREC() zero? exponent f => d := d + 1 s := convert(mantissa f)@S @@ -1020,7 +1020,7 @@ Float(): <<license>>= --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 diff --git a/src/algebra/fnla.spad.pamphlet b/src/algebra/fnla.spad.pamphlet index 0a99b15d..36541ce6 100644 --- a/src/algebra/fnla.spad.pamphlet +++ b/src/algebra/fnla.spad.pamphlet @@ -223,7 +223,7 @@ FreeNilpotentLie(n:NNI,class:NNI,R: CommutativeRing): Export == Implement where coms:VLI coms := generate(n,class)$HB - dimension == #coms + dimension() == #coms have : (I,I) -> % -- have(left,right) is a lookup function for basic commutators @@ -233,7 +233,7 @@ FreeNilpotentLie(n:NNI,class:NNI,R: CommutativeRing): Export == Implement where wt:I := coms(i).2 + coms(j).2 wt > class => 0 lo:I := 1 - hi:I := dimension + hi:I := dimension() while hi-lo > 1 repeat mid:I := (hi+lo) quo 2 if coms(mid).2 < wt then lo := mid else hi := mid @@ -242,7 +242,7 @@ FreeNilpotentLie(n:NNI,class:NNI,R: CommutativeRing): Export == Implement where monomial(1,hi::OSI)$FM generator(i) == - i > dimension => 0$Rep + i > dimension() => 0$Rep monomial(1,i::OSI)$FM putIn : I -> % @@ -301,6 +301,8 @@ FreeNilpotentLie(n:NNI,class:NNI,R: CommutativeRing): Export == Implement where <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +--Copyright (c) 2007-2010, Gabriel Dos Reis. +--All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/fraction.spad.pamphlet b/src/algebra/fraction.spad.pamphlet index 8d37bb4f..a1ef630b 100644 --- a/src/algebra/fraction.spad.pamphlet +++ b/src/algebra/fraction.spad.pamphlet @@ -368,7 +368,7 @@ Fraction(S: IntegralDomain): QuotientFieldCategory S with s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp dev: OpenMathDevice := _ - OMopenString(sp pretend String, OMencodingXML) + OMopenString(sp pretend String, OMencodingXML()) OMputObject(dev) writeOMFrac(dev, x) OMputEndObject(dev) @@ -380,7 +380,7 @@ Fraction(S: IntegralDomain): QuotientFieldCategory S with s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp dev: OpenMathDevice := _ - OMopenString(sp pretend String, OMencodingXML) + OMopenString(sp pretend String, OMencodingXML()) if wholeObj then OMputObject(dev) writeOMFrac(dev, x) @@ -699,6 +699,8 @@ FractionFunctions2(A, B): Exports == Impl where <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +--Copyright (C) 2007-2010, Gabriel Dos Reis. +--All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/gaussian.spad.pamphlet b/src/algebra/gaussian.spad.pamphlet index 49035681..220947c9 100644 --- a/src/algebra/gaussian.spad.pamphlet +++ b/src/algebra/gaussian.spad.pamphlet @@ -563,7 +563,7 @@ Complex(R:CommutativeRing): ComplexCategory(R) with OMwrite(x: %): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) OMputObject(dev) writeOMComplex(dev, x) OMputEndObject(dev) @@ -574,7 +574,7 @@ Complex(R:CommutativeRing): ComplexCategory(R) with OMwrite(x: %, wholeObj: Boolean): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) if wholeObj then OMputObject(dev) writeOMComplex(dev, x) @@ -783,7 +783,7 @@ ComplexIntegerSolveLinearPolynomialEquation(R,CR): C == T <<license>>= --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 diff --git a/src/algebra/integer.spad.pamphlet b/src/algebra/integer.spad.pamphlet index a9a869af..c2bcb16f 100644 --- a/src/algebra/integer.spad.pamphlet +++ b/src/algebra/integer.spad.pamphlet @@ -97,7 +97,7 @@ Integer: Join(IntegerNumberSystem, ConvertibleTo String, OpenMath) with OMwrite(x: %): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) OMputObject(dev) writeOMInt(dev, x) OMputEndObject(dev) @@ -108,7 +108,7 @@ Integer: Join(IntegerNumberSystem, ConvertibleTo String, OpenMath) with OMwrite(x: %, wholeObj: Boolean): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) if wholeObj then OMputObject(dev) writeOMInt(dev, x) @@ -345,6 +345,8 @@ RomanNumeral(): Join(IntegerNumberSystem,ConvertibleFrom Symbol) with <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +--Copyright (C) 2007-2010, Gabriel Dos Reis. +--All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/intrf.spad.pamphlet b/src/algebra/intrf.spad.pamphlet index 5e25fd50..d4e2b859 100644 --- a/src/algebra/intrf.spad.pamphlet +++ b/src/algebra/intrf.spad.pamphlet @@ -447,7 +447,7 @@ TranscendentalIntegration(F, UP): Exports == Implementation where differentiate(mkAnswer(0, logs, empty()), differentiate(#1, derivation)) (u := retractIfCan(p := r.logpart - dlog)@Union(UP, "failed")) case UP => - [mkAnswer(r.answer, logs, empty), r.specpart, r.polypart + u::UP] + [mkAnswer(r.answer, logs, empty()), r.specpart, r.polypart + u::UP] [mkAnswer(r.answer, logs, [[p, dummy]]), r.specpart, r.polypart] -- returns [q, r] such that p = q' + r and degree(r) < degree(dt) @@ -857,6 +857,8 @@ RationalFunctionIntegration(F): Exports == Implementation where <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/kl.spad.pamphlet b/src/algebra/kl.spad.pamphlet index bcd07b86..6dfa0358 100644 --- a/src/algebra/kl.spad.pamphlet +++ b/src/algebra/kl.spad.pamphlet @@ -68,12 +68,12 @@ SortedCache(S:CachableSet): Exports == Implementation where shiftCache(l, n) == for x in l repeat setPosition(x, n + position x) - void + void() clearCache() == - for x in cache repeat setPosition(x, 0) + for x in cache() repeat setPosition(x, 0) setref(cach,nil$List(S)) - void + void() enterInCache(x:S, equal?:S -> Boolean) == scan := cache() @@ -272,7 +272,7 @@ KernelFunctions2(R: SetCategory, S: SetCategory): with <<license>>= --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 diff --git a/src/algebra/list.spad.pamphlet b/src/algebra/list.spad.pamphlet index f97baab6..0b6da7ff 100644 --- a/src/algebra/list.spad.pamphlet +++ b/src/algebra/list.spad.pamphlet @@ -284,7 +284,7 @@ List(S:Type): Exports == Implementation where OMwrite(x: %): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) OMputObject(dev) writeOMList(dev, x) OMputEndObject(dev) @@ -295,7 +295,7 @@ List(S:Type): Exports == Implementation where OMwrite(x: %, wholeObj: Boolean): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) if wholeObj then OMputObject(dev) writeOMList(dev, x) @@ -624,8 +624,8 @@ AssociationList(Key:SetCategory, Entry:SetCategory): <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. ---Copyright (C) 2007-2009, Gabriel Dos Reis. ---All rights reserved. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/newdata.spad.pamphlet b/src/algebra/newdata.spad.pamphlet index ca9783e8..f9b1a9ed 100644 --- a/src/algebra/newdata.spad.pamphlet +++ b/src/algebra/newdata.spad.pamphlet @@ -111,7 +111,7 @@ TabulatedComputationPackage(Key ,Entry): Exports == Implementation where void() printInfo!(s1: String, s2: String): Void == (empty? s1) or (empty? s2) => void() - not usingTable? => + not usingTable?() => error "in printInfo!()$TBCMPPK: not allowed to use hashtable" info? := true ok := s1 @@ -621,6 +621,8 @@ SplittingTree(V,C) : Exports == Implementation where <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +-- Copyright (C) 2007-2010, Gabriel Dos Reis +-- All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/omserver.spad.pamphlet b/src/algebra/omserver.spad.pamphlet index 6d42d430..cd09ad27 100644 --- a/src/algebra/omserver.spad.pamphlet +++ b/src/algebra/omserver.spad.pamphlet @@ -47,12 +47,12 @@ OpenMathServerPackage(): with OMreceive(conn: OpenMathConnection): Any == dev: OpenMathDevice := OMconnInDevice(conn) - OMsetEncoding(dev, OMencodingUnknown); + OMsetEncoding(dev, OMencodingUnknown()); OMread(dev) OMsend(conn: OpenMathConnection, value: Any): Void == dev: OpenMathDevice := OMconnOutDevice(conn) - OMsetEncoding(dev, OMencodingXML); + OMsetEncoding(dev, OMencodingXML()); --retractable?(value)$AnyFunctions1(Expression Integer) => -- OMwrite(dev, retract(value)$AnyFunctions1(Expression Integer), true) retractable?(value)$AnyFunctions1(Integer) => @@ -79,6 +79,8 @@ OpenMathServerPackage(): with <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/permgrps.spad.pamphlet b/src/algebra/permgrps.spad.pamphlet index 2496394d..afa34fbd 100644 --- a/src/algebra/permgrps.spad.pamphlet +++ b/src/algebra/permgrps.spad.pamphlet @@ -585,7 +585,7 @@ PermutationGroup(S:SetCategory): public == private where gporb := result.orbs supp := result.mp wordlist := result.wd - void + void() subgroup ( gp1 : % , gp2 : % ) : B == gpset1 := initialize gp1 @@ -770,7 +770,7 @@ PermutationGroup(S:SetCategory): public == private where wordProblem := true ord := bsgs ( gp , maxLoops , diff ) gp.information := [ ord , sgs , baseOfGroup , gporb , supp , wordlist ] - void + void() initializeGroupForWordProblem ( gp ) == initializeGroupForWordProblem ( gp , 0 , 1 ) @@ -1153,6 +1153,8 @@ PermutationGroupExamples():public == private where <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/pfo.spad.pamphlet b/src/algebra/pfo.spad.pamphlet index 63d721fb..6cda9848 100644 --- a/src/algebra/pfo.spad.pamphlet +++ b/src/algebra/pfo.spad.pamphlet @@ -258,7 +258,7 @@ FunctionSpaceReduce(R, F): Exports == Implementation where newReduc() == for k in keys redmap repeat remove!(k, redmap) - void + void() bringDown(f, k) == ff := univariate(f, k) @@ -564,6 +564,8 @@ PointsOfFiniteOrder(R0, F, UP, UPUP, R): Exports == Implementation where <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/plot.spad.pamphlet b/src/algebra/plot.spad.pamphlet index 16ff14e9..8f4731b2 100644 --- a/src/algebra/plot.spad.pamphlet +++ b/src/algebra/plot.spad.pamphlet @@ -449,7 +449,7 @@ Plot(): Exports == Implementation where nRange := intersect(tRange,nRange) curves: L C := [basicRefine(c,nRange) for c in p.functions] xRange := join(curves,1); yRange := join(curves,2) - if adaptive? then + if adaptive?() then tlimit := if parametric? p then 8 else 1 curves := [adaptivePlot(c,nRange,xRange,yRange, _ tlimit) for c in curves] @@ -464,7 +464,7 @@ Plot(): Exports == Implementation where NUMFUNEVALS := 0 curves: L C := [rangeRefine(c,tRange) for c in p.functions] xRange := join(curves,1); yRange := join(curves,2) - if adaptive? then + if adaptive?() then tlimit := if parametric? p then 8 else 1 curves := [adaptivePlot(c,tRange,xRange,yRange,tlimit) for c in curves] xRange := join(curves,1); yRange := join(curves,2) @@ -486,7 +486,7 @@ Plot(): Exports == Implementation where p := basicPlot(pt(#1,myTrap(f,#1)),xRange) r := p.ranges NUMFUNEVALS := minPoints() - if adaptive? then + if adaptive?() then p := adaptivePlot(p,first r,second r,third r,1) r := p.ranges [ false, rest r, r, nil(), [ p ] ] @@ -500,7 +500,7 @@ Plot(): Exports == Implementation where p := basicPlot(pt(myTrap(f,#1),myTrap(g,#1)),tRange) r := p.ranges NUMFUNEVALS := minPoints() - if adaptive? then + if adaptive?() then p := adaptivePlot(p,first r,second r,third r,8) r := p.ranges [ true, rest r, r, nil(), [ p ] ] @@ -514,7 +514,7 @@ Plot(): Exports == Implementation where p := basicPlot(f,tRange) r := p.ranges NUMFUNEVALS := minPoints() - if adaptive? then + if adaptive?() then p := adaptivePlot(p,first r,second r,third r,8) r := p.ranges [ true, rest r, r, nil(), [ p ] ] @@ -529,7 +529,7 @@ Plot(): Exports == Implementation where t: L C := [ basicPlot(pt(#1,myTrap(f,#1)),xRange) for f in l ] yRange := join(t,2) NUMFUNEVALS := # l * minPoints() - if adaptive? then + if adaptive?() then t := [adaptivePlot(p,xRange,xRange,yRange,1) _ for f in l for p in t] yRange := join(t,2) @@ -616,6 +616,8 @@ PlotFunctions1(S:ConvertibleTo InputForm): with <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/plot3d.spad.pamphlet b/src/algebra/plot3d.spad.pamphlet index 579e7b22..eae26c33 100644 --- a/src/algebra/plot3d.spad.pamphlet +++ b/src/algebra/plot3d.spad.pamphlet @@ -402,7 +402,7 @@ Plot3D(): Exports == Implementation where xRange := join(curves,1); yRange := join(curves,2) zRange := join(curves,3) scrres := p.screenres - if adaptive3D? then + if adaptive3D?() then tlimit := 8 curves := [adaptivePlot(c,nRange,xRange,yRange,zRange, _ tlimit,scrres := 2*scrres) for c in curves] @@ -418,7 +418,7 @@ Plot3D(): Exports == Implementation where curves: L C := [rangeRefine(c,tRange) for c in p.functions] xRange := join(curves,1); yRange := join(curves,2) zRange := join(curves,3) - if adaptive3D? then + if adaptive3D?() then tlimit := 8 curves := [adaptivePlot(c,tRange,xRange,yRange,zRange,tlimit, _ p.screenres) for c in curves] @@ -432,7 +432,7 @@ Plot3D(): Exports == Implementation where p := basicPlot(f,tRange) r := p.ranges NUMFUNEVALS := MINPOINTS - if adaptive3D? then + if adaptive3D?() then p := adaptivePlot(p,first r,second r,third r,fourth r,8,SCREENRES) -- print(NUMFUNEVALS::OUT) -- print(p::OUT) @@ -456,7 +456,7 @@ Plot3D(): Exports == Implementation where p := basicPlot(point(myTrap(f1,#1),myTrap(f2,#1),myTrap(f3,#1),col(#1)),tRange) r := p.ranges NUMFUNEVALS := MINPOINTS - if adaptive3D? then + if adaptive3D?() then p := adaptivePlot(p,first r,second r,third r,fourth r,8,SCREENRES) -- print(NUMFUNEVALS::OUT) [ rest r, r, SCREENRES, nil(), [ p ] ] @@ -500,6 +500,8 @@ Plot3D(): Exports == Implementation where <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/setorder.spad.pamphlet b/src/algebra/setorder.spad.pamphlet index 6b2b67d1..b54ade5c 100644 --- a/src/algebra/setorder.spad.pamphlet +++ b/src/algebra/setorder.spad.pamphlet @@ -68,7 +68,7 @@ UserDefinedPartialOrdering(S:SetCategory): with setOrder(l, h) == setref(llow, removeDuplicates l) setref(lhigh, removeDuplicates h) - void + void() less?(a, b, f) == (u := less?(a, b)) case "failed" => f(a, b) @@ -144,6 +144,8 @@ UserDefinedVariableOrdering(): with <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/sf.spad.pamphlet b/src/algebra/sf.spad.pamphlet index 5efeba82..5e5e8f14 100644 --- a/src/algebra/sf.spad.pamphlet +++ b/src/algebra/sf.spad.pamphlet @@ -285,7 +285,7 @@ DoubleFloat(): Join(FloatingPointSystem, DifferentialRing, OpenMath, OMwrite(x: %): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) OMputObject(dev) OMputFloat(dev, convert x) OMputEndObject(dev) @@ -296,7 +296,7 @@ DoubleFloat(): Join(FloatingPointSystem, DifferentialRing, OpenMath, OMwrite(x: %, wholeObj: Boolean): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) if wholeObj then OMputObject(dev) OMputFloat(dev, convert x) @@ -505,6 +505,8 @@ DoubleFloat(): Join(FloatingPointSystem, DifferentialRing, OpenMath, <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/si.spad.pamphlet b/src/algebra/si.spad.pamphlet index cee9d51c..1eece3c6 100644 --- a/src/algebra/si.spad.pamphlet +++ b/src/algebra/si.spad.pamphlet @@ -231,7 +231,7 @@ SingleInteger(): Join(IntegerNumberSystem,OrderedFinite,Logic,OpenMath) with OMwrite(x: %): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) OMputObject(dev) writeOMSingleInt(dev, x) OMputEndObject(dev) @@ -242,7 +242,7 @@ SingleInteger(): Join(IntegerNumberSystem,OrderedFinite,Logic,OpenMath) with OMwrite(x: %, wholeObj: Boolean): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) if wholeObj then OMputObject(dev) writeOMSingleInt(dev, x) @@ -347,6 +347,8 @@ SingleInteger(): Join(IntegerNumberSystem,OrderedFinite,Logic,OpenMath) with <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/strap/DFLOAT.lsp b/src/algebra/strap/DFLOAT.lsp index 5af80d38..9795065f 100644 --- a/src/algebra/strap/DFLOAT.lsp +++ b/src/algebra/strap/DFLOAT.lsp @@ -464,7 +464,7 @@ (FLOAT (FLOAT-RADIX 0.0) |$DoubleFloatMaximum|) $) - (|getShellEntry| $ 35))) + (|getShellEntry| $ 34))) |DFLOAT;bits;Pi;10|) (|check-subtype| (AND (>= #0# 0) (> #0# 0)) '(|PositiveInteger|) #0#))))))) @@ -495,10 +495,10 @@ (DEFUN |DFLOAT;pi;$;17| ($) (DECLARE (IGNORE $)) PI) (DEFUN |DFLOAT;coerce;$Of;18| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 49))) + (SPADCALL |x| (|getShellEntry| $ 48))) (DEFUN |DFLOAT;convert;$If;19| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 52))) + (SPADCALL |x| (|getShellEntry| $ 51))) (DEFUN |DFLOAT;<;2$B;20| (|x| |y| $) (DECLARE (IGNORE $)) (< |x| |y|)) @@ -618,10 +618,10 @@ (DEFUN |DFLOAT;differentiate;2$;71| (|x| $) (DECLARE (IGNORE $)) 0.0) (DEFUN |DFLOAT;Gamma;2$;72| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 108))) + (SPADCALL |x| (|getShellEntry| $ 107))) (DEFUN |DFLOAT;Beta;3$;73| (|x| |y| $) - (SPADCALL |x| |y| (|getShellEntry| $ 110))) + (SPADCALL |x| |y| (|getShellEntry| $ 109))) (DEFUN |DFLOAT;wholePart;$I;74| (|x| $) (DECLARE (IGNORE $)) @@ -633,7 +633,7 @@ (DEFUN |DFLOAT;convert;2$;76| (|x| $) (DECLARE (IGNORE $)) |x|) (DEFUN |DFLOAT;convert;$F;77| (|x| $) - (SPADCALL |x| (|getShellEntry| $ 114))) + (SPADCALL |x| (|getShellEntry| $ 113))) (DEFUN |DFLOAT;rationalApproximation;$NniF;78| (|x| |d| $) (|DFLOAT;rationalApproximation;$2NniF;87| |x| |d| 10 $)) @@ -759,7 +759,7 @@ (PROG1 |ex| (|check-subtype| (>= |ex| 0) '(|NonNegativeInteger|) |ex|)))) - (|getShellEntry| $ 137))) + (|getShellEntry| $ 136))) ('T (SEQ (LETT |de| (EXPT BASE @@ -815,14 +815,14 @@ (- (* |nu| |q2|) (* |de| |p2|))) (|getShellEntry| $ - 146)) + 145)) (* |de| (ABS |p2|)))) (EXIT (PROGN (LETT #1# (SPADCALL |p2| |q2| (|getShellEntry| $ - 144)) + 143)) |DFLOAT;rationalApproximation;$2NniF;87|) (GO #1#))))) (PROGN @@ -863,25 +863,25 @@ (SEQ (EXIT (COND ((ZEROP |x|) (COND - ((SPADCALL |r| (|getShellEntry| $ 148)) + ((SPADCALL |r| (|getShellEntry| $ 147)) (|error| "0**0 is undefined")) - ((SPADCALL |r| (|getShellEntry| $ 149)) + ((SPADCALL |r| (|getShellEntry| $ 148)) (|error| "division by 0")) ('T 0.0))) - ((OR (SPADCALL |r| (|getShellEntry| $ 148)) + ((OR (SPADCALL |r| (|getShellEntry| $ 147)) (= |x| 1.0)) 1.0) ('T (COND - ((SPADCALL |r| (|getShellEntry| $ 150)) |x|) + ((SPADCALL |r| (|getShellEntry| $ 149)) |x|) ('T (SEQ (LETT |n| (SPADCALL |r| - (|getShellEntry| $ 151)) + (|getShellEntry| $ 150)) |DFLOAT;**;$F$;88|) (LETT |d| (SPADCALL |r| - (|getShellEntry| $ 152)) + (|getShellEntry| $ 151)) |DFLOAT;**;$F$;88|) (EXIT (COND ((MINUSP |x|) @@ -941,7 +941,7 @@ (RETURN (PROGN (LETT |dv$| '(|DoubleFloat|) . #0=(|DoubleFloat|)) - (LETT $ (|newShell| 166) . #0#) + (LETT $ (|newShell| 165) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| (|buildPredVector| 0 0 NIL) . #0#)) @@ -961,17 +961,16 @@ (FUNCALL (|dispatchFunction| |DFLOAT;Zero;$;14|) $)) (|PositiveInteger|) |DFLOAT;base;Pi;6| (|Integer|) |DFLOAT;mantissa;$I;7| |DFLOAT;exponent;$I;8| - |DFLOAT;precision;Pi;9| (31 . |base|) (35 . =) (41 . *) - (47 . |coerce|) |DFLOAT;log2;2$;40| (52 . *) - |DFLOAT;wholePart;$I;74| |DFLOAT;bits;Pi;10| - |DFLOAT;max;$;11| |DFLOAT;min;$;12| (58 . +) (64 . |One|) - (68 . -) |DFLOAT;order;$I;13| + |DFLOAT;precision;Pi;9| (31 . =) (37 . *) (43 . |coerce|) + |DFLOAT;log2;2$;40| (48 . *) |DFLOAT;wholePart;$I;74| + |DFLOAT;bits;Pi;10| |DFLOAT;max;$;11| |DFLOAT;min;$;12| + (54 . +) (60 . |One|) (64 . -) |DFLOAT;order;$I;13| (CONS IDENTITY (FUNCALL (|dispatchFunction| |DFLOAT;One;$;15|) $)) |DFLOAT;/;3$;65| |DFLOAT;exp1;$;16| |DFLOAT;pi;$;17| - (|OutputForm|) (74 . |outputForm|) |DFLOAT;coerce;$Of;18| - (|InputForm|) (79 . |convert|) |DFLOAT;convert;$If;19| - |DFLOAT;<;2$B;20| |DFLOAT;>;2$B;21| (84 . |not|) + (|OutputForm|) (70 . |outputForm|) |DFLOAT;coerce;$Of;18| + (|InputForm|) (75 . |convert|) |DFLOAT;convert;$If;19| + |DFLOAT;<;2$B;20| |DFLOAT;>;2$B;21| (80 . |not|) |DFLOAT;<=;2$B;22| |DFLOAT;>=;2$B;23| |DFLOAT;-;2$;24| |DFLOAT;+;3$;25| |DFLOAT;-;3$;26| |DFLOAT;*;3$;27| |DFLOAT;*;I2$;28| |DFLOAT;max;3$;29| |DFLOAT;min;3$;30| @@ -993,60 +992,60 @@ |DFLOAT;one?;$B;68| (|SingleInteger|) |DFLOAT;hash;$Si;69| (|Union| $ '"failed") |DFLOAT;recip;$U;70| |DFLOAT;differentiate;2$;71| - (|DoubleFloatSpecialFunctions|) (89 . |Gamma|) - |DFLOAT;Gamma;2$;72| (94 . |Beta|) |DFLOAT;Beta;3$;73| - |DFLOAT;float;2IPi$;75| (|Float|) (100 . |convert|) + (|DoubleFloatSpecialFunctions|) (85 . |Gamma|) + |DFLOAT;Gamma;2$;72| (90 . |Beta|) |DFLOAT;Beta;3$;73| + |DFLOAT;float;2IPi$;75| (|Float|) (96 . |convert|) |DFLOAT;convert;$F;77| (|Fraction| 26) (|NonNegativeInteger|) |DFLOAT;rationalApproximation;$2NniF;87| - |DFLOAT;rationalApproximation;$NniF;78| (105 . |Zero|) - |DFLOAT;abs;2$;85| |DFLOAT;atan;3$;79| (109 . |One|) - |DFLOAT;retract;$F;80| (|Union| 116 '"failed") + |DFLOAT;rationalApproximation;$NniF;78| (101 . |Zero|) + |DFLOAT;abs;2$;85| |DFLOAT;atan;3$;79| (105 . |One|) + |DFLOAT;retract;$F;80| (|Union| 115 '"failed") |DFLOAT;retractIfCan;$U;81| |DFLOAT;retract;$I;82| (|Union| 26 '"failed") |DFLOAT;retractIfCan;$U;83| - |DFLOAT;sign;$I;84| (113 . *) (119 . **) (125 . |Zero|) - (129 . |Zero|) (133 . >=) (139 . **) (145 . |coerce|) - (150 . -) (155 . <) (161 . **) + |DFLOAT;sign;$I;84| (109 . *) (115 . **) (121 . |Zero|) + (125 . |Zero|) (129 . >=) (135 . **) (141 . |coerce|) + (146 . -) (151 . <) (157 . **) (|Record| (|:| |quotient| $) (|:| |remainder| $)) - (167 . |divide|) (173 . =) (179 . /) (185 . |abs|) - (190 . *) (196 . <) (202 . |zero?|) (207 . |negative?|) - (212 . |one?|) (217 . |numer|) (222 . |denom|) - (227 . |odd?|) |DFLOAT;**;$F$;88| - (|PatternMatchResult| 113 $) (|Pattern| 113) - (|Factored| $) (|List| $) (|Union| 158 '"failed") + (163 . |divide|) (169 . =) (175 . /) (181 . |abs|) + (186 . *) (192 . <) (198 . |zero?|) (203 . |negative?|) + (208 . |one?|) (213 . |numer|) (218 . |denom|) + (223 . |odd?|) |DFLOAT;**;$F$;88| + (|PatternMatchResult| 112 $) (|Pattern| 112) + (|Factored| $) (|List| $) (|Union| 157 '"failed") (|Record| (|:| |coef1| $) (|:| |coef2| $) (|:| |generator| $)) (|Record| (|:| |coef1| $) (|:| |coef2| $)) - (|Union| 161 '"failed") - (|Record| (|:| |coef| 158) (|:| |generator| $)) + (|Union| 160 '"failed") + (|Record| (|:| |coef| 157) (|:| |generator| $)) (|SparseUnivariatePolynomial| $) (|Record| (|:| |unit| $) (|:| |canonical| $) (|:| |associate| $))) - '#(~= 232 |zero?| 238 |wholePart| 243 |unitNormal| 248 - |unitCanonical| 253 |unit?| 258 |truncate| 263 |tanh| 268 - |tan| 273 |subtractIfCan| 278 |squareFreePart| 284 - |squareFree| 289 |sqrt| 294 |sizeLess?| 299 |sinh| 305 - |sin| 310 |sign| 315 |sech| 320 |sec| 325 |sample| 330 - |round| 334 |retractIfCan| 339 |retract| 349 |rem| 359 - |recip| 365 |rationalApproximation| 370 |quo| 383 - |principalIdeal| 389 |prime?| 394 |precision| 399 - |positive?| 403 |pi| 408 |patternMatch| 412 |order| 419 - |one?| 424 |nthRoot| 429 |norm| 435 |negative?| 440 - |multiEuclidean| 445 |min| 451 |max| 461 |mantissa| 471 - |log2| 476 |log10| 481 |log| 486 |lcm| 491 |latex| 502 - |inv| 507 |hash| 512 |gcdPolynomial| 517 |gcd| 523 - |fractionPart| 534 |floor| 539 |float| 544 |factor| 557 - |extendedEuclidean| 562 |exquo| 575 |expressIdealMember| - 581 |exponent| 587 |exp1| 592 |exp| 596 |euclideanSize| - 601 |divide| 606 |digits| 612 |differentiate| 616 |csch| - 627 |csc| 632 |coth| 637 |cot| 642 |cosh| 647 |cos| 652 - |convert| 657 |coerce| 677 |characteristic| 707 |ceiling| - 711 |bits| 716 |before?| 720 |base| 726 |atanh| 730 |atan| - 735 |associates?| 746 |asinh| 752 |asin| 757 |asech| 762 - |asec| 767 |acsch| 772 |acsc| 777 |acoth| 782 |acot| 787 - |acosh| 792 |acos| 797 |abs| 802 |Zero| 807 |One| 811 - |OMwrite| 815 |Gamma| 839 D 844 |Beta| 855 >= 861 > 867 = - 873 <= 879 < 885 / 891 - 903 + 914 ** 920 * 950) + '#(~= 228 |zero?| 234 |wholePart| 239 |unitNormal| 244 + |unitCanonical| 249 |unit?| 254 |truncate| 259 |tanh| 264 + |tan| 269 |subtractIfCan| 274 |squareFreePart| 280 + |squareFree| 285 |sqrt| 290 |sizeLess?| 295 |sinh| 301 + |sin| 306 |sign| 311 |sech| 316 |sec| 321 |sample| 326 + |round| 330 |retractIfCan| 335 |retract| 345 |rem| 355 + |recip| 361 |rationalApproximation| 366 |quo| 379 + |principalIdeal| 385 |prime?| 390 |precision| 395 + |positive?| 399 |pi| 404 |patternMatch| 408 |order| 415 + |one?| 420 |nthRoot| 425 |norm| 431 |negative?| 436 + |multiEuclidean| 441 |min| 447 |max| 457 |mantissa| 467 + |log2| 472 |log10| 477 |log| 482 |lcm| 487 |latex| 498 + |inv| 503 |hash| 508 |gcdPolynomial| 513 |gcd| 519 + |fractionPart| 530 |floor| 535 |float| 540 |factor| 553 + |extendedEuclidean| 558 |exquo| 571 |expressIdealMember| + 577 |exponent| 583 |exp1| 588 |exp| 592 |euclideanSize| + 597 |divide| 602 |digits| 608 |differentiate| 612 |csch| + 623 |csc| 628 |coth| 633 |cot| 638 |cosh| 643 |cos| 648 + |convert| 653 |coerce| 673 |characteristic| 703 |ceiling| + 707 |bits| 712 |before?| 716 |base| 722 |atanh| 726 |atan| + 731 |associates?| 742 |asinh| 748 |asin| 753 |asech| 758 + |asec| 763 |acsch| 768 |acsc| 773 |acoth| 778 |acot| 783 + |acosh| 788 |acos| 793 |abs| 798 |Zero| 803 |One| 807 + |OMwrite| 811 |Gamma| 835 D 840 |Beta| 851 >= 857 > 863 = + 869 <= 875 < 881 / 887 - 899 + 910 ** 916 * 946) '((|approximate| . 0) (|canonicalsClosed| . 0) (|canonicalUnitNormal| . 0) (|noZeroDivisors| . 0) ((|commutative| "*") . 0) (|rightUnitary| . 0) @@ -1081,14 +1080,14 @@ (|PrincipalIdealDomain|) (|UniqueFactorizationDomain|) (|GcdDomain|) (|DivisionRing|) - (|IntegralDomain|) (|Algebra| 116) + (|IntegralDomain|) (|Algebra| 115) (|Algebra| $$) (|DifferentialRing|) (|CharacteristicZero|) (|OrderedRing|) - (|Module| 116) (|EntireRing|) + (|Module| 115) (|EntireRing|) (|CommutativeRing|) (|Module| $$) - (|BiModule| 116 116) (|BiModule| $$ $$) + (|BiModule| 115 115) (|BiModule| $$ $$) (|Ring|) (|OrderedAbelianGroup|) - (|RightModule| 116) (|LeftModule| 116) + (|RightModule| 115) (|LeftModule| 115) (|LeftModule| $$) (|Rng|) (|RightModule| $$) (|OrderedCancellationAbelianMonoid|) @@ -1096,97 +1095,97 @@ (|OrderedAbelianMonoid|) (|CancellationAbelianMonoid|) (|OrderedAbelianSemiGroup|) - (|LinearSet| 116) (|LinearSet| $$) + (|LinearSet| 115) (|LinearSet| $$) (|AbelianMonoid|) (|Monoid|) - (|PatternMatchable| 113) (|OrderedSet|) - (|LeftLinearSet| 116) - (|RightLinearSet| 116) + (|PatternMatchable| 112) (|OrderedSet|) + (|LeftLinearSet| 115) + (|RightLinearSet| 115) (|LeftLinearSet| $$) (|RightLinearSet| $$) (|AbelianSemiGroup|) (|SemiGroup|) (|LeftLinearSet| 26) (|TranscendentalFunctionCategory|) - (|RetractableTo| 116) + (|RetractableTo| 115) (|RetractableTo| 26) (|RealConstant|) - (|SetCategory|) (|ConvertibleTo| 51) + (|SetCategory|) (|ConvertibleTo| 50) (|ElementaryFunctionCategory|) (|ArcHyperbolicFunctionCategory|) (|HyperbolicFunctionCategory|) (|ArcTrigonometricFunctionCategory|) (|TrigonometricFunctionCategory|) - (|OpenMath|) (|ConvertibleTo| 156) + (|OpenMath|) (|ConvertibleTo| 155) (|RadicalCategory|) - (|ConvertibleTo| 113) + (|ConvertibleTo| 112) (|ConvertibleTo| 13) - (|CoercibleFrom| 116) + (|CoercibleFrom| 115) (|CoercibleFrom| $$) (|CoercibleFrom| 26) (|BasicType|) - (|CoercibleTo| 48)) - (|makeByteWordVec2| 165 + (|CoercibleTo| 47)) + (|makeByteWordVec2| 164 '(0 6 0 7 2 9 0 8 6 10 1 9 11 0 12 2 9 - 11 0 13 15 1 9 11 0 16 1 9 11 0 17 0 - 26 0 30 2 24 19 0 0 31 2 24 0 24 0 32 - 1 0 0 26 33 2 0 0 24 0 35 2 26 0 0 0 - 40 0 26 0 41 2 26 0 0 0 42 1 48 0 13 - 49 1 51 0 13 52 1 19 0 0 56 1 107 13 - 13 108 2 107 13 13 13 110 1 113 0 13 - 114 0 26 0 120 0 24 0 123 2 26 0 26 0 - 131 2 26 0 0 117 132 0 116 0 133 0 - 117 0 134 2 26 19 0 0 135 2 24 0 0 - 117 136 1 116 0 26 137 1 26 0 0 138 2 - 117 19 0 0 139 2 117 0 0 117 140 2 26 - 141 0 0 142 2 26 19 0 0 143 2 116 0 - 26 26 144 1 26 0 0 145 2 26 0 117 0 - 146 2 26 19 0 0 147 1 116 19 0 148 1 - 116 19 0 149 1 116 19 0 150 1 116 26 - 0 151 1 116 26 0 152 1 26 19 0 153 2 - 0 19 0 0 1 1 0 19 0 100 1 0 26 0 36 1 - 0 165 0 1 1 0 0 0 1 1 0 19 0 1 1 0 0 - 0 1 1 0 0 0 89 1 0 0 0 77 2 0 104 0 0 - 1 1 0 0 0 1 1 0 157 0 1 1 0 0 0 68 2 - 0 19 0 0 1 1 0 0 0 87 1 0 0 0 75 1 0 - 26 0 130 1 0 0 0 92 1 0 0 0 79 0 0 0 - 1 1 0 0 0 1 1 0 125 0 126 1 0 128 0 - 129 1 0 116 0 124 1 0 26 0 127 2 0 0 - 0 0 1 1 0 104 0 105 2 0 116 0 117 119 - 3 0 116 0 117 117 118 2 0 0 0 0 1 1 0 - 163 158 1 1 0 19 0 1 0 0 24 29 1 0 19 - 0 1 0 0 0 47 3 0 155 0 156 155 1 1 0 - 26 0 43 1 0 19 0 101 2 0 0 0 26 1 1 0 - 0 0 1 1 0 19 0 99 2 0 159 158 0 1 0 0 - 0 39 2 0 0 0 0 65 0 0 0 38 2 0 0 0 0 - 64 1 0 26 0 27 1 0 0 0 34 1 0 0 0 69 - 1 0 0 0 74 1 0 0 158 1 2 0 0 0 0 1 1 - 0 8 0 1 1 0 0 0 1 1 0 102 0 103 2 0 - 164 164 164 1 1 0 0 158 1 2 0 0 0 0 1 - 1 0 0 0 1 1 0 0 0 1 3 0 0 26 26 24 - 112 2 0 0 26 26 1 1 0 157 0 1 2 0 160 - 0 0 1 3 0 162 0 0 0 1 2 0 104 0 0 1 2 - 0 159 158 0 1 1 0 26 0 28 0 0 0 46 1 - 0 0 0 73 1 0 117 0 1 2 0 141 0 0 1 0 - 0 24 1 1 0 0 0 106 2 0 0 0 117 1 1 0 - 0 0 90 1 0 0 0 80 1 0 0 0 91 1 0 0 0 - 78 1 0 0 0 88 1 0 0 0 76 1 0 51 0 53 - 1 0 156 0 1 1 0 113 0 115 1 0 13 0 14 - 1 0 0 116 1 1 0 0 26 72 1 0 0 116 1 1 - 0 0 0 1 1 0 0 26 72 1 0 48 0 50 0 0 - 117 1 1 0 0 0 1 0 0 24 37 2 0 19 0 0 - 1 0 0 24 25 1 0 0 0 95 2 0 0 0 0 122 - 1 0 0 0 83 2 0 19 0 0 1 1 0 0 0 93 1 - 0 0 0 81 1 0 0 0 98 1 0 0 0 86 1 0 0 - 0 96 1 0 0 0 84 1 0 0 0 97 1 0 0 0 85 - 1 0 0 0 94 1 0 0 0 82 1 0 0 0 121 0 0 - 0 23 0 0 0 44 2 0 11 9 0 21 3 0 11 9 - 0 19 22 1 0 8 0 18 2 0 8 0 19 20 1 0 - 0 0 109 1 0 0 0 1 2 0 0 0 117 1 2 0 0 - 0 0 111 2 0 19 0 0 58 2 0 19 0 0 55 2 - 0 19 0 0 66 2 0 19 0 0 57 2 0 19 0 0 - 54 2 0 0 0 26 67 2 0 0 0 0 45 2 0 0 0 - 0 61 1 0 0 0 59 2 0 0 0 0 60 2 0 0 0 - 0 71 2 0 0 0 116 154 2 0 0 0 26 70 2 - 0 0 0 117 1 2 0 0 0 24 1 2 0 0 116 0 - 1 2 0 0 0 116 1 2 0 0 0 0 62 2 0 0 26 - 0 63 2 0 0 117 0 1 2 0 0 24 0 35))))) + 11 0 13 15 1 9 11 0 16 1 9 11 0 17 2 + 24 19 0 0 30 2 24 0 24 0 31 1 0 0 26 + 32 2 0 0 24 0 34 2 26 0 0 0 39 0 26 0 + 40 2 26 0 0 0 41 1 47 0 13 48 1 50 0 + 13 51 1 19 0 0 55 1 106 13 13 107 2 + 106 13 13 13 109 1 112 0 13 113 0 26 + 0 119 0 24 0 122 2 26 0 26 0 130 2 26 + 0 0 116 131 0 115 0 132 0 116 0 133 2 + 26 19 0 0 134 2 24 0 0 116 135 1 115 + 0 26 136 1 26 0 0 137 2 116 19 0 0 + 138 2 116 0 0 116 139 2 26 140 0 0 + 141 2 26 19 0 0 142 2 115 0 26 26 143 + 1 26 0 0 144 2 26 0 116 0 145 2 26 19 + 0 0 146 1 115 19 0 147 1 115 19 0 148 + 1 115 19 0 149 1 115 26 0 150 1 115 + 26 0 151 1 26 19 0 152 2 0 19 0 0 1 1 + 0 19 0 99 1 0 26 0 35 1 0 164 0 1 1 0 + 0 0 1 1 0 19 0 1 1 0 0 0 1 1 0 0 0 88 + 1 0 0 0 76 2 0 103 0 0 1 1 0 0 0 1 1 + 0 156 0 1 1 0 0 0 67 2 0 19 0 0 1 1 0 + 0 0 86 1 0 0 0 74 1 0 26 0 129 1 0 0 + 0 91 1 0 0 0 78 0 0 0 1 1 0 0 0 1 1 0 + 124 0 125 1 0 127 0 128 1 0 115 0 123 + 1 0 26 0 126 2 0 0 0 0 1 1 0 103 0 + 104 2 0 115 0 116 118 3 0 115 0 116 + 116 117 2 0 0 0 0 1 1 0 162 157 1 1 0 + 19 0 1 0 0 24 29 1 0 19 0 1 0 0 0 46 + 3 0 154 0 155 154 1 1 0 26 0 42 1 0 + 19 0 100 2 0 0 0 26 1 1 0 0 0 1 1 0 + 19 0 98 2 0 158 157 0 1 0 0 0 38 2 0 + 0 0 0 64 0 0 0 37 2 0 0 0 0 63 1 0 26 + 0 27 1 0 0 0 33 1 0 0 0 68 1 0 0 0 73 + 1 0 0 157 1 2 0 0 0 0 1 1 0 8 0 1 1 0 + 0 0 1 1 0 101 0 102 2 0 163 163 163 1 + 1 0 0 157 1 2 0 0 0 0 1 1 0 0 0 1 1 0 + 0 0 1 3 0 0 26 26 24 111 2 0 0 26 26 + 1 1 0 156 0 1 2 0 159 0 0 1 3 0 161 0 + 0 0 1 2 0 103 0 0 1 2 0 158 157 0 1 1 + 0 26 0 28 0 0 0 45 1 0 0 0 72 1 0 116 + 0 1 2 0 140 0 0 1 0 0 24 1 1 0 0 0 + 105 2 0 0 0 116 1 1 0 0 0 89 1 0 0 0 + 79 1 0 0 0 90 1 0 0 0 77 1 0 0 0 87 1 + 0 0 0 75 1 0 50 0 52 1 0 155 0 1 1 0 + 112 0 114 1 0 13 0 14 1 0 0 115 1 1 0 + 0 26 71 1 0 0 115 1 1 0 0 0 1 1 0 0 + 26 71 1 0 47 0 49 0 0 116 1 1 0 0 0 1 + 0 0 24 36 2 0 19 0 0 1 0 0 24 25 1 0 + 0 0 94 2 0 0 0 0 121 1 0 0 0 82 2 0 + 19 0 0 1 1 0 0 0 92 1 0 0 0 80 1 0 0 + 0 97 1 0 0 0 85 1 0 0 0 95 1 0 0 0 83 + 1 0 0 0 96 1 0 0 0 84 1 0 0 0 93 1 0 + 0 0 81 1 0 0 0 120 0 0 0 23 0 0 0 43 + 2 0 11 9 0 21 3 0 11 9 0 19 22 1 0 8 + 0 18 2 0 8 0 19 20 1 0 0 0 108 1 0 0 + 0 1 2 0 0 0 116 1 2 0 0 0 0 110 2 0 + 19 0 0 57 2 0 19 0 0 54 2 0 19 0 0 65 + 2 0 19 0 0 56 2 0 19 0 0 53 2 0 0 0 + 26 66 2 0 0 0 0 44 2 0 0 0 0 60 1 0 0 + 0 58 2 0 0 0 0 59 2 0 0 0 0 70 2 0 0 + 0 115 153 2 0 0 0 26 69 2 0 0 0 116 1 + 2 0 0 0 24 1 2 0 0 115 0 1 2 0 0 0 + 115 1 2 0 0 0 0 61 2 0 0 26 0 62 2 0 + 0 116 0 1 2 0 0 24 0 34))))) '|lookupComplete|)) (MAKEPROP '|DoubleFloat| 'NILADIC T) diff --git a/src/algebra/strap/FPS-.lsp b/src/algebra/strap/FPS-.lsp index 772c59fc..98012446 100644 --- a/src/algebra/strap/FPS-.lsp +++ b/src/algebra/strap/FPS-.lsp @@ -31,7 +31,7 @@ (PROGN (LETT |dv$1| (|devaluate| |#1|) . #0=(|FloatingPointSystem&|)) (LETT |dv$| (LIST '|FloatingPointSystem&| |dv$1|) . #0#) - (LETT $ (|newShell| 21) . #0#) + (LETT $ (|newShell| 20) . #0#) (|setShellEntry| $ 0 |dv$|) (|setShellEntry| $ 3 (LETT |pv$| @@ -46,14 +46,14 @@ (LIST '#(NIL NIL NIL NIL NIL NIL (|local| |#1|) (|PositiveInteger|) (0 . |base|) (|Integer|) (4 . |float|) |FPS-;float;2IS;1| (11 . |One|) (15 . |One|) (19 . |bits|) (23 . -) (29 . *) - (35 . |max|) (39 . |quo|) (45 . |max|) |FPS-;digits;Pi;2|) - '#(|float| 51 |digits| 57) 'NIL + (35 . |quo|) (41 . |max|) |FPS-;digits;Pi;2|) + '#(|float| 47 |digits| 53) 'NIL (CONS (|makeByteWordVec2| 1 'NIL) (CONS '#() (CONS '#() - (|makeByteWordVec2| 20 + (|makeByteWordVec2| 19 '(0 6 7 8 3 6 0 9 9 7 10 0 6 0 12 0 7 0 13 0 6 7 14 2 9 0 0 0 15 2 9 0 7 0 16 - 0 6 0 17 2 9 0 0 0 18 2 9 0 0 0 19 2 - 0 0 9 9 11 0 0 7 20))))) + 2 9 0 0 0 17 2 9 0 0 0 18 2 0 0 9 9 + 11 0 0 7 19))))) '|lookupComplete|)) diff --git a/src/algebra/string.spad.pamphlet b/src/algebra/string.spad.pamphlet index fc009d84..6e1d39a9 100644 --- a/src/algebra/string.spad.pamphlet +++ b/src/algebra/string.spad.pamphlet @@ -456,7 +456,7 @@ String(): StringCategory == IndexedString(MINSTRINGINDEX) add OMwrite(x: %): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) OMputObject(dev) OMputString(dev, x pretend String) OMputEndObject(dev) @@ -467,7 +467,7 @@ String(): StringCategory == IndexedString(MINSTRINGINDEX) add OMwrite(x: %, wholeObj: Boolean): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) if wholeObj then OMputObject(dev) OMputString(dev, x pretend String) @@ -507,6 +507,8 @@ StringCategory():Category == Join(StringAggregate(), SetCategory, OpenMath) with <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/algebra/symbol.spad.pamphlet b/src/algebra/symbol.spad.pamphlet index dc99be07..3db5f61e 100644 --- a/src/algebra/symbol.spad.pamphlet +++ b/src/algebra/symbol.spad.pamphlet @@ -87,7 +87,7 @@ Symbol(): Exports == Implementation where OMwrite(x: %): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) OMputObject(dev) writeOMSym(dev, x) OMputEndObject(dev) @@ -98,7 +98,7 @@ Symbol(): Exports == Implementation where OMwrite(x: %, wholeObj: Boolean): String == s: String := "" sp := OM_-STRINGTOSTRINGPTR(s)$Lisp - dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML) + dev: OpenMathDevice := OMopenString(sp pretend String, OMencodingXML()) if wholeObj then OMputObject(dev) writeOMSym(dev, x) @@ -273,7 +273,7 @@ Symbol(): Exports == Implementation where resetNew() == count() := 0 for k in keys xcount repeat remove!(k, xcount) - void + void() scripted? sy == not ATOM(sy)$Lisp @@ -323,6 +323,8 @@ Symbol(): Exports == Implementation where <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index a580dcaf..cefcbc4e 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -1,6 +1,6 @@ -- 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 @@ -385,8 +385,8 @@ compExpression(x,m,e) == compAtomWithModemap: (%Symbol,%Mode,%Env,%List) -> %Maybe %Triple compAtomWithModemap(x,m,e,mmList) == -- 1. Get out of here f `x' cannot possibly be a constant. + mmList := [mm for mm in mmList | second mm is [.,["CONST",:.]]] null mmList => nil - -- FIXME: Reject niladic functions that are used as constants. -- 2. If the context is not specified, give up on ambigiuity. $compUniquelyIfTrue: local := m = $EmptyMode or m = $NoValueMode CATCH("compUniquely", compForm3([x],m,e,mmList)) |