diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-12-21 02:20:35 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-12-21 02:20:35 +0000 |
| commit | 2f4a173a01acbc47bbe855a01ea79b18d0a0c4a0 (patch) | |
| tree | 4f15c7ade2b48e69c25bdf8ce7d721a5a016a6c1 /src/algebra/fortran.spad.pamphlet | |
| parent | 93853a12aba78b695405d9275f9ab56b01ec4269 (diff) | |
| download | open-axiom-2f4a173a01acbc47bbe855a01ea79b18d0a0c4a0.tar.gz | |
* interp/define.boot (checkRepresentation): Take a third
argument. Provide view morphisms for domain extensions.
(compCapsule): Adjust call.
* algebra/alql.spad.pamphlet (DataList): Use per and rep.
* algebra/fortmac.spad.pamphlet (MachineInteger): Likewise.
* algebra/fortran.spad.pamphlet (FortranExpression): Likewise.
* algebra/integer.spad.pamphlet (NonNegativeInteger): Likewise.
(PositiveInteger): Likewise.
* algebra/ituple.spad.pamphlet (InfiniteTuple): Likewise.
* algebra/matrix.spad.pamphlet (RectangularMatrix): Likewise.
* algebra/pf.spad.pamphlet (InnerPrimeField): Likewise.
* algebra/radix.spad.pamphlet (BinaryExpansion): Likewise.
(DecimalExpansion): Likewise.
(HexadecimalExpansion): Likewise.
Diffstat (limited to 'src/algebra/fortran.spad.pamphlet')
| -rw-r--r-- | src/algebra/fortran.spad.pamphlet | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/algebra/fortran.spad.pamphlet b/src/algebra/fortran.spad.pamphlet index 2507beda..4c6f9cc0 100644 --- a/src/algebra/fortran.spad.pamphlet +++ b/src/algebra/fortran.spad.pamphlet @@ -1622,7 +1622,7 @@ FortranExpression(basicSymbols,subscriptedSymbols,R): not empty? extras => m := fixUpSymbols(u) m case EXPR(R) => m::EXPR(R) - error("Extra symbols detected:",[string(v) for v in extras]$L(String)) + error ["Extra symbols detected:",[string(v) for v in extras]$L(String)] u notSymbol?(v:BO):Boolean == @@ -1648,7 +1648,7 @@ FortranExpression(basicSymbols,subscriptedSymbols,R): fortranFunctions : L S := f77Functions extras : L S := setDifference(ops,fortranFunctions) not empty? extras => - error("Non FORTRAN-77 functions detected:",[string(v) for v in extras]) + error ["Non FORTRAN-77 functions detected:",[string(v) for v in extras]] void() checkForNagOperators(u:EXPR R):$ == @@ -1658,8 +1658,8 @@ FortranExpression(basicSymbols,subscriptedSymbols,R): piOp : BasicOperator := operator X01AAF piSub : Equation EXPR R := equation(pi()$Pi::EXPR(R),kernel(piOp,0::EXPR(R))$EXPR(R)) - subst(u,piSub) pretend $ - u pretend $ + per subst(u,piSub) + per u -- Conditional retractions: @@ -1720,7 +1720,7 @@ FortranExpression(basicSymbols,subscriptedSymbols,R): pi():$ == kernel(operator X01AAF,0) - coerce(u:$):EXPR R == u pretend EXPR(R) + coerce(u:$):EXPR R == rep u retractIfCan(u:EXPR R):Union($,"failed") == if (extraSymbols? u) then @@ -1738,12 +1738,12 @@ FortranExpression(basicSymbols,subscriptedSymbols,R): retractIfCan(u:Symbol):Union($,"failed") == not (member?(u,basicSymbols) or scripted?(u) and member?(name u,subscriptedSymbols)) => "failed" - (((u::EXPR(R))$(EXPR R))pretend Rep)::$ + per (u::EXPR(R)) retract(u:Symbol):$ == res : Union($,"failed") := retractIfCan(u) - res case "failed" => error("Illegal Symbol Detected:",u::String) - res::$ + res case "failed" => error ["Illegal Symbol Detected:",u::String] + res @ \section{License} |