diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-12-03 04:24:04 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-12-03 04:24:04 +0000 |
| commit | e9584df65c00f385474f9e4dd56b95b51e1efb65 (patch) | |
| tree | aa06687a6b7022920ab9668c3f3285728cbed388 /src/algebra | |
| parent | 543e6d9ca95c41ae2f9bf7c45c98121cc94602ed (diff) | |
| download | open-axiom-e9584df65c00f385474f9e4dd56b95b51e1efb65.tar.gz | |
* interp/g-util.boot (hasNoLeave?): Move from g-opt.boot.
(mkLabelled): New.
(mkBind): Likewise.
* interp/g-opt.boot (groupVariableDefinitions): Use them.
* algebra/aggcat.spad.pamphlet (ListAggregate) [merge!]: Declare
local variables `r' and `s' before assigning to them.
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/aggcat.spad.pamphlet | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/algebra/aggcat.spad.pamphlet b/src/algebra/aggcat.spad.pamphlet index 3d0e1e14..ab9eb619 100644 --- a/src/algebra/aggcat.spad.pamphlet +++ b/src/algebra/aggcat.spad.pamphlet @@ -2353,6 +2353,8 @@ ListAggregate(S:Type): Category == Join(StreamAggregate S, empty? p => q empty? q => p eq?(p, q) => error "cannot merge a list into itself" + r: % + t: % if f(first p, first q) then (r := t := p; p := rest p) else (r := t := q; q := rest q) |