diff options
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/algebra/fr.spad.pamphlet | 8 | ||||
| -rw-r--r-- | src/algebra/gdpoly.spad.pamphlet | 2 | ||||
| -rw-r--r-- | src/algebra/lmdict.spad.pamphlet | 2 | ||||
| -rw-r--r-- | src/algebra/plot3d.spad.pamphlet | 8 | ||||
| -rw-r--r-- | src/algebra/prs.spad.pamphlet | 4 | ||||
| -rw-r--r-- | src/algebra/sups.spad.pamphlet | 2 |
7 files changed, 22 insertions, 14 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 00f98cea..5e37f27f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2008-10-17 Martin Rubey <martin.rubey@univie.ac.at> + + Fix AW/413, AW/414 + * src/algebra/fr.spad.pamphlet: Fix missing returns in loops. + * src/algebra/gdpoly.spad.pamphlet: Likewise. + * src/algebra/lmdict.spad.pamphet: Likewise. + * src/algebra/plot3d.spad.pamphlet: Likewise. + * src/algebra/prs.spad.pamphlet: Likewise. + * src/algebra/sups.spad.pamphlet: Likewise. + 2008-10-17 Waldek Hebisch <hebisch@math.uni.wroc.pl> Gabriel Dos Reis <gdr@cs.tamu.edu> diff --git a/src/algebra/fr.spad.pamphlet b/src/algebra/fr.spad.pamphlet index 4e5df0b9..39a7f429 100644 --- a/src/algebra/fr.spad.pamphlet +++ b/src/algebra/fr.spad.pamphlet @@ -168,8 +168,8 @@ Factored(R: IntegralDomain): Exports == Implementation where empty?(lf := reverse factorList x) => convert(unit x)@InputForm l := empty()$List(InputForm) for rec in lf repeat --- one?(rec.fctr) => l - ((rec.fctr) = 1) => l + ((rec.fctr) = 1) => messagePrint("WARNING (convert$Factored):_ + 1 should not appear as factor.")$OutputForm iFactor : InputForm := binary( convert("::" :: Symbol)@InputForm, [convert(rec.fctr)@InputForm, (devaluate R)$Lisp :: InputForm ]$List(InputForm) ) iExpon : InputForm := convert(rec.xpnt)@InputForm iFun : List InputForm := @@ -311,9 +311,7 @@ Factored(R: IntegralDomain): Exports == Implementation where empty?(lf := reverse factorList x) => (unit x)::OutputForm l := empty()$List(OutputForm) for rec in lf repeat --- one?(rec.fctr) => l - ((rec.fctr) = 1) => l --- one?(rec.xpnt) => + ((rec.fctr) = 1) => messagePrint "WARNING (coerce$Factored): 1 should not appear as factor." ((rec.xpnt) = 1) => l := concat(rec.fctr :: OutputForm, l) l := concat(rec.fctr::OutputForm ** rec.xpnt::OutputForm, l) diff --git a/src/algebra/gdpoly.spad.pamphlet b/src/algebra/gdpoly.spad.pamphlet index 49a77794..c2a4f4da 100644 --- a/src/algebra/gdpoly.spad.pamphlet +++ b/src/algebra/gdpoly.spad.pamphlet @@ -250,7 +250,7 @@ GeneralDistributedMultivariatePolynomial(vl,R,E): public == private where for t in reverse p repeat l := nil for i in 1..#vl1 repeat - t.k.i = 0 => l + t.k.i = 0 => "next" t.k.i = 1 => l := cons(vl1.i,l) l := cons(vl1.i ** t.k.i ::OutputForm,l) l := reverse l diff --git a/src/algebra/lmdict.spad.pamphlet b/src/algebra/lmdict.spad.pamphlet index f7b820f5..557f7aaf 100644 --- a/src/algebra/lmdict.spad.pamphlet +++ b/src/algebra/lmdict.spad.pamphlet @@ -149,7 +149,7 @@ ListMultiDictionary(S:SetCategory): MultiDictionary(S) with while not empty? p repeat x = first p => p.rest := concat(x, rest p) - s + return s p := rest p setref(s, concat(x, deref s)) s diff --git a/src/algebra/plot3d.spad.pamphlet b/src/algebra/plot3d.spad.pamphlet index 575498d5..faf926ad 100644 --- a/src/algebra/plot3d.spad.pamphlet +++ b/src/algebra/plot3d.spad.pamphlet @@ -150,10 +150,10 @@ Plot3D(): Exports == Implementation where i = 2 => third(rr.ranges) fourth(rr.ranges) for r in rest l repeat - i = 0 => union(u,first(r.ranges)) - i = 1 => union(u,second(r.ranges)) - i = 2 => union(u,third(r.ranges)) - union(u,fourth(r.ranges)) + i = 0 => u := union(u,first(r.ranges)) + i = 1 => u := union(u,second(r.ranges)) + i = 2 => u := union(u,third(r.ranges)) + u := union(u,fourth(r.ranges)) u parametricRange r == first(r.bounds) diff --git a/src/algebra/prs.spad.pamphlet b/src/algebra/prs.spad.pamphlet index f3662063..14a68daf 100644 --- a/src/algebra/prs.spad.pamphlet +++ b/src/algebra/prs.spad.pamphlet @@ -295,7 +295,7 @@ PseudoRemainderSequence(R, polR) : Specification == Implementation where old_cf1 : polR := 1 ; cf1 : polR := 0 old_cf2 : polR := 0 ; cf2 : polR := 1 repeat - zero?(Q) => construct(0::polR, 0::polR, 0::R) + zero?(Q) => return construct(0::polR, 0::polR, 0::R) (degP, degQ) := (degree(P), degree(Q)) if odd?(degP) and odd?(degQ) then a := -a if zero?(degQ) then @@ -313,7 +313,7 @@ PseudoRemainderSequence(R, polR) : Specification == Implementation where a : R := 1 old_cf2 : polR := 0 ; cf2 : polR := 1 repeat - zero?(Q) => construct(0::polR, 0::R) + zero?(Q) => return construct(0::polR, 0::R) (degP, degQ) := (degree(P), degree(Q)) if odd?(degP) and odd?(degQ) then a := -a if zero?(degQ) then diff --git a/src/algebra/sups.spad.pamphlet b/src/algebra/sups.spad.pamphlet index 289a0f64..6ab0b1f3 100644 --- a/src/algebra/sups.spad.pamphlet +++ b/src/algebra/sups.spad.pamphlet @@ -619,7 +619,7 @@ InnerSparseUnivariatePowerSeries(Coef): Exports == Implementation where -- try to compute the order of 'ups2' n : I := _$streamCount$Lisp for i in 1..n while not explicitEntries? y repeat - explicitlyEmpty? y => coefficient(ups1,0) :: % + explicitlyEmpty? y => return coefficient(ups1,0) :: % lazyEvaluate y explicitlyEmpty? y => coefficient(ups1,0) :: % yOrd : I := |