From: Robert Bradshaw Date: Sun, 4 Oct 2009 04:26:44 +0000 (-0700) Subject: cleanup X-Git-Tag: 0.12.alpha0~180^2~4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6661c763c0acab52f9406aa7d9d6eb0b5d2d2a0;p=cython.git cleanup --- diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py index f14f1817..bf81d5b5 100644 --- a/Cython/Compiler/ExprNodes.py +++ b/Cython/Compiler/ExprNodes.py @@ -2471,9 +2471,6 @@ class SimpleCallNode(CallNode): arg_list_code.append(actual_arg.result()) result = "%s(%s)" % (self.function.result(), ', '.join(arg_list_code)) -# if self.wrapper_call or \ -# self.function.entry.is_unbound_cmethod and self.function.entry.type.is_overridable: -# result = "(%s = 1, %s)" % (Naming.skip_dispatch_cname, result) return result def generate_result_code(self, code): diff --git a/Cython/Compiler/ModuleNode.py b/Cython/Compiler/ModuleNode.py index 5552b521..5fc77ca5 100644 --- a/Cython/Compiler/ModuleNode.py +++ b/Cython/Compiler/ModuleNode.py @@ -1691,8 +1691,6 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): code.putln(code.error_goto_if_neg("__Pyx_InitCachedBuiltins()", self.pos)) - code.putln("%s = 0;" % Naming.skip_dispatch_cname); - code.putln("/*--- Global init code ---*/") self.generate_global_init_code(env, code) diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py index a1abe76a..8815de26 100644 --- a/Cython/Compiler/Nodes.py +++ b/Cython/Compiler/Nodes.py @@ -4882,11 +4882,7 @@ utility_function_predeclarations = \ typedef struct {PyObject **p; char *s; long n; char is_unicode; char intern; char is_identifier;} __Pyx_StringTabEntry; /*proto*/ -""" + """ - -static int %(skip_dispatch_cname)s = 0; - -""" % { 'skip_dispatch_cname': Naming.skip_dispatch_cname } +""" if Options.gcc_branch_hints: branch_prediction_macros = \