Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-18 22:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Express rules: enclose rhs of not in parens when needed

Browse Source
This commit is contained in:
Thomas Krijnen
2023-02-03 21:10:34 +01:00
parent 6adbcdd8e1
commit 078bf8646a
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/express/rule_compiler.py
+10 -10
View File
@@ -335,17 +335,18 @@ def process_domain_rule(context):
assert ({context.expression}) is not False assert ({context.expression}) is not False
""" """
def wrap_parens(s):
s = str(s)
if " " in s:
s = '(%s)' % s
return s
def process_expression(context): def process_expression(context):
def wrap(s):
s = str(s)
if " " in s:
s = '(%s)' % s
return s
def concat(a, b, **kwargs): def concat(a, b, **kwargs):
return " ".join(map(str, sum(zip( return " ".join(map(str, sum(zip(
[None] + a.branches(**kwargs), [None] + a.branches(**kwargs),
map(wrap, b.branches(**kwargs)) map(wrap_parens, b.branches(**kwargs))
), ())[1:])) ), ())[1:]))
if context.rel_op_extended: if context.rel_op_extended:
@@ -443,11 +444,10 @@ def simple_concat(context):
# correction: still necessary, apparently. # correction: still necessary, apparently.
# branches = list(map(str, context.branches())) # branches = list(map(str, context.branches()))
concat = ""
if len(branches) == 2 and branches[0] == 'not': if len(branches) == 2 and branches[0] == 'not':
concat = " " return f"{branches[0]} {wrap_parens(branches[1])}"
else:
v = concat.join(branches) v = "".join(branches)
return v return v