From e9584df65c00f385474f9e4dd56b95b51e1efb65 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sat, 3 Dec 2011 04:24:04 +0000
Subject: 	* 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.

---
 src/algebra/aggcat.spad.pamphlet | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/algebra/aggcat.spad.pamphlet')

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)
-- 
cgit v1.2.3