Commit 831a2354 authored by scoder's avatar scoder

Merge pull request #209 from nnemkin/local_error_reporting_vars

Consistently declare local error reporting variables (lineno, clineno, filename)
parents 34e5a65a f7c25fe4
......@@ -1618,6 +1618,12 @@ class CCodeWriter(object):
else:
self.putln("%s%s;" % (static and "static " or "", decl))
if func_context.should_declare_error_indicator:
# Initialize these variables to silence compiler warnings
self.putln("int %s = 0;" % Naming.lineno_cname)
self.putln("const char *%s = NULL;" % Naming.filename_cname)
self.putln("int %s = 0;" % Naming.clineno_cname)
def put_h_guard(self, guard):
self.putln("#ifndef %s" % guard)
self.putln("#define %s" % guard)
......
......@@ -1914,13 +1914,6 @@ class FuncDefNode(StatNode, BlockNode):
# ----- Go back and insert temp variable declarations
tempvardecl_code.put_temp_declarations(code.funcstate)
if code.funcstate.should_declare_error_indicator:
# Initialize these variables to silence compiler warnings
tempvardecl_code.putln("int %s = 0;" % Naming.lineno_cname)
tempvardecl_code.putln("const char *%s = NULL;" %
Naming.filename_cname)
if code.c_line_in_traceback:
tempvardecl_code.putln("int %s = 0;" % Naming.clineno_cname)
# ----- Python version
code.exit_cfunc_scope()
......
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