Commit 3a3a60e7 authored by Robert Bradshaw's avatar Robert Bradshaw

rhs -> default for clarity

parent 1cae03c0
...@@ -354,9 +354,9 @@ class CDeclaratorNode(Node): ...@@ -354,9 +354,9 @@ class CDeclaratorNode(Node):
class CNameDeclaratorNode(CDeclaratorNode): class CNameDeclaratorNode(CDeclaratorNode):
# name string The Pyrex name being declared # name string The Pyrex name being declared
# cname string or None C name, if specified # cname string or None C name, if specified
# rhs ExprNode or None the value assigned on declaration # default ExprNode or None the value assigned on declaration
child_attrs = [] child_attrs = ['default']
def analyse(self, base_type, env, nonempty = 0): def analyse(self, base_type, env, nonempty = 0):
if nonempty and self.name == '': if nonempty and self.name == '':
...@@ -368,25 +368,25 @@ class CNameDeclaratorNode(CDeclaratorNode): ...@@ -368,25 +368,25 @@ class CNameDeclaratorNode(CDeclaratorNode):
def analyse_expressions(self, env): def analyse_expressions(self, env):
self.entry = env.lookup(self.name) self.entry = env.lookup(self.name)
if self.rhs is not None: if self.default is not None:
env.control_flow.set_state(self.rhs.end_pos(), (self.entry.name, 'initalized'), True) env.control_flow.set_state(self.default.end_pos(), (self.entry.name, 'initalized'), True)
env.control_flow.set_state(self.rhs.end_pos(), (self.entry.name, 'source'), 'assignment') env.control_flow.set_state(self.default.end_pos(), (self.entry.name, 'source'), 'assignment')
self.entry.used = 1 self.entry.used = 1
if self.type.is_pyobject: if self.type.is_pyobject:
self.entry.init_to_none = False self.entry.init_to_none = False
self.entry.init = 0 self.entry.init = 0
self.rhs.analyse_types(env) self.default.analyse_types(env)
self.rhs = self.rhs.coerce_to(self.type, env) self.default = self.default.coerce_to(self.type, env)
self.rhs.allocate_temps(env) self.default.allocate_temps(env)
self.rhs.release_temp(env) self.default.release_temp(env)
def generate_execution_code(self, code): def generate_execution_code(self, code):
if self.rhs is not None: if self.default is not None:
self.rhs.generate_evaluation_code(code) self.default.generate_evaluation_code(code)
if self.type.is_pyobject: if self.type.is_pyobject:
self.rhs.make_owned_reference(code) self.default.make_owned_reference(code)
code.putln('%s = %s;' % (self.entry.cname, self.rhs.result_as(self.entry.type))) code.putln('%s = %s;' % (self.entry.cname, self.default.result_as(self.entry.type)))
self.rhs.generate_post_assignment_code(code) self.default.generate_post_assignment_code(code)
code.putln() code.putln()
class CPtrDeclaratorNode(CDeclaratorNode): class CPtrDeclaratorNode(CDeclaratorNode):
......
...@@ -1786,7 +1786,7 @@ def p_c_simple_declarator(s, ctx, empty, is_type, cmethod_flag, ...@@ -1786,7 +1786,7 @@ def p_c_simple_declarator(s, ctx, empty, is_type, cmethod_flag,
name = "" name = ""
cname = None cname = None
result = Nodes.CNameDeclaratorNode(pos, result = Nodes.CNameDeclaratorNode(pos,
name = name, cname = cname, rhs = rhs) name = name, cname = cname, default = rhs)
result.calling_convention = calling_convention result.calling_convention = calling_convention
return result return result
......
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