diff options
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/Makefile.in | 8 | ||||
| -rw-r--r-- | src/algebra/Makefile.pamphlet | 8 | ||||
| -rw-r--r-- | src/algebra/syntax.spad.pamphlet | 8 |
3 files changed, 14 insertions, 10 deletions
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index baf81660..8bd466fb 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -378,7 +378,7 @@ axiom_algebra_layer_0 = \ OM.o OMCONN.o OMDEV.o OUT.o \ PRIMCAT.o PRINT.o PTRANFN.o SPFCAT.o \ TYPE.o UTYPE.o PROPLOG.o PROPERTY.o \ - SYNTAX.o + BASTYPE.o BASTYPE-.o axiom_algebra_layer_0_nrlibs = \ $(axiom_algebra_layer_0:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) @@ -392,7 +392,7 @@ axiom_algebra_layer_1 = \ PATAB.o PLOT1.o PPCURVE.o PSCURVE.o \ REAL.o RESLATC.o RETRACT.o RETRACT-.o \ SEGBIND2.o SEGCAT.o STREAM1.o STREAM2.o \ - STREAM3.o BINDING.o CTORCALL.o + STREAM3.o BINDING.o SYNTAX.o axiom_algebra_layer_1_nrlibs = \ $(axiom_algebra_layer_1:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) @@ -400,7 +400,7 @@ axiom_algebra_layer_1_nrlibs = \ axiom_algebra_layer_1_objects = \ $(addprefix $(OUT)/, $(axiom_algebra_layer_1)) axiom_algebra_layer_2 = \ - FMC.o FMFUN.o FORTFN.o FVC.o \ + FMC.o FMFUN.o FORTFN.o FVC.o CTORCALL.o \ FVFUN.o INTRET.o SEGXCAT.o CONTOUR.o axiom_algebra_layer_2_nrlibs = \ @@ -409,7 +409,7 @@ axiom_algebra_layer_2_nrlibs = \ axiom_algebra_layer_2_objects = \ $(addprefix $(OUT)/, $(axiom_algebra_layer_2)) axiom_algebra_layer_3 = \ - AGG.o AGG-.o BASTYPE.o BASTYPE-.o \ + AGG.o AGG-.o \ GRDEF.o LIST3.o MKFUNC.o SCOPE.o axiom_algebra_layer_3_nrlibs = \ diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index 114935b0..829c6dd3 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -206,7 +206,7 @@ axiom_algebra_layer_0 = \ OM.o OMCONN.o OMDEV.o OUT.o \ PRIMCAT.o PRINT.o PTRANFN.o SPFCAT.o \ TYPE.o UTYPE.o PROPLOG.o PROPERTY.o \ - SYNTAX.o + BASTYPE.o BASTYPE-.o axiom_algebra_layer_0_nrlibs = \ $(axiom_algebra_layer_0:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) @@ -234,7 +234,7 @@ axiom_algebra_layer_1 = \ PATAB.o PLOT1.o PPCURVE.o PSCURVE.o \ REAL.o RESLATC.o RETRACT.o RETRACT-.o \ SEGBIND2.o SEGCAT.o STREAM1.o STREAM2.o \ - STREAM3.o BINDING.o CTORCALL.o + STREAM3.o BINDING.o SYNTAX.o axiom_algebra_layer_1_nrlibs = \ $(axiom_algebra_layer_1:.$(OBJEXT)=.NRLIB/code.$(OBJEXT)) @@ -249,7 +249,7 @@ axiom_algebra_layer_1_objects = \ <<layer2>>= axiom_algebra_layer_2 = \ - FMC.o FMFUN.o FORTFN.o FVC.o \ + FMC.o FMFUN.o FORTFN.o FVC.o CTORCALL.o \ FVFUN.o INTRET.o SEGXCAT.o CONTOUR.o axiom_algebra_layer_2_nrlibs = \ @@ -269,7 +269,7 @@ grdef.spad.pamphlet (GRDEF) <<layer3>>= axiom_algebra_layer_3 = \ - AGG.o AGG-.o BASTYPE.o BASTYPE-.o \ + AGG.o AGG-.o \ GRDEF.o LIST3.o MKFUNC.o SCOPE.o axiom_algebra_layer_3_nrlibs = \ diff --git a/src/algebra/syntax.spad.pamphlet b/src/algebra/syntax.spad.pamphlet index 4b3ce07f..bf95adcc 100644 --- a/src/algebra/syntax.spad.pamphlet +++ b/src/algebra/syntax.spad.pamphlet @@ -23,11 +23,12 @@ ++ and strings. This domain differs from InputForm in that it represents ++ any entity from a Spad program, not just expressions. ++ Related Constructors: Boolean, Integer, Float, symbol, String, SExpression. -++ See Also: SExpression. +++ See Also: SExpression, SetCategory +++ The equality supported by this domain is structural. ++ Fixme: Provide direct support for boolean values, arbritrary ++ precision float point values. Syntax(): Public == Private where - Public ==> Join(UnionType, CoercibleTo(OutputForm)) with + Public ==> Join(UnionType, SetCategory) with convert: % -> SExpression ++ convert(s) returns the s-expression representation of a syntax. @@ -117,6 +118,9 @@ Syntax(): Public == Private where per(x: SExpression): % == x pretend % + x = y == + EQUAL(x,y)$Lisp @ Boolean + s case Integer == integer? rep s |