Commit ca89bbbb authored by Robert Bradshaw's avatar Robert Bradshaw

Fix C++ const method declarations.

parent 26badc7c
......@@ -575,11 +575,13 @@ class CFuncDeclaratorNode(CDeclaratorNode):
# exception_check boolean True if PyErr_Occurred check needed
# nogil boolean Can be called without gil
# with_gil boolean Acquire gil around function body
# is_const_method boolean Whether this is a const method
child_attrs = ["base", "args", "exception_value"]
overridable = 0
optional_arg_count = 0
is_const_method = 0
templates = None
def analyse_templates(self):
......@@ -688,6 +690,7 @@ class CFuncDeclaratorNode(CDeclaratorNode):
exception_value = exc_val, exception_check = exc_check,
calling_convention = self.base.calling_convention,
nogil = self.nogil, with_gil = self.with_gil, is_overridable = self.overridable,
is_const_method = self.is_const_method,
templates = self.templates)
if self.optional_arg_count:
......
......@@ -2827,6 +2827,8 @@ def p_c_func_or_var_declaration(s, pos, ctx):
else:
#if api:
# s.error("'api' not allowed with variable declaration")
if is_const_method:
declarator.is_const_method = is_const_method
declarators = [declarator]
while s.sy == ',':
s.next()
......
......@@ -2336,7 +2336,7 @@ class CFuncType(CType):
def __init__(self, return_type, args, has_varargs = 0,
exception_value = None, exception_check = 0, calling_convention = "",
nogil = 0, with_gil = 0, is_overridable = 0, optional_arg_count = 0,
templates = None, is_strict_signature = False):
is_const_method = False, templates = None, is_strict_signature = False):
self.return_type = return_type
self.args = args
self.has_varargs = has_varargs
......@@ -2347,6 +2347,7 @@ class CFuncType(CType):
self.nogil = nogil
self.with_gil = with_gil
self.is_overridable = is_overridable
self.is_const_method = is_const_method
self.templates = templates
self.is_strict_signature = is_strict_signature
......@@ -2572,6 +2573,7 @@ class CFuncType(CType):
with_gil = self.with_gil,
is_overridable = self.is_overridable,
optional_arg_count = self.optional_arg_count,
is_const_method = self.is_const_method,
templates = self.templates)
result.from_fused = self.is_fused
......
......@@ -7,7 +7,7 @@ from libc.math cimport sin, cos
cdef extern from "shapes.h" namespace "shapes":
cdef cppclass Shape:
float area()
float area() const
cdef cppclass RegularPolygon(Shape):
float radius # major
......@@ -15,7 +15,7 @@ cdef cppclass RegularPolygon(Shape):
__init__(int n, float radius):
this.n = n
this.radius = radius
float area():
float area() const:
cdef double theta = pi / this.n
return this.radius * this.radius * sin(theta) * cos(theta) * this.n
......
......@@ -9,7 +9,7 @@ namespace shapes {
class Shape
{
public:
virtual float area() = 0;
virtual float area() const = 0;
Shape() { constructor_count++; }
virtual ~Shape() { destructor_count++; }
};
......@@ -24,7 +24,7 @@ namespace shapes {
this->height = height;
}
float area() { return width * height; }
float area() const { return width * height; }
int width;
int height;
......@@ -44,13 +44,13 @@ namespace shapes {
class Circle : public Shape {
public:
Circle(int radius) { this->radius = radius; }
float area() { return 3.1415926535897931f * radius; }
float area() const { return 3.1415926535897931f * radius; }
int radius;
};
class Empty : public Shape {
public:
float area() { return 0; }
float area() const { return 0; }
};
}
......
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