Merge remote-tracking branch 'origin/v0.8.0' into ifcviewer-wgpu

src/ifcopenshell-python/ifcopenshell/express/bootstrap.py

@@ -18,8 +18,6 @@
 
 
 import os
-import sys
-import string
 import operator
 import itertools
 
@@ -158,6 +156,7 @@ actions = {
 to_emit = set(id for id, expr in express)
 emitted = set()
 to_combine = set(["simple_id"])
+to_original_text = set(["simple_string_literal"])
 statements = []
 
 terminals = reduce(lambda x, y: x | y, (find_bytype(e, Terminal) for id, e in express))
@@ -176,6 +175,9 @@ while True:
             stmt = "(%s)" % expr
             if id in to_combine:
                 stmt = " + ".join(itertools.chain(negated_keywords, ("originalTextFor(Combine%s)" % stmt,)))
+            elif id in to_original_text:
+                # We use lower() because it better matches the previous default of the CaselessLiterals for individual lexemes and express dictates case-insensitive comparisons anyway
+                stmt = "(originalTextFor%s).addParseAction(tokenMap(str.lower))" % stmt
             if id not in no_action and not isinstance(expr.contents, Keyword) and not id in to_combine:
                 node_type = "ListNode" if "ZeroOrMore" in stmt else "Node"
                 action = actions.get(id, 'lambda s, loc, t: %s(s, loc, t, rule="%s")' % (node_type, id))
@@ -193,6 +195,8 @@ for id in to_emit:
     stmt = "(%s)" % expr
     if id in to_combine:
         stmt = "Suppress%s" % stmt
+    elif id in to_original_text:
+        stmt = "(originalTextFor%s).addParseAction(tokenMap(str.lower))" % stmt
     if id not in no_action and not isinstance(expr.contents, Keyword):
         children = list(map(operator.attrgetter('contents'), reduce(lambda x, y: x | y, (find_bytype(e, Keyword) for e in [expr]))))
         has_duplicates = len(children) > len(set(children))
@@ -204,7 +208,8 @@ for id in to_emit:
     statements.append("%s << %s" % (id, stmt))
 
 if __name__ == "__main__":
-    print(r"""
+    print(
+        r"""
 # This file is generated by IfcOpenShell ifcexpressparser bootstrap.py
 
 from __future__ import annotations
@@ -243,5 +248,6 @@ if __name__ == "__main__":
         mdl = importlib.import_module(output)
         mdl.Generator(m).emit()
     sys.stdout.write(m.schema.name)
-""" % ("\n        ".join(statements))
+"""
+        % ("\n        ".join(statements))
     )