Clean class detection

f90wrap/f90wrapgen.py

@@ -270,7 +270,11 @@ def write_class_lines(self, cname, recursive=False):
         self.write_type_lines(cname, recursive, f"{cname}_wrapper_type")
 
     def is_class(self, tname):
-        return "class(%(classname)s)" % {"classname": tname} in self.types
+        if not tname in self.types:
+            return False
+        if "used_as_class" in self.types[tname].attributes:
+            return True
+        return False
 
     def write_type_or_class_lines(self, tname, recursive=False):
         if self.is_class(tname):

f90wrap/fortran.py

@@ -605,6 +605,7 @@ def find_types(tree, skipped_types=None):
                     node.uses = set([(mod.name, (node.name,))])
                     types[node.name] = node
                     types['type(%s)' % node.name] = node
+                    types['class(%s)' % node.name] = node
                 else:
                     log.info('Skipping type %s defined in module %s' % (node.name, mod.name))
 
@@ -614,7 +615,8 @@ def find_types(tree, skipped_types=None):
                 continue
             if node.type.startswith('class('):
                 class_name = derived_typename(node.type)
-                types['class(%s)' % class_name] = types[class_name]
+                if 'used_as_class' not in types[class_name].attributes:
+                    types[class_name].attributes.append('used_as_class')
 
     return types