diff --git a/tests/run/pure_py.py b/tests/run/pure_py.py index ecd83015b0ea7be9d8e11282dcedcbeb82e75f55..c66d0bba78c7c4be878a58fc0639e90a26b47bef 100644 --- a/tests/run/pure_py.py +++ b/tests/run/pure_py.py @@ -220,6 +220,10 @@ def test_declare_c_types(n): @cython.ccall @cython.returns(cython.double) def c_call(x): + return x + + +def call_ccall(x): """ Test that a declared return type is honoured when compiled. @@ -235,10 +239,6 @@ def c_call(x): >>> (is_compiled and 1) or result 1 """ - return x - - -def call_ccall(x): ret = c_call(x) return ret, cython.typeof(ret) @@ -247,9 +247,13 @@ def call_ccall(x): @cython.inline @cython.returns(cython.double) def cdef_inline(x): + return x + 1 + + +def call_cdef_inline(x): """ >>> result, return_type = call_cdef_inline(1) - >>> (not is_compiled and 'float') or type(return_type).__name__ + >>> (not is_compiled and 'float') or type(result).__name__ 'float' >>> (not is_compiled and 'double') or return_type 'double' @@ -258,10 +262,6 @@ def cdef_inline(x): >>> result == 2.0 or result True """ - return x + 1 - - -def call_cdef_inline(x): ret = cdef_inline(x) return ret, cython.typeof(ret) @@ -304,6 +304,12 @@ def ccall_except(x): @cython.returns(cython.long) @cython.exceptval(-1) def cdef_except(x): + if x == 0: + raise ValueError + return x+1 + + +def call_cdef_except(x): """ >>> call_cdef_except(41) 42 @@ -311,12 +317,6 @@ def cdef_except(x): Traceback (most recent call last): ValueError """ - if x == 0: - raise ValueError - return x+1 - - -def call_cdef_except(x): return cdef_except(x) diff --git a/tests/run/pure_py3.py b/tests/run/pure_py3.py index 1e07b59fda3dae4eebc1300cf6659e3ac7089f8c..4217ca43f9ca8528cc51e0533597a0767d2f8ceb 100644 --- a/tests/run/pure_py3.py +++ b/tests/run/pure_py3.py @@ -42,6 +42,10 @@ def test_struct(n: cython.int, x: cython.double) -> MyStruct2: @cython.ccall def c_call(x) -> cython.double: + return x + + +def call_ccall(x): """ Test that a declared return type is honoured when compiled. @@ -57,10 +61,6 @@ def c_call(x) -> cython.double: >>> (is_compiled and 1) or result 1 """ - return x - - -def call_ccall(x): ret = c_call(x) return ret, cython.typeof(ret) @@ -68,9 +68,13 @@ def call_ccall(x): @cython.cfunc @cython.inline def cdef_inline(x) -> cython.double: + return x + 1 + + +def call_cdef_inline(x): """ >>> result, return_type = call_cdef_inline(1) - >>> (not is_compiled and 'float') or type(return_type).__name__ + >>> (not is_compiled and 'float') or type(result).__name__ 'float' >>> (not is_compiled and 'double') or return_type 'double' @@ -79,9 +83,5 @@ def cdef_inline(x) -> cython.double: >>> result == 2.0 or result True """ - return x + 1 - - -def call_cdef_inline(x): ret = cdef_inline(x) return ret, cython.typeof(ret)