diff options
| author | dos-reis <gdr@axiomatics.org> | 2013-05-17 02:36:40 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2013-05-17 02:36:40 +0000 |
| commit | e546308ba905ffb34a8adea792d10fb3242430a8 (patch) | |
| tree | b3184026823fdd37dbdf4addc1265c60637375a6 /src/algebra | |
| parent | cd3ae903c73e2bbe0b5381f78b2094827e5e0585 (diff) | |
| download | open-axiom-e546308ba905ffb34a8adea792d10fb3242430a8.tar.gz | |
* algebra/ffp.spad.pamphlet (FiniteFieldExtensionByPolynomial)
[tableForDiscreteLogarithm]: Don't use pretend where checked
coercion is intended.
* algebra/pf.spad.pamphlet (InnerPrimeField)
[tableForDiscreteLogarithm]: Likewise.
Diffstat (limited to 'src/algebra')
| -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 |
4 files changed, 5 insertions, 7 deletions
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() |