From 20e1bed66399cce629d08a71ca0552ed24fef1d1 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 11 May 2008 19:14:29 +0000 Subject: Restrict loop variable scopes, take 2. * interp/iterator.boot (compReduce1): Maintain proper scope for loop variables. (compRepeatOrCollect): Really maintain proper scope for loop variables. * interp/compiler.boot (eltModemapFilter): Highlight faulty selector. (seteltModemapFilter): Likewise. * interp/c-util.boot (stackMessage): Don't build message if there is no argument for substitution. * algebra/aggcat.spad.pamphlet (#$UnaryRecursiveAggregate): Declare free loop variable. (cycleEntry$UnaryRecursiveAggregate): Likewise. (cycleLength): Likewise. (merge$OneDimensionalArrayAggregate): Likewise. (delete$OneDimensionalArrayAggregate): Likewise. (position$ListAggregate): Likewise. * algebra/array1.spad.pamphlet (merge!$IndexedFlexibleArray): Likewise. * algebra/combfunc.spad.pamphlet (K2fact$CombinatorialFunction): Likewise. * algebra/curve.spad.pamphlet (nonSingularModel$FunctionFieldCategory): Likewise. * algebra/dpolcat.spad.pamphlet (differentiate$DifferentialPolynomialCategory): Likewise. * algebra/efstruc.spad.pamphlet (validExponential$ElementaryFunctionStructurePackage): Likewise. (ker2explogs$InnerTrigonometricManipulations): Likewise. (complexNormalize$TrigonometricManipulations): Likewise. --- src/algebra/curve.spad.pamphlet | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/algebra/curve.spad.pamphlet') diff --git a/src/algebra/curve.spad.pamphlet b/src/algebra/curve.spad.pamphlet index d216b16d..7f959605 100644 --- a/src/algebra/curve.spad.pamphlet +++ b/src/algebra/curve.spad.pamphlet @@ -213,7 +213,8 @@ FunctionFieldCategory(F, UP, UPUP): Category == Definition where nonSingularModel u == d := commonDenominator(coordinates(w := integralBasis()))::RF - vars := [concat(string u, string i)::SY for i in 1..(n := #w)] + n := #w + vars := [concat(string u, string i)::SY for i in 1..n] x := "%%dummy1"::SY y := "%%dummy2"::SY select_!(zero?(degree(#1, x)) and zero?(degree(#1, y)), -- cgit v1.2.3