Skip to content

Commit d9ca14e

Browse files
committed
Add redundant type casts for older Cython
1 parent fec1a5d commit d9ca14e

File tree

4 files changed

+21
-18
lines changed

4 files changed

+21
-18
lines changed

setup.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@
4545

4646

4747
define_macros = []
48-
compiler_directives = {'language_level':3, 'binding':False}
48+
compiler_directives = {
49+
'language_level': 3,
50+
'binding': False,
51+
}
4952

5053

5154
# Enable coverage tracing

src/flint/acb.pyx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ cdef class acb(flint_scalar):
364364
if ttype == FMPZ_UNKNOWN:
365365
return NotImplemented
366366
u = acb.__new__(acb)
367-
acb_add((<acb>u).val, s.val, tval, getprec())
367+
acb_add((<acb>u).val, (<acb>s).val, tval, getprec())
368368
if ttype == FMPZ_TMP: acb_clear(tval)
369369
return u
370370

@@ -386,7 +386,7 @@ cdef class acb(flint_scalar):
386386
if ttype == FMPZ_UNKNOWN:
387387
return NotImplemented
388388
u = acb.__new__(acb)
389-
acb_sub((<acb>u).val, s.val, tval, getprec())
389+
acb_sub((<acb>u).val, (<acb>s).val, tval, getprec())
390390
if ttype == FMPZ_TMP: acb_clear(tval)
391391
return u
392392

@@ -408,7 +408,7 @@ cdef class acb(flint_scalar):
408408
if ttype == FMPZ_UNKNOWN:
409409
return NotImplemented
410410
u = acb.__new__(acb)
411-
acb_mul((<acb>u).val, s.val, tval, getprec())
411+
acb_mul((<acb>u).val, (<acb>s).val, tval, getprec())
412412
if ttype == FMPZ_TMP: acb_clear(tval)
413413
return u
414414

@@ -430,7 +430,7 @@ cdef class acb(flint_scalar):
430430
if ttype == FMPZ_UNKNOWN:
431431
return NotImplemented
432432
u = acb.__new__(acb)
433-
acb_div((<acb>u).val, s.val, tval, getprec())
433+
acb_div((<acb>u).val, (<acb>s).val, tval, getprec())
434434
if ttype == FMPZ_TMP: acb_clear(tval)
435435
return u
436436

@@ -454,7 +454,7 @@ cdef class acb(flint_scalar):
454454
if ttype == FMPZ_UNKNOWN:
455455
return NotImplemented
456456
u = acb.__new__(acb)
457-
acb_pow((<acb>u).val, s.val, tval, getprec())
457+
acb_pow((<acb>u).val, (<acb>s).val, tval, getprec())
458458
if ttype == FMPZ_TMP: acb_clear(tval)
459459
return u
460460

src/flint/arb.pyx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ cdef class arb(flint_scalar):
540540
if ttype == FMPZ_UNKNOWN:
541541
return NotImplemented
542542
u = arb.__new__(arb)
543-
arb_add((<arb>u).val, s.val, tval, getprec())
543+
arb_add((<arb>u).val, (<arb>s).val, tval, getprec())
544544
if ttype == FMPZ_TMP: arb_clear(tval)
545545
return u
546546

@@ -562,7 +562,7 @@ cdef class arb(flint_scalar):
562562
if ttype == FMPZ_UNKNOWN:
563563
return NotImplemented
564564
u = arb.__new__(arb)
565-
arb_sub((<arb>u).val, s.val, tval, getprec())
565+
arb_sub((<arb>u).val, (<arb>s).val, tval, getprec())
566566
if ttype == FMPZ_TMP: arb_clear(tval)
567567
return u
568568

@@ -584,7 +584,7 @@ cdef class arb(flint_scalar):
584584
if ttype == FMPZ_UNKNOWN:
585585
return NotImplemented
586586
u = arb.__new__(arb)
587-
arb_mul((<arb>u).val, s.val, tval, getprec())
587+
arb_mul((<arb>u).val, (<arb>s).val, tval, getprec())
588588
if ttype == FMPZ_TMP: arb_clear(tval)
589589
return u
590590

@@ -606,7 +606,7 @@ cdef class arb(flint_scalar):
606606
if ttype == FMPZ_UNKNOWN:
607607
return NotImplemented
608608
u = arb.__new__(arb)
609-
arb_div((<arb>u).val, s.val, tval, getprec())
609+
arb_div((<arb>u).val, (<arb>s).val, tval, getprec())
610610
if ttype == FMPZ_TMP: arb_clear(tval)
611611
return u
612612

@@ -630,7 +630,7 @@ cdef class arb(flint_scalar):
630630
if ttype == FMPZ_UNKNOWN:
631631
return NotImplemented
632632
u = arb.__new__(arb)
633-
arb_pow((<arb>u).val, s.val, tval, getprec())
633+
arb_pow((<arb>u).val, (<arb>s).val, tval, getprec())
634634
if ttype == FMPZ_TMP: arb_clear(tval)
635635
return u
636636

src/flint/fmpz.pyx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ cdef class fmpz(flint_scalar):
180180
ttype = fmpz_set_any_ref(tval, t)
181181
if ttype != FMPZ_UNKNOWN:
182182
u = fmpz.__new__(fmpz)
183-
fmpz_add((<fmpz>u).val, s.val, tval)
183+
fmpz_add((<fmpz>u).val, (<fmpz>s).val, tval)
184184
if ttype == FMPZ_TMP: fmpz_clear(tval)
185185
return u
186186

@@ -202,7 +202,7 @@ cdef class fmpz(flint_scalar):
202202
ttype = fmpz_set_any_ref(tval, t)
203203
if ttype != FMPZ_UNKNOWN:
204204
u = fmpz.__new__(fmpz)
205-
fmpz_sub((<fmpz>u).val, s.val, tval)
205+
fmpz_sub((<fmpz>u).val, (<fmpz>s).val, tval)
206206
if ttype == FMPZ_TMP: fmpz_clear(tval)
207207
return u
208208

@@ -224,7 +224,7 @@ cdef class fmpz(flint_scalar):
224224
ttype = fmpz_set_any_ref(tval, t)
225225
if ttype != FMPZ_UNKNOWN:
226226
u = fmpz.__new__(fmpz)
227-
fmpz_mul((<fmpz>u).val, s.val, tval)
227+
fmpz_mul((<fmpz>u).val, (<fmpz>s).val, tval)
228228
if ttype == FMPZ_TMP: fmpz_clear(tval)
229229
return u
230230

@@ -250,7 +250,7 @@ cdef class fmpz(flint_scalar):
250250
fmpz_clear(tval)
251251
raise ZeroDivisionError("fmpz division by zero")
252252
u = fmpz.__new__(fmpz)
253-
fmpz_fdiv_q((<fmpz>u).val, s.val, tval)
253+
fmpz_fdiv_q((<fmpz>u).val, (<fmpz>s).val, tval)
254254
if ttype == FMPZ_TMP: fmpz_clear(tval)
255255
return u
256256

@@ -280,7 +280,7 @@ cdef class fmpz(flint_scalar):
280280
fmpz_clear(tval)
281281
raise ZeroDivisionError("fmpz division by zero")
282282
u = fmpz.__new__(fmpz)
283-
fmpz_fdiv_r((<fmpz>u).val, s.val, tval)
283+
fmpz_fdiv_r((<fmpz>u).val, (<fmpz>s).val, tval)
284284
if ttype == FMPZ_TMP: fmpz_clear(tval)
285285
return u
286286

@@ -311,7 +311,7 @@ cdef class fmpz(flint_scalar):
311311
raise ZeroDivisionError("fmpz division by zero")
312312
u1 = fmpz.__new__(fmpz)
313313
u2 = fmpz.__new__(fmpz)
314-
fmpz_fdiv_qr((<fmpz>u1).val, (<fmpz>u2).val, s.val, tval)
314+
fmpz_fdiv_qr((<fmpz>u1).val, (<fmpz>u2).val, (<fmpz>s).val, tval)
315315
u = u1, u2
316316
if ttype == FMPZ_TMP: fmpz_clear(tval)
317317
return u
@@ -340,7 +340,7 @@ cdef class fmpz(flint_scalar):
340340
raise NotImplementedError("modular exponentiation")
341341
c = t
342342
u = fmpz.__new__(fmpz)
343-
fmpz_pow_ui((<fmpz>u).val, s.val, c)
343+
fmpz_pow_ui((<fmpz>u).val, (<fmpz>s).val, c)
344344
return u
345345

346346
def __rpow__(s, t, m):

0 commit comments

Comments
 (0)