Commit ff81f222 authored by Dag Sverre Seljebotn's avatar Dag Sverre Seljebotn

Fixed typos, using Naming for temp prefixes

parent ffc32b04
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
pyrex_prefix = "__pyx_" pyrex_prefix = "__pyx_"
temp_prefix = "__pyxtmp_" temp_prefix = u"__cyt_"
builtin_prefix = pyrex_prefix + "builtin_" builtin_prefix = pyrex_prefix + "builtin_"
arg_prefix = pyrex_prefix + "arg_" arg_prefix = pyrex_prefix + "arg_"
......
...@@ -3330,17 +3330,19 @@ class ExceptClauseNode(Node): ...@@ -3330,17 +3330,19 @@ class ExceptClauseNode(Node):
# target ExprNode or None # target ExprNode or None
# body StatNode # body StatNode
# excinfo_target NameNode or None optional target for exception info # excinfo_target NameNode or None optional target for exception info
# excinfo_target NameNode or None used internally
# match_flag string result of exception match # match_flag string result of exception match
# exc_value ExcValueNode used internally # exc_value ExcValueNode used internally
# function_name string qualified name of enclosing function # function_name string qualified name of enclosing function
# exc_vars (string * 3) local exception variables # exc_vars (string * 3) local exception variables
# excinfo_target is never set by the parser, but can be set by a transform
# in order to extract more extensive information about the exception as a
# sys.exc_info()-style tuple into a target variable
child_attrs = ["pattern", "target", "body", "exc_value", "excinfo_target"] child_attrs = ["pattern", "target", "body", "exc_value", "excinfo_target"]
exc_value = None exc_value = None
excinfo_target = None excinfo_target = None
excinfo_assignment = None
def analyse_declarations(self, env): def analyse_declarations(self, env):
if self.target: if self.target:
......
# #
# Tree visitor and transform framework # Tree visitor and transform framework
# #
import inspect
import Nodes import Nodes
import ExprNodes import ExprNodes
import inspect import Naming
from Cython.Utils import EncodedString from Cython.Utils import EncodedString
class BasicVisitor(object): class BasicVisitor(object):
...@@ -171,7 +172,7 @@ tmpnamectr = 0 ...@@ -171,7 +172,7 @@ tmpnamectr = 0
def temp_name_handle(description): def temp_name_handle(description):
global tmpnamectr global tmpnamectr
tmpnamectr += 1 tmpnamectr += 1
return EncodedString(u"__cyt_%d_%s" % (tmpnamectr, description)) return EncodedString(Naming.temp_prefix + u"%d_%s" % (tmpnamectr, description))
def get_temp_name_handle_desc(handle): def get_temp_name_handle_desc(handle):
if not handle.startswith(u"__cyt_"): if not handle.startswith(u"__cyt_"):
......
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