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

Merge remote-tracking branch 'origin/v0.6.0' into v0.7.0

Browse Source 
# Conflicts:
#	.github/workflows/ci.yml
#	src/ifcparse/IfcParse.cpp
This commit is contained in:
Thomas Krijnen
2021-09-24 09:03:58 +02:00
parent e1a5de793a 4868edaa83
commit 768b754a0b
510 changed files with 12218 additions and 3312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/express/express_parser.py
+1193 -204
View File
File diff suppressed because it is too large Load Diff
src/ifcopenshell-python/ifcopenshell/express/implementation.py
+11 -7
View File
@@ -334,13 +334,17 @@ class Implementation(codegen.Base):
)
simple_type_impl.append("")
external_definitions = [
("extern entity* %s_%%s_type;" % schema_name_upper) % n for n in mapping.schema.entities.keys()
] + [
("extern type_declaration* %s_%%s_type;" % schema_name_upper) % n for n in mapping.schema.simpletypes.keys()
] + [
("extern enumeration_type* %s_%%s_type;" % schema_name_upper) % n for n in mapping.schema.enumerations.keys()
]
external_definitions = (
[("extern entity* %s_%%s_type;" % schema_name_upper) % n for n in mapping.schema.entities.keys()]
+ [
("extern type_declaration* %s_%%s_type;" % schema_name_upper) % n
for n in mapping.schema.simpletypes.keys()
]
+ [
("extern enumeration_type* %s_%%s_type;" % schema_name_upper) % n
for n in mapping.schema.enumerations.keys()
]
)
self.str = templates.implementation % {
"schema_name_upper": schema_name_upper,
src/ifcopenshell-python/ifcopenshell/express/schema_class.py
+6 -4
View File
@@ -488,10 +488,12 @@ class SchemaClass(codegen.Base):
for name, tys in subtypes.items():
x.entity_subtypes(name, tys)
can_be_instantiated_set = set(list(mapping.schema.entities.keys()) + \
list(mapping.schema.simpletypes.keys()) + \
list(mapping.schema.enumerations.keys()))
can_be_instantiated_set = set(
list(mapping.schema.entities.keys())
+ list(mapping.schema.simpletypes.keys())
+ list(mapping.schema.enumerations.keys())
)
x.finalize(can_be_instantiated_set)
self.str = str(x)