Ensure MatElem subtypes T have T(R::Ring, r::Int, c::Int) constructor

src/arb/ArbTypes.jl

@@ -796,6 +796,9 @@
   rows::Ptr{Nothing}
   #base_ring::ArbField
 
+  # MatElem interface
+  RealMat(::RealField, r::Int, c::Int) = RealMat(r, c)
+
   function RealMat(r::Int, c::Int)
     z = new()
     ccall((:arb_mat_init, libflint), Nothing, (Ref{RealMat}, Int, Int), z, r, c)
@@ -888,6 +891,13 @@
   rows::Ptr{Nothing}
   base_ring::ArbField
 
+  # MatElem interface
+  function ArbMatrix(R::ArbField, r::Int, c::Int)
+    z = ArbMatrix(r, c)
+    z.base_ring = R
+    return z
+  end
+
   function ArbMatrix(r::Int, c::Int)
     z = new()
     ccall((:arb_mat_init, libflint), Nothing, (Ref{ArbMatrix}, Int, Int), z, r, c)
@@ -984,6 +994,9 @@
   rows::Ptr{Nothing}
   #base_ring::AcbField
 
+  # MatElem interface
+  ComplexMat(::ComplexField, r::Int, c::Int) = ComplexMat(r, c)
+
   function ComplexMat(r::Int, c::Int)
     z = new()
     ccall((:acb_mat_init, libflint), Nothing, (Ref{ComplexMat}, Int, Int), z, r, c)
@@ -1186,6 +1199,13 @@
   rows::Ptr{Nothing}
   base_ring::AcbField
 
+  # MatElem interface
+  function AcbMatrix(R::AcbField, r::Int, c::Int)
+    z = AcbMatrix(r, c)
+    z.base_ring = R
+    return z
+  end
+
   function AcbMatrix(r::Int, c::Int)
     z = new()
     ccall((:acb_mat_init, libflint), Nothing, (Ref{AcbMatrix}, Int, Int), z, r, c)

src/arb/acb_mat.jl

@@ -11,8 +11,7 @@
 ###############################################################################
 
 function similar(::AcbMatrix, R::AcbField, r::Int, c::Int)
-  z = AcbMatrix(r, c)
-  z.base_ring = R
+  z = AcbMatrix(R, r, c)
   return z
 end
 
@@ -747,8 +746,7 @@ end
 ###############################################################################
 
 function (x::AcbMatSpace)()
-  z = AcbMatrix(nrows(x), ncols(x))
-  z.base_ring = x.base_ring
+  z = AcbMatrix(base_ring(x), nrows(x), ncols(x))
   return z
 end
 
@@ -893,8 +891,7 @@ function zero_matrix(R::AcbField, r::Int, c::Int)
   if r < 0 || c < 0
     error("dimensions must not be negative")
   end
-  z = AcbMatrix(r, c)
-  z.base_ring = R
+  z = AcbMatrix(R, r, c)
   return z
 end
 
@@ -908,9 +905,8 @@ function identity_matrix(R::AcbField, n::Int)
   if n < 0
     error("dimension must not be negative")
   end
-  z = AcbMatrix(n, n)
+  z = AcbMatrix(R, n, n)
   ccall((:acb_mat_one, libflint), Nothing, (Ref{AcbMatrix}, ), z)
-  z.base_ring = R
   return z
 end
 

src/arb/arb_mat.jl

@@ -11,8 +11,7 @@
 ###############################################################################
 
 function similar(::ArbMatrix, R::ArbField, r::Int, c::Int)
-  z = ArbMatrix(r, c)
-  z.base_ring = R
+  z = ArbMatrix(R, r, c)
   return z
 end
 
@@ -84,9 +83,8 @@ number_of_rows(a::ArbMatrix) = a.r
 number_of_columns(a::ArbMatrix) = a.c
 
 function deepcopy_internal(x::ArbMatrix, dict::IdDict)
-  z = ArbMatrix(nrows(x), ncols(x))
+  z = ArbMatrix(base_ring(x), nrows(x), ncols(x))
   ccall((:arb_mat_set, libflint), Nothing, (Ref{ArbMatrix}, Ref{ArbMatrix}), z, x)
-  z.base_ring = x.base_ring
   return z
 end
 
@@ -713,8 +711,7 @@ end
 ###############################################################################
 
 function (x::ArbMatSpace)()
-  z = ArbMatrix(nrows(x), ncols(x))
-  z.base_ring = x.base_ring
+  z = ArbMatrix(base_ring(x), nrows(x), ncols(x))
   return z
 end
 
@@ -789,8 +786,7 @@ function zero_matrix(R::ArbField, r::Int, c::Int)
   if r < 0 || c < 0
     error("dimensions must not be negative")
   end
-  z = ArbMatrix(r, c)
-  z.base_ring = R
+  z = ArbMatrix(R, r, c)
   return z
 end
 
@@ -804,9 +800,8 @@ function identity_matrix(R::ArbField, n::Int)
   if n < 0
     error("dimension must not be negative")
   end
-  z = ArbMatrix(n, n)
+  z = ArbMatrix(R, n, n)
   ccall((:arb_mat_one, libflint), Nothing, (Ref{ArbMatrix}, ), z)
-  z.base_ring = R
   return z
 end
 

src/flint/FlintTypes.jl

@@ -4738,7 +4738,10 @@
   rows::Ptr{Nothing}
   view_parent
 
-  # used by windows, not finalised!!
+  # MatElem interface
+  QQMatrix(::QQField, r::Int, c::Int) = QQMatrix(r, c)
+
+  # Used by view, not finalised!!
   function QQMatrix()
     return new()
   end
@@ -4860,6 +4863,9 @@
   rows::Ptr{Nothing}
   view_parent
 
+  # MatElem interface
+  ZZMatrix(::ZZRing, r::Int, c::Int) = ZZMatrix(r, c)
+
   # Used by view, not finalised!!
   function ZZMatrix()
     return new()
@@ -4958,10 +4964,16 @@
   base_ring::zzModRing
   view_parent
 
+  # MatElem interface
+  function zzModMatrix(R::zzModRing, r::Int, c::Int)
+    z = zzModMatrix(r, c, R.n)
+    z.base_ring = R
+    return z
+  end
+
   # Used by view, not finalised!!
   function zzModMatrix()
-    z = new()
-    return z
+    return new()
   end
 
   function zzModMatrix(r::Int, c::Int, n::UInt)
@@ -5102,10 +5114,16 @@
   base_ring::ZZModRing
   view_parent
 
+  # MatElem interface
+  function ZZModMatrix(R::ZZModRing, r::Int, c::Int)
+    z = ZZModMatrix(r, c, R.ninv)
+    z.base_ring = R
+    return z
+  end
+
   # Used by view, not finalised!!
   function ZZModMatrix()
-    z = new()
-    return z
+    return new()
   end
 
   function ZZModMatrix(r::Int, c::Int, ctx::fmpz_mod_ctx_struct)
@@ -5260,10 +5278,16 @@
   base_ring::FpField
   view_parent
 
+  # MatElem interface
+  function FpMatrix(R::FpField, r::Int, c::Int)
+    z = FpMatrix(r, c, R.ninv)
+    z.base_ring = R
+    return z
+  end
+
   # Used by view, not finalised!!
   function FpMatrix()
-    z = new()
-    return z
+    return new()
   end
 
   function FpMatrix(r::Int, c::Int, ctx::fmpz_mod_ctx_struct)
@@ -5370,10 +5394,16 @@
   base_ring::fpField
   view_parent
 
+  # MatElem interface
+  function fpMatrix(R::fpField, r::Int, c::Int)
+    z = fpMatrix(r, c, R.n)
+    z.base_ring = R
+    return z
+  end
+
   # Used by view, not finalised!!
   function fpMatrix()
-    z = new()
-    return z
+    return new()
   end
 
   function fpMatrix(r::Int, c::Int, n::UInt)
@@ -5948,7 +5978,12 @@
   base_ring::FqField
   view_parent
 
-  # used by windows, not finalised!!
+  # MatElem interface
+  function FqMatrix(R::FqField, r::Int, c::Int)
+    return FqMatrix(r, c, R)
+  end
+
+  # Used by view, not finalised!!
   function FqMatrix()
     return new()
   end
@@ -6114,7 +6149,12 @@
   base_ring::FqPolyRepField
   view_parent
 
-  # used by windows, not finalised!!
+  # MatElem interface
+  function FqPolyRepMatrix(R::FqPolyRepField, r::Int, c::Int)
+    return FqPolyRepMatrix(r, c, R)
+  end
+
+  # Used by view, not finalised!!
   function FqPolyRepMatrix()
     return new()
   end
@@ -6247,7 +6287,12 @@
   base_ring::fqPolyRepField
   view_parent
 
-  # used by windows, not finalised!!
+  # MatElem interface
+  function fqPolyRepMatrix(R::fqPolyRepField, r::Int, c::Int)
+    return fqPolyRepMatrix(r, c, R)
+  end
+
+  # Used by view, not finalised!!
   function fqPolyRepMatrix()
     return new()
   end

src/flint/fmpz_mod_mat.jl

@@ -19,8 +19,7 @@ dense_matrix_type(::Type{ZZModRingElem}) = ZZModMatrix
 ###############################################################################
 
 function similar(::MatElem, R::ZZModRing, r::Int, c::Int)
-  z = ZZModMatrix(r, c, R.ninv)
-  z.base_ring = R
+  z = ZZModMatrix(R, r, c)
   return z
 end
 
@@ -749,8 +748,7 @@ promote_rule(::Type{ZZModMatrix}, ::Type{ZZRingElem}) = ZZModMatrix
 ################################################################################
 
 function (a::ZZModMatrixSpace)()
-  z = ZZModMatrix(nrows(a), ncols(a), base_ring(a).ninv)
-  z.base_ring = a.base_ring
+  z = ZZModMatrix(base_ring(a), nrows(a), ncols(a))
   return z
 end
 
@@ -814,11 +812,10 @@ end
 
 function (a::ZZModMatrixSpace)(b::ZZMatrix)
   (ncols(a) != b.c || nrows(a) != b.r) && error("Dimensions do not fit")
-  z = ZZModMatrix(b.r, b.c, base_ring(a).ninv)
+  z = ZZModMatrix(base_ring(a), b.r, b.c)
   ccall((:fmpz_mod_mat_set_fmpz_mat, libflint), Nothing,
         (Ref{ZZModMatrix}, Ref{ZZMatrix}, Ref{fmpz_mod_ctx_struct}),
         z, b, base_ring(a).ninv)
-  z.base_ring = a.base_ring
   return z
 end
 
@@ -851,8 +848,7 @@ function zero_matrix(R::ZZModRing, r::Int, c::Int)
   if r < 0 || c < 0
     error("dimensions must not be negative")
   end
-  z = ZZModMatrix(r, c, R.ninv)
-  z.base_ring = R
+  z = ZZModMatrix(R, r, c)
   return z
 end
 

src/flint/gfp_fmpz_mat.jl

@@ -19,8 +19,7 @@ dense_matrix_type(::Type{FpFieldElem}) = FpMatrix
 ###############################################################################
 
 function similar(::MatElem, R::FpField, r::Int, c::Int)
-  z = FpMatrix(r, c, R.ninv)
-  z.base_ring = R
+  z = FpMatrix(R, r, c)
   return z
 end
 
@@ -261,8 +260,7 @@ end
 ################################################################################
 
 function (a::FpMatrixSpace)()
-  z = FpMatrix(nrows(a), ncols(a), base_ring(a).ninv)
-  z.base_ring = a.base_ring
+  z = FpMatrix(base_ring(a), nrows(a), ncols(a))
   return z
 end
 
@@ -362,8 +360,7 @@ function zero_matrix(R::FpField, r::Int, c::Int)
   if r < 0 || c < 0
     error("dimensions must not be negative")
   end
-  z = FpMatrix(r, c, R.ninv)
-  z.base_ring = R
+  z = FpMatrix(R, r, c)
   return z
 end