Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-10 17:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Virtual inheritance configurable at codegen time

Browse Source
This commit is contained in:
Thomas Krijnen
2025-01-30 13:04:14 +01:00
parent 553872ced2
commit 919df92888
6 changed files with 910 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/express/mapping.py
+7 -7
View File
@@ -23,6 +23,7 @@ import nodes
import templates
import schema
from header import USE_VIRTUAL_INHERITANCE
class Mapping:
@@ -180,12 +181,11 @@ class Mapping:
ty = ty.replace("*", "")
# https://github.com/IfcOpenShell/IfcOpenShell/issues/2805
# This is no longer applicable, we do support statically typed select types as aggregates
#
# if self.schema.is_select(attr_type.type):
# type_str = templates.untyped_list
# We do support statically typed select types as aggregates when USE_VIRTUAL_INHERITANCE=True
if self.schema.is_simpletype(ty) or str(ty) in self.express_to_cpp_typemapping.values():
if not USE_VIRTUAL_INHERITANCE and self.schema.is_select(attr_type.type):
type_str = templates.untyped_list
elif self.schema.is_simpletype(ty) or str(ty) in self.express_to_cpp_typemapping.values():
tmpl = templates.nested_array_type if is_nested_list else templates.array_type
bounds = (attr_type.bounds.lower, attr_type.bounds.upper) if attr_type.bounds else (-1, -1)
type_str = tmpl % {"instance_type": ty, "lower": bounds[0], "upper": bounds[1]}
@@ -224,8 +224,8 @@ class Mapping:
isinstance(v, nodes.SimpleType) and isinstance(v.type, nodes.StringType)
):
return "string"
# if self.schema.is_select(v):
# return "IfcUtil::IfcBaseClass"
if not USE_VIRTUAL_INHERITANCE and self.schema.is_select(v):
return "IfcUtil::IfcBaseClass"
if str(v) in self.schema.types or str(v) in self.schema.entities:
return "::%s::%s" % (self.schema.name.capitalize(), v)
else: