diff options
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/algebra/ffcat.spad.pamphlet | 6 | ||||
| -rw-r--r-- | src/algebra/ffp.spad.pamphlet | 2 | ||||
| -rw-r--r-- | src/algebra/newdata.spad.pamphlet | 2 | ||||
| -rw-r--r-- | src/algebra/pf.spad.pamphlet | 2 |
5 files changed, 13 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fc269f1a..6c53e30b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,13 @@ 2013-05-16 Gabriel Dos Reis <gdr@integrable-solutions.net> + * algebra/ffp.spad.pamphlet (FiniteFieldExtensionByPolynomial) + [tableForDiscreteLogarithm]: Don't use pretend where checked + coercion is intended. + * algebra/pf.spad.pamphlet (InnerPrimeField) + [tableForDiscreteLogarithm]: Likewise. + +2013-05-16 Gabriel Dos Reis <gdr@integrable-solutions.net> + * algebra/aggcat.spad.pamphlet (AssociationListAggregate) [assoc]: Change return type to instance of Maybe. * algebra/list.spad.pamphle (AssociationList): Reflect change. diff --git a/src/algebra/ffcat.spad.pamphlet b/src/algebra/ffcat.spad.pamphlet index 621ea017..5681365d 100644 --- a/src/algebra/ffcat.spad.pamphlet +++ b/src/algebra/ffcat.spad.pamphlet @@ -472,8 +472,7 @@ DiscreteLogarithmPackage(M): public == private where a := c b := logbase ** (-n) for i in 0..end while not found repeat - rho:= search(lookup(a),exptable)_ - $Table(PositiveInteger,NNI) + rho:= search(lookup(a),exptable)$Table(PositiveInteger,NNI) rho case NNI => found := true disclog:= n * i + rho pretend Integer @@ -663,8 +662,7 @@ FiniteFieldCategory() : Category ==_ found:=false disc1:Integer:=0 for i in 0..end while not found repeat - rho:= search(lookup(c),exptable)_ - $Table(PositiveInteger,NNI) + rho:= search(lookup(c),exptable)$Table(PositiveInteger,NNI) rho case NNI => found := true disc1:=((n * i + rho)@Integer) * mult diff --git a/src/algebra/ffp.spad.pamphlet b/src/algebra/ffp.spad.pamphlet index b90ca09b..7ef80e13 100644 --- a/src/algebra/ffp.spad.pamphlet +++ b/src/algebra/ffp.spad.pamphlet @@ -197,7 +197,7 @@ FiniteFieldExtensionByPolynomial(GF:FiniteFieldCategory,_ tbl case "failed" => error "tableForDiscreteLogarithm: argument must be prime divisor_ of the order of the multiplicative group" - tbl pretend TBL + tbl :: TBL primitiveElement() == if initelt? then initializeElt() diff --git a/src/algebra/newdata.spad.pamphlet b/src/algebra/newdata.spad.pamphlet index d53ed96b..1cc2f1e4 100644 --- a/src/algebra/newdata.spad.pamphlet +++ b/src/algebra/newdata.spad.pamphlet @@ -150,7 +150,7 @@ TabulatedComputationPackage(Key ,Entry): Exports == Implementation where makingStats?() == stats? extractIfCan(k: Key): Union(Entry,"failed") == not table? => "failed" :: Union(Entry,"failed") - s: Union(Entry,"failed") := search(k,t) + s := search(k,t) s case Entry => if info? then iprint(ok)$iprintpack if stats? then used := used + 1 diff --git a/src/algebra/pf.spad.pamphlet b/src/algebra/pf.spad.pamphlet index 6ab0f69f..ae100e02 100644 --- a/src/algebra/pf.spad.pamphlet +++ b/src/algebra/pf.spad.pamphlet @@ -120,7 +120,7 @@ InnerPrimeField(p:PositiveInteger): Exports == Implementation where tbl case "failed" => error "tableForDiscreteLogarithm: argument must be prime divisor_ of the order of the multiplicative group" - tbl pretend TBL + tbl :: TBL primitiveElement() == if initelt? then initializeElt() |