diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-05-11 19:14:29 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-05-11 19:14:29 +0000 |
| commit | 20e1bed66399cce629d08a71ca0552ed24fef1d1 (patch) | |
| tree | 000ab5b98e479d1c077fc4f6fd4a9f46c4a9451c /src/algebra/mkfunc.spad.pamphlet | |
| parent | 51422a0c6bc0128cd5635a01c402ef56ad4ed770 (diff) | |
| download | open-axiom-20e1bed66399cce629d08a71ca0552ed24fef1d1.tar.gz | |
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.
Diffstat (limited to 'src/algebra/mkfunc.spad.pamphlet')
| -rw-r--r-- | src/algebra/mkfunc.spad.pamphlet | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/algebra/mkfunc.spad.pamphlet b/src/algebra/mkfunc.spad.pamphlet index 8e7f6c39..bb7b4a5c 100644 --- a/src/algebra/mkfunc.spad.pamphlet +++ b/src/algebra/mkfunc.spad.pamphlet @@ -112,7 +112,8 @@ InputForm(): every?(atom?,destruct s)$List(%) => s sy := new()$Symbol n:NonNegativeInteger := 0 - l2 := [flatten0(x, sy, n := n + 1) for x in rest(l := destruct s)] + l := destruct s + l2 := [flatten0(x, sy, n := n + 1) for x in rest l] conv(concat(convert("SEQ"::Symbol)@%, concat(concat [u.lst for u in l2], conv( [convert("exit"::Symbol)@%, 1$%, conv(concat(first l, @@ -121,7 +122,8 @@ InputForm(): flatten0(s, sy, n) == atom? s => [nil(), s] a := convert(concat(string sy, convert(n)@String)::Symbol)@% - l2 := [flatten0(x, sy, n := n+1) for x in rest(l := destruct s)] + l := destruct s + l2 := [flatten0(x, sy, n := n+1) for x in rest l] [concat(concat [u.lst for u in l2], conv([convert( "LET"::Symbol)@%, a, conv(concat(first l, [u.symb for u in l2]))@%]$List(%))@%), a] |