diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/algebra/Makefile.in | 7 | ||||
| -rw-r--r-- | src/algebra/Makefile.pamphlet | 7 | ||||
| -rw-r--r-- | src/algebra/term.spad.pamphlet | 2 | ||||
| -rw-r--r-- | src/algebra/tree.spad.pamphlet | 2 | ||||
| -rw-r--r-- | src/interp/c-util.boot | 3 |
6 files changed, 20 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 43643d8e..d12de4d5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2010-05-02 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/compiler.boot (isSubset): Expand domain representation form. + * algebra/term.spad.pamphlet (retractIfCan$Arity): Tidy. + * algebra/tree.spad.pamphlet (cyclicCopy2$Tree): Remove + unnecessary "return". + 2010-04-30 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/c-util.boot (getSuccessEnvironment): Move to here from diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 0991f83a..37f31c73 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -426,7 +426,8 @@ axiom_algebra_layer_1 = \ ORDRING ORDRING- FEVALAB FEVALAB- \ OSGROUP MAYBE DATAARY PROPLOG HOMOTOP BYTEORD \ FIELD FIELD- VECTCAT VECTCAT- IARRAY1 BOOLE \ - PROPERTY ARITY OPERCAT OPERCAT- + PROPERTY ARITY OPERCAT OPERCAT- PAIR \ + RADCAT RADCAT- axiom_algebra_layer_1_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_1)) @@ -476,7 +477,7 @@ axiom_algebra_layer_4 = \ PALETTE PARPCURV PARPC2 PARSCURV PARSC2 PARSURF \ PARSU2 PATRES2 PATTERN1 PDECAT \ REPSQ REPDB RFDIST RIDIST SPACEC SPLNODE \ - SUCH TEX1 UDVO YSTREAM PAIR ENV \ + SUCH TEX1 UDVO YSTREAM ENV \ ATRIG ATRIG- GROUP GROUP- LALG LALG- @@ -560,7 +561,7 @@ axiom_algebra_layer_9 = \ FAGROUP FAMONOID FLINEXP FLINEXP- FRETRCT FRETRCT- \ FSERIES FT IDPAG IDPOAMS INFINITY LA \ OMLO ORTHPOL PRODUCT PADICCT PMPRED PMASS \ - PTFUNC2 RADCAT RADCAT- RATRET RADUTIL UPXS2 \ + PTFUNC2 RATRET RADUTIL UPXS2 \ XFALG ZLINDEP BBTREE TABLE INTABL \ ODEIFTBL NIPROB ODEPROB OPTPROB \ PDEPROB COLOR SIG FMONCAT diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index 4377820b..ec2c0682 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -385,7 +385,8 @@ axiom_algebra_layer_1 = \ ORDRING ORDRING- FEVALAB FEVALAB- \ OSGROUP MAYBE DATAARY PROPLOG HOMOTOP BYTEORD \ FIELD FIELD- VECTCAT VECTCAT- IARRAY1 BOOLE \ - PROPERTY ARITY OPERCAT OPERCAT- + PROPERTY ARITY OPERCAT OPERCAT- PAIR \ + RADCAT RADCAT- axiom_algebra_layer_1_nrlibs = \ $(addsuffix .NRLIB/code.$(FASLEXT),$(axiom_algebra_layer_1)) @@ -450,7 +451,7 @@ axiom_algebra_layer_4 = \ PALETTE PARPCURV PARPC2 PARSCURV PARSC2 PARSURF \ PARSU2 PATRES2 PATTERN1 PDECAT \ REPSQ REPDB RFDIST RIDIST SPACEC SPLNODE \ - SUCH TEX1 UDVO YSTREAM PAIR ENV \ + SUCH TEX1 UDVO YSTREAM ENV \ ATRIG ATRIG- GROUP GROUP- LALG LALG- @@ -562,7 +563,7 @@ axiom_algebra_layer_9 = \ FAGROUP FAMONOID FLINEXP FLINEXP- FRETRCT FRETRCT- \ FSERIES FT IDPAG IDPOAMS INFINITY LA \ OMLO ORTHPOL PRODUCT PADICCT PMPRED PMASS \ - PTFUNC2 RADCAT RADCAT- RATRET RADUTIL UPXS2 \ + PTFUNC2 RATRET RADUTIL UPXS2 \ XFALG ZLINDEP BBTREE TABLE INTABL \ ODEIFTBL NIPROB ODEPROB OPTPROB \ PDEPROB COLOR SIG FMONCAT diff --git a/src/algebra/term.spad.pamphlet b/src/algebra/term.spad.pamphlet index 259b290e..c3c3b321 100644 --- a/src/algebra/term.spad.pamphlet +++ b/src/algebra/term.spad.pamphlet @@ -53,7 +53,7 @@ Arity(): Public == Private where per(n::SingleInteger) retractIfCan x == (n := rep x) < 0 => "failed" - n::Integer::NonNegativeInteger + n@Integer::NonNegativeInteger @ diff --git a/src/algebra/tree.spad.pamphlet b/src/algebra/tree.spad.pamphlet index 09d7089b..dc2b9e48 100644 --- a/src/algebra/tree.spad.pamphlet +++ b/src/algebra/tree.spad.pamphlet @@ -230,7 +230,7 @@ Tree(S: SetCategory): T==C where cyclicCopy(t) == cyclicCopy2(t, cyclicEntries t) cyclicCopy2(t, cycles) == - eqMember?(t, cycles) => return copyCycle2(t, cycles) + eqMember?(t, cycles) => copyCycle2(t, cycles) tree(value t, [cyclicCopy2(c, cycles) for c in children t]) copyCycle2(cycle, cycleList) == diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot index aeb37a22..e82cfc23 100644 --- a/src/interp/c-util.boot +++ b/src/interp/c-util.boot @@ -603,6 +603,9 @@ isSubset(x,y,e) == -- When using the old style definition, the current domain -- is considered a subset of its representation domain x = "$" and y = "Rep" => $useRepresentationHack + -- Expand domain representation form + x = "Rep" and not $useRepresentationHack => + isSubset(getRepresentation e,y,e) -- Or, if x has the Subsets property set by SubsetCategory. pred := LASSOC(opOf x,get(opOf y,"Subsets",e)) => pred -- Or, they are related by subdomain chain. |