Introduce 'activable' keyword

Cython/Compiler/ModuleNode.py

@@ -893,10 +893,11 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
     def generate_cyp_class_deferred_definitions(self, type_entries, code):
         for entry in type_entries:
             if entry.type.is_cyp_class:
-                # Generate acthon-specific classes
-                self.generate_cyp_class_reifying_entries(entry, code)
-                self.generate_cyp_class_activated_class(entry, code)
-                self.generate_cyp_class_activate_function(entry, code)
+                if entry.type.activable:
+                    # Generate acthon-specific classes
+                    self.generate_cyp_class_reifying_entries(entry, code)
+                    self.generate_cyp_class_activated_class(entry, code)
+                    self.generate_cyp_class_activate_function(entry, code)
                 # Generate cypclass attr destructor
                 self.generate_cyp_class_attrs_destructor_definition(entry, code)
                 # Generate wrapper constructor

Cython/Compiler/Nodes.py

@@ -1520,7 +1520,7 @@ class CppClassNode(CStructOrUnionDefNode, BlockNode):
                 error(self.pos, "Required template parameters must precede optional template parameters.")
         self.entry = env.declare_cpp_class(
             self.name, None, self.pos, self.cname,
-            base_classes=[], visibility=self.visibility, templates=template_types, cypclass=self.cypclass, lock_mode=self.lock_mode)
+            base_classes=[], visibility=self.visibility, templates=template_types, cypclass=self.cypclass, lock_mode=self.lock_mode, activable=self.activable)
 
     def analyse_declarations(self, env):
         if self.templates is None:
@@ -1547,7 +1547,8 @@ class CppClassNode(CStructOrUnionDefNode, BlockNode):
         base_class_types = filter(base_ok, base_types_list)
         self.entry = env.declare_cpp_class(
             self.name, scope, self.pos,
-            self.cname, base_class_types, visibility=self.visibility, templates=template_types, cypclass=self.cypclass, lock_mode=self.lock_mode)
+            self.cname, base_class_types, visibility=self.visibility, templates=template_types,
+            cypclass=self.cypclass, lock_mode=self.lock_mode, activable=self.activable)
         if self.entry is None:
             return
         self.entry.is_cpp_class = 1

Cython/Compiler/Parsing.py

@@ -3794,8 +3794,10 @@ def p_cpp_class_definition(s, pos,  ctx):
         error(s.position(), "Name options not allowed for C++ class")
     nogil = p_nogil(s) or cypclass
     lock_mode = None
+    activable = False
     if cypclass:
         lock_mode = p_cypclass_lock_mode(s)
+        activable = p_cypclass_activable(s)
     if s.sy == ':':
         s.next()
         s.expect('NEWLINE')
@@ -3824,7 +3826,7 @@ def p_cpp_class_definition(s, pos,  ctx):
         visibility = ctx.visibility,
         in_pxd = ctx.level == 'module_pxd',
         attributes = attributes,
-        templates = templates, cypclass=cypclass, lock_mode=lock_mode)
+        templates = templates, cypclass=cypclass, lock_mode=lock_mode, activable=activable)
 
 def p_cpp_class_attribute(s, ctx):
     decorators = None
@@ -3858,6 +3860,12 @@ def p_cypclass_lock_mode(s):
     else:
         return None
 
+def p_cypclass_activable(s):
+    if s.sy == 'IDENT' and s.systring == 'activable':
+        s.next()
+        return True
+    else:
+        return False
 
 #----------------------------------------------
 #

Cython/Compiler/PyrexTypes.py

@@ -4045,9 +4045,10 @@ class CypClassType(CppClassType):
 
     is_cyp_class = 1
 
-    def __init__(self, name, scope, cname, base_classes, templates=None, template_type=None, nogil=0, lock_mode=None):
+    def __init__(self, name, scope, cname, base_classes, templates=None, template_type=None, nogil=0, lock_mode=None, activable=False):
         CppClassType.__init__(self, name, scope, cname, base_classes, templates, template_type, nogil)
         self.lock_mode = lock_mode if lock_mode else "autolock"
+        self.activable = activable
 
     def empty_declaration_code(self):
         if self._empty_declaration is None:

Cython/Compiler/Symtab.py

@@ -656,7 +656,7 @@ class Scope(object):
 
     def declare_cpp_class(self, name, scope,
             pos, cname = None, base_classes = (),
-            visibility = 'extern', templates = None, cypclass=0, lock_mode=None):
+            visibility = 'extern', templates = None, cypclass=0, lock_mode=None, activable=False):
         if cname is None:
             if self.in_cinclude or (visibility != 'private'):
                 cname = name
@@ -667,7 +667,7 @@ class Scope(object):
         if not entry:
             if cypclass:
                 type = PyrexTypes.CypClassType(
-                    name, scope, cname, base_classes, templates = templates, lock_mode=lock_mode)
+                    name, scope, cname, base_classes, templates = templates, lock_mode=lock_mode, activable=activable)
             else:
                 type = PyrexTypes.CppClassType(
                     name, scope, cname, base_classes, templates = templates)
@@ -735,20 +735,21 @@ class Scope(object):
                 alloc_entry.is_builtin_cmethod = 1
                 alloc_entry.func_cname = "%s::%s" % (entry.type.empty_declaration_code(), alloc_cname)
 
-                # === Acthon ===
-                # Declare activated class
-                act_scope = CppClassScope("Activated", scope)
-                act_type = PyrexTypes.CypClassType(
-                    "Activated", act_scope, "Activated", None, templates = templates, lock_mode="nolock")
-                act_type.set_scope(act_scope)
-                act_type.namespace = entry.type
-                #scope.declare_cpp_class("Activated", act_scope, pos)
-                scope.declare("Activated", "Activated", act_type, pos, visibility)
-                # Declaring active_self member and activate function (its definition is generated automatically)
-                act_attr_name = Naming.builtin_prefix + "_active_self"
-                scope.declare_var("<active_self>", act_type, pos, cname=act_attr_name)
-                activate_type = PyrexTypes.CFuncType(act_type, [])
-                scope.declare_var("__activate__", activate_type, pos, cname="__activate__", defining = 1)
+                if entry.type.activable:
+                    # === Acthon ===
+                    # Declare activated class
+                    act_scope = CppClassScope("Activated", scope)
+                    act_type = PyrexTypes.CypClassType(
+                        "Activated", act_scope, "Activated", None, templates = templates, lock_mode="nolock")
+                    act_type.set_scope(act_scope)
+                    act_type.namespace = entry.type
+                    #scope.declare_cpp_class("Activated", act_scope, pos)
+                    scope.declare("Activated", "Activated", act_type, pos, visibility)
+                    # Declaring active_self member and activate function (its definition is generated automatically)
+                    act_attr_name = Naming.builtin_prefix + "_active_self"
+                    scope.declare_var("<active_self>", act_type, pos, cname=act_attr_name)
+                    activate_type = PyrexTypes.CFuncType(act_type, [])
+                    scope.declare_var("__activate__", activate_type, pos, cname="__activate__", defining = 1)
 
         if self.is_cpp_class_scope:
             entry.type.namespace = self.outer_scope.lookup(self.name).type
@@ -2680,7 +2681,7 @@ class CppClassScope(Scope):
     def declare_cfunction(self, name, type, pos,
                           cname=None, visibility='extern', api=0, in_pxd=0,
                           defining=0, modifiers=(), utility_code=None, overridable=False):
-        reify = self.type.is_cyp_class
+        reify = self.type.is_cyp_class and self.type.activable
         class_name = self.name.split('::')[-1]
         if name in (class_name, '__init__') and cname is None:
             reify = False