From 7dff09b8cac803d6936887fdfa286a2a25073ac2 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 14 Aug 2011 21:23:34 +0000 Subject: * interp/lisp-backend.boot ($freeVarName): New global constant. (loopVarInit): New. (expandIN): Use it. (expandON): Likewise. (expandSTEP): Likewise. (massageFreeVarInits): New. (expandLoop): Use it. * interp/fnewmeta.lisp (PARSE-QuantifiedVariable): Tidy. (PARSE-AnyId): Likewise. (PARSE-Variable): New. Allow scope-of-type specification for loop variable. (PARSE-Iterator): Use it. * interp/compiler.boot (massage_llop): Don't check $mayHaveFreeIteratorVariables. (compRepeatOrCollect): Don't bind it. (classifyIteratorVariable): New. (complainIfShadowing): Remove as no longer needed. (compStepIterator): Use it. Tidy. (compONIterator, compINIterator): New. Split out of compIterator. (compIterator): Refactor. * interp/functor.boot (optFunctorBody): Fix thinko. * interp/g-opt.boot (optCollectVector): A STEP iterator may have a storage class. * algebra/clip.spad.pamphlet: Fix loop variable scope. * algebra/ffpoly.spad.pamphlet: Likewise. * algebra/fparfrac.spad.pamphlet: Likewise. * algebra/gdpoly.spad.pamphlet: Likewise. * algebra/ghensel.spad.pamphlet: Likewise. * algebra/groebsol.spad.pamphlet: Likewise. * algebra/intfact.spad.pamphlet: Likewise. * algebra/matfuns.spad.pamphlet: Likewise. * algebra/moddfact.spad.pamphlet: Likewise. * algebra/numtheor.spad.pamphlet: Likewise. * algebra/permgrps.spad.pamphlet: Likewise. * algebra/pfbr.spad.pamphlet: Likewise. * algebra/pgcd.spad.pamphlet: Likewise. * algebra/pleqn.spad.pamphlet: Likewise. * algebra/pseudolin.spad.pamphlet: Likewise. * algebra/radeigen.spad.pamphlet: Likewise. * algebra/radix.spad.pamphlet: Likewise. * algebra/regset.spad.pamphlet: Likewise. * algebra/rep2.spad.pamphlet: Likewise. * algebra/sgcf.spad.pamphlet: Likewise. * algebra/smith.spad.pamphlet: Likewise. * algebra/sregset.spad.pamphlet: Likewise. * algebra/syssolp.spad.pamphlet: Likewise. * algebra/zerodim.spad.pamphlet: Likewise. * algebra/crfp.spad.pamphlet: Remove capsule-level declaration of local variables. * algebra/galfact.spad.pamphlet: Likewise. * algebra/mathml.spad.pamphlet: Likewise. * algebra/numode.spad.pamphlet: Likewise. * algebra/tex.spad.pamphlet: Likewise. * algebra/updecomp.spad.pamphlet: Likewise. --- src/algebra/sregset.spad.pamphlet | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/algebra/sregset.spad.pamphlet') diff --git a/src/algebra/sregset.spad.pamphlet b/src/algebra/sregset.spad.pamphlet index c301db79..a476fd73 100644 --- a/src/algebra/sregset.spad.pamphlet +++ b/src/algebra/sregset.spad.pamphlet @@ -379,14 +379,14 @@ SquareFreeQuasiComponentPackage(R,E,V,P,TS): Exports == Implementation where (empty? leq) or (empty? lineq) => ([leq, ts, lineq]$Branch)::UBF if b4 then - for q in lineq repeat + for q: local in lineq repeat zero? initiallyReduce(q,ts) => return("failed"::Union(Branch,"failed")) if b5 then newleq: LP := [] for p in leq repeat - for q in lineq repeat + for q: local in lineq repeat if mvar(p) = mvar(q) then g := gcd(p,q) @@ -637,12 +637,12 @@ SquareFreeRegularTriangularSetGcdPackage(R,E,V,P,TS): Exports == Implementation p3: P := LazardQuotient2(p2, leadingCoefficient(p2,v), s, delta) zero?(degree(p3,v)) => toReturn := cons([p3,lpwt.tower]$PWT, toReturn) - for lpwt in toSee repeat + for lpwt: local in toSee repeat toReturn := cons([p3,lpwt.tower]$PWT, toReturn) (p1, p2) := (p3, next_subResultant2(p1, p2, p3, s)) s := leadingCoefficient(p1,v) llpwt := cons([[p1,p2,s],lpwt.tower]$LpWT, llpwt) - for lpwt in toSee repeat + for lpwt: local in toSee repeat llpwt := cons([[p1,p2,s],lpwt.tower]$LpWT, llpwt) toReturn @@ -716,7 +716,7 @@ SquareFreeRegularTriangularSetGcdPackage(R,E,V,P,TS): Exports == Implementation (ground? g) or (mvar(g) < v) => lts := augment(ts_v,ts)$TS lts := augment(members(ts_v_+),lts)$TS - for ts in lts repeat + for ts: local in lts repeat lbwt := cons([true, ts]$BWT,lbwt) g := mainPrimitivePart g lts_g := augment(g,ts)$TS @@ -801,7 +801,7 @@ SquareFreeRegularTriangularSetGcdPackage(R,E,V,P,TS): Exports == Implementation (ground? g) or (mvar(g) < v) => lts := augment(ts_v,ts)$TS lts := augment(members(ts_v_+),lts)$TS - for ts in lts repeat + for ts: local in lts repeat lbwt := cons([true, ts]$BWT,lbwt) g := mainPrimitivePart g lts_g := augment(g,ts)$TS @@ -1091,7 +1091,7 @@ SquareFreeRegularSetDecompositionPackage(R,E,V,P,TS): Exports == Implementation s: String := concat ["[", string((#toSee)::Z), " ", convert(lpwt)@String] m: N := #(lpwt.val) toSee := rest toSee - for lpwt in toSee repeat + for lpwt: local in toSee repeat m := m + #(lpwt.val) s := concat [s, ",", convert(lpwt)@String] s := concat [s, " -> |", string(m::Z), "|; {", string(n::Z),"}]"] -- cgit v1.2.3