Commit 7c2bc399 authored by Stefan Behnel's avatar Stefan Behnel

merge

parents 9e733bea 45e0104d
...@@ -20,6 +20,7 @@ slice2_T636 ...@@ -20,6 +20,7 @@ slice2_T636
builtin_subtype_methods_T653 builtin_subtype_methods_T653
dict_values_in_expression dict_values_in_expression
builtin_float builtin_float
inherited_final_method
# CPython regression tests that don't current work: # CPython regression tests that don't current work:
pyregr.test_signal pyregr.test_signal
......
...@@ -59,3 +59,19 @@ def and2_literal(): ...@@ -59,3 +59,19 @@ def and2_literal():
5 5
""" """
return True and 5 return True and 5
def c_int_results(int x):
"""
>>> c_int_results(7)
(0, 0)
>>> c_int_results(5)
(1, 1)
"""
cdef int expr1, expr2, r1, r2
expr1 = x == 5
expr2 = 1
r1 = expr1 and expr2
r2 = (x==5) and 1
return r1, r2
...@@ -10,8 +10,9 @@ cdef class TestInlineMethod(object): ...@@ -10,8 +10,9 @@ cdef class TestInlineMethod(object):
0 0
""" """
@cython.test_assert_path_exists("//AttributeNode[@entry.is_final_cmethod=True]") @cython.test_assert_path_exists(
@cython.test_assert_path_exists("//AttributeNode[@entry.is_inline_cmethod=True]") "//AttributeNode[@entry.is_inline_cmethod=True]",
"//AttributeNode[@entry.is_final_cmethod=True]")
def test_cdef_method(self): def test_cdef_method(self):
return self.cdef_inline_method() return self.cdef_inline_method()
...@@ -23,7 +24,8 @@ cdef class Subtyping(TestInlineMethod): ...@@ -23,7 +24,8 @@ cdef class Subtyping(TestInlineMethod):
0 0
""" """
@cython.test_assert_path_exists("//AttributeNode[@entry.is_final_cmethod=True]") @cython.test_assert_path_exists(
@cython.test_assert_path_exists("//AttributeNode[@entry.is_inline_cmethod=True]") "//AttributeNode[@entry.is_inline_cmethod=True]",
"//AttributeNode[@entry.is_final_cmethod=True]")
def test_cdef_subtyping(self): def test_cdef_subtyping(self):
return self.cdef_inline_method() return self.cdef_inline_method()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment