From: Stefan Behnel Date: Sat, 6 Mar 2010 06:05:10 +0000 (+0100) Subject: merged with latest cython-devel X-Git-Tag: 0.13.beta0~2^2~102 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8780b4c361163bd4ba75b3c0a3a153cd02fe34ab;p=cython.git merged with latest cython-devel --- 8780b4c361163bd4ba75b3c0a3a153cd02fe34ab diff --cc Cython/Compiler/Symtab.py index 44e1ca63,13395144..483a238d --- a/Cython/Compiler/Symtab.py +++ b/Cython/Compiler/Symtab.py @@@ -223,9 -219,8 +223,10 @@@ class Scope(object) is_py_class_scope = 0 is_c_class_scope = 0 + is_closure_scope = 0 + is_cpp_class_scope = 0 is_module_scope = 0 + is_internal = 0 scope_prefix = "" in_cinclude = 0 nogil = 0 @@@ -444,10 -476,10 +483,10 @@@ if type.is_cpp_class and visibility != 'extern': constructor = type.scope.lookup(u'') if constructor is not None and PyrexTypes.best_match([], constructor.all_alternatives()) is None: - error(pos, "C++ class must have an empty constructor to be stack allocated") + error(pos, "C++ class must have a default constructor to be stack allocated") entry = self.declare(name, cname, type, pos, visibility) entry.is_variable = 1 - self.control_flow.set_state((), (name, 'initalized'), False) + self.control_flow.set_state((), (name, 'initialized'), False) return entry def declare_builtin(self, name, pos):