From 5afad2b179159346f6daaa47c2628bb1a897ce4a Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Fri, 26 Jun 2026 16:29:27 +0200 Subject: [PATCH] Partial revert of 84abf5e91 --- .../ifcopenshell/express/rule_compiler.py | 6 +++--- .../ifcopenshell/express/rules/IFC2X3.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ifcopenshell-python/ifcopenshell/express/rule_compiler.py b/src/ifcopenshell-python/ifcopenshell/express/rule_compiler.py index a661f56b0c..36302d1229 100644 --- a/src/ifcopenshell-python/ifcopenshell/express/rule_compiler.py +++ b/src/ifcopenshell-python/ifcopenshell/express/rule_compiler.py @@ -414,7 +414,7 @@ def process_expression(context): is_literal_str_list = False if is_literal_str_list: a, b = map(str, context.simple_expression.branches()) - return f"{a}.lower() {str(context.rel_op_extended)} map(str.lower, {b})" + return f"{a}.lower() {str(context.rel_op_extended)} {b}" return concat(context.rel_op_extended, context.simple_expression) elif context.multiplication_like_op: if str(context.multiplication_like_op.branches()[0]) == "||": @@ -936,11 +936,11 @@ def typeof(inst): if not inst: # If V evaluates to indeterminate (?), an empty set is returned. return express_set([]) - schema_name = inst.is_a(True).split('.')[0].upper() + schema_name = inst.is_a(True).split('.')[0].lower() def inner(): decl = ifcopenshell.ifcopenshell_wrapper.schema_by_name(schema_name).declaration_by_name(inst.is_a()) while decl: - yield '.'.join((schema_name, decl.name().upper())) + yield '.'.join((schema_name, decl.name().lower())) if isinstance(decl, ifcopenshell.ifcopenshell_wrapper.entity): decl = decl.supertype() else: diff --git a/src/ifcopenshell-python/ifcopenshell/express/rules/IFC2X3.py b/src/ifcopenshell-python/ifcopenshell/express/rules/IFC2X3.py index bf18bf959d..570f2b18ce 100644 --- a/src/ifcopenshell-python/ifcopenshell/express/rules/IFC2X3.py +++ b/src/ifcopenshell-python/ifcopenshell/express/rules/IFC2X3.py @@ -4001,6 +4001,7 @@ class IfcArbitraryProfileDefWithVoids_WR2: @staticmethod def __call__(self): innercurves = express_getattr(self, 'InnerCurves', INDETERMINATE) + breakpoint() assert (sizeof([temp for temp in innercurves if express_getattr(temp, 'Dim', INDETERMINATE) != 2]) == 0) is not False class IfcArbitraryProfileDefWithVoids_WR3: