diff options
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/algebra/indexedp.spad.pamphlet | 10 | ||||
| -rw-r--r-- | src/algebra/poly.spad.pamphlet | 1 | ||||
| -rw-r--r-- | src/interp/compiler.boot | 1 |
4 files changed, 16 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b3d12360..806db287 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,14 @@ 2009-07-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/compiler.boot (coerceEasy): Don't pretend we can make + matter our of void. + * algebra/indexedp.spad.pamphlet + (IndexedDirectProductAbelianMonoid): Tidy. + (IndexedDirectProductAbelianGroup): Likewise. + * src/algebra/poly.spad.pamphlet (PolynomialRing): Fix thinko. + +2009-07-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + * algebra/matstor.spad.pamphlet (copyCol!): Return Void. 2009-07-05 Gabriel Dos Reis <gdr@cs.tamu.edu> diff --git a/src/algebra/indexedp.spad.pamphlet b/src/algebra/indexedp.spad.pamphlet index eb949535..d5c7eade 100644 --- a/src/algebra/indexedp.spad.pamphlet +++ b/src/algebra/indexedp.spad.pamphlet @@ -150,8 +150,9 @@ IndexedDirectProductAbelianMonoid(A:AbelianMonoid,S:OrderedSet): else res := newcell; endcell := res - if empty? x then end := y - else end := x + end := + empty? x => y + x if empty? res then res := end else qsetrest!(endcell, end) res @@ -284,8 +285,9 @@ IndexedDirectProductAbelianGroup(A:AbelianGroup,S:OrderedSet): else res := newcell; endcell := res - if empty? x then end := - y - else end := x + end := + empty? x => - y + x if empty? res then res := end else qsetrest!(endcell, end) res diff --git a/src/algebra/poly.spad.pamphlet b/src/algebra/poly.spad.pamphlet index 19ec9808..f311fc97 100644 --- a/src/algebra/poly.spad.pamphlet +++ b/src/algebra/poly.spad.pamphlet @@ -162,6 +162,7 @@ PolynomialRing(R:Ring,E:OrderedAbelianMonoid): T == C res, endcell, newend, xx: Rep if entireRing? then for tx in x repeat tx.c := r*tx.c + x else xx := x res := empty() diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index f5b1e292..386b0014 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -1606,7 +1606,6 @@ coerceEasy(T,m) == m=$EmptyMode => T m=$NoValueMode or m=$Void => [T.expr,m,T.env] T.mode =m => T - T.mode =$NoValueMode => T T.mode =$Exit => [["PROGN", T.expr, ["userError", '"Did not really exit."]], m,T.env] |