some fixes

Nemocas · Oct 21, 2024 · 67df4ba · 67df4ba
1 parent 701c58c
commit 67df4ba
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/src/flint/FlintTypes.jl b/src/flint/FlintTypes.jl
@@ -122,9 +122,7 @@ end
 ###############################################################################
 
 mutable struct n_factor
-  num::Cint
-  exp::NTuple{15, Cint}
-  p::NTuple{15, UInt}
+  data::Flint.n_factor_t
 
   function n_factor()
     z = new()

diff --git a/src/flint/fmpz.jl b/src/flint/fmpz.jl
@@ -1621,11 +1621,11 @@ function _factor_trial_range(N::ZZRingElem, start::Int = 0, np::Int = 10^5)
   ccall((:fmpz_factor_trial_range, libflint), Nothing,
         (Ref{fmpz_factor}, Ref{ZZRingElem}, UInt, UInt), F, N, start, np)
   res = Dict{ZZRingElem, Int}()
-  for i in 1:F.num
+  for i in 1:F.data.num
     z = ZZRingElem()
     ccall((:fmpz_factor_get_fmpz, libflint), Nothing,
           (Ref{ZZRingElem}, Ref{fmpz_factor}, Int), z, F, i - 1)
-    res[z] = unsafe_load(F.exp, i)
+    res[z] = unsafe_load(F.data.exp, i)
   end
   return res, canonical_unit(N)
 end

diff --git a/src/flint/fmpz_factor.jl b/src/flint/fmpz_factor.jl
@@ -9,7 +9,7 @@ function _factor(a::ZZRingElem)
   F = fmpz_factor()
   ccall((:fmpz_factor, libflint), Nothing, (Ref{fmpz_factor}, Ref{ZZRingElem}), F, a)
   res = Dict{ZZRingElem, Int}()
-  for i in 1:F.num
+  for i in 1:F.data.num
     z = ZZRingElem()
     ccall((:fmpz_factor_get_fmpz, libflint), Nothing,
           (Ref{ZZRingElem}, Ref{fmpz_factor}, Int), z, F, i - 1)
@@ -25,9 +25,9 @@ function factor(a::T) where T <: Union{Int, UInt}
   F = n_factor()
   ccall((:n_factor, libflint), Nothing, (Ref{n_factor}, UInt), F, a)
   res = Dict{T, Int}()
-  for i in 1:F.num
-    z = F.p[i]
-    res[z] = F.exp[i]
+  for i in 1:F.data.num
+    z = F.data.p[i]
+    res[z] = F.data.exp[i]
   end
   return Fac(u, res)
 end
@@ -186,11 +186,11 @@ function factor_trial_range(N::ZZRingElem, start::Int=0, np::Int=10^5)
   F = fmpz_factor()
   ccall((:fmpz_factor_trial_range, libflint), Nothing, (Ref{fmpz_factor}, Ref{ZZRingElem}, UInt, UInt), F, N, start, np)
   res = Dict{ZZRingElem,Int}()
-  for i in 1:F.num
+  for i in 1:F.data.num
     z = ZZRingElem()
     ccall((:fmpz_factor_get_fmpz, libflint), Nothing,
       (Ref{ZZRingElem}, Ref{fmpz_factor}, Int), z, F, i - 1)
-    res[z] = unsafe_load(F.exp, i)
+    res[z] = unsafe_load(F.data.exp, i)
   end
   return res, canonical_unit(N)
 end
diff --git a/src/flint/fmpz_poly.jl b/src/flint/fmpz_poly.jl
@@ -712,11 +712,11 @@ for (factor_fn, factor_fn_inner, flint_fn) in
            z = ZZRingElem()
            ccall((:fmpz_poly_factor_get_fmpz, libflint), Nothing,
                  (Ref{ZZRingElem}, Ref{fmpz_poly_factor}), z, fac)
-           for i in 1:fac.num
+           for i in 1:fac.data.num
              f = parent(x)()
              ccall((:fmpz_poly_factor_get_fmpz_poly, libflint), Nothing,
                    (Ref{ZZPolyRingElem}, Ref{fmpz_poly_factor}, Int), f, fac, i - 1)
-             e = unsafe_load(fac.exp, i)
+             e = unsafe_load(fac.data.exp, i)
              res[f] = e
            end
            return res, z