diff options
author | dos-reis <gdr@axiomatics.org> | 2011-08-14 21:23:34 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2011-08-14 21:23:34 +0000 |
commit | 7dff09b8cac803d6936887fdfa286a2a25073ac2 (patch) | |
tree | 1f82b9c5f57145f6f2234617bb35503666f0b2dc /src/algebra/sgcf.spad.pamphlet | |
parent | 775f2c3cca11ab64df713afb7f35363afe5d4ce0 (diff) | |
download | open-axiom-7dff09b8cac803d6936887fdfa286a2a25073ac2.tar.gz |
* 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.
Diffstat (limited to 'src/algebra/sgcf.spad.pamphlet')
-rw-r--r-- | src/algebra/sgcf.spad.pamphlet | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/algebra/sgcf.spad.pamphlet b/src/algebra/sgcf.spad.pamphlet index c6eb2ffd..c16691d8 100644 --- a/src/algebra/sgcf.spad.pamphlet +++ b/src/algebra/sgcf.spad.pamphlet @@ -213,7 +213,7 @@ SymmetricGroupCombinatoricFunctions(): public == private where s : I := 0 sOld: I y : I - for y in 0..n repeat + for y: free in 0..n repeat sOld := s s := s + numberOfImproperPartitions(n-y,m-t-1) if s > k then leave @@ -242,7 +242,7 @@ SymmetricGroupCombinatoricFunctions(): public == private where cm := cm - 1 sOld : I y : I - for y in n..1 by -1 repeat --determination of the next son + for y: free in n..1 by -1 repeat --determination of the next son sOld := s -- remember old s -- this functions counts the number of elements in a subtree s := s + numberOfImproperPartitionsInternal(n-y,m,cm) @@ -271,7 +271,7 @@ SymmetricGroupCombinatoricFunctions(): public == private where s : I := m for t in 0..(m-1) repeat y : Integer - for y in (s-1)..(n+1) repeat + for y: free in (s-1)..(n+1) repeat if binomial$ICF (y,s) > mm then leave l := append (l,list(y-1)$(L I)) mm := mm - binomial$ICF (y-1,s) @@ -405,7 +405,7 @@ SymmetricGroupCombinatoricFunctions(): public == private where -- vrest(k) := alpha(k) coleman := new(nrow,ncol,0) j : I := 0 - for i in (j+1)::NNI..nrow-1 repeat + for i: local in (j+1)::NNI..nrow-1 repeat succ := nextPartition(vrest,vnull,beta(i)) coleman := setRow!(coleman, i, succ) vrest := vrest - succ |