Merge pull request #55 from beda-software/optimize-performance

Optimize performance 4x

Author: ruscoder

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.2
+
+- Increase performance of parsing #54 @ruscoder
+
 ## 2.0.1
 
 - Fix of the bug with multiple user-defined functions @kpcurai @ruscoder

fhirpathpy/__init__.py

@@ -5,7 +5,7 @@
 from fhirpathpy.engine.nodes import FP_Type, ResourceNode
 
 __title__ = "fhirpathpy"
-__version__ = "2.0.1"
+__version__ = "2.0.2"
 __author__ = "beda.software"
 __license__ = "MIT"
 __copyright__ = "Copyright 2025 beda.software"
@@ -103,6 +103,4 @@ def compile(path, model=None, options=None):
 
     For example, you could pass in the result of require("fhirpath/fhir-context/r4")
     """
-    return set_paths(
-        apply_parsed_path, parsedPath=parse(path), model=model, options=options
-    )
+    return set_paths(apply_parsed_path, parsedPath=parse(path), model=model, options=options)

fhirpathpy/parser/ASTPathListener.py

@@ -2,19 +2,32 @@
 from fhirpathpy.parser.generated.FHIRPathListener import FHIRPathListener
 
 
+def has_node_type_text(node_type):
+    # In general we need mostly terminal nodes (e.g. Identifier and any Literal)
+    # But the code also uses TypeSpecifier, InvocationExpression and TermExpression
+    return node_type.endswith("Literal") or node_type in [
+        "LiteralTerm",
+        "Identifier",
+        "TypeSpecifier",
+        "InvocationExpression",
+        "TermExpression",
+    ]
+
+
 class ASTPathListener(FHIRPathListener):
     def __init__(self):
         self.parentStack = [{}]
 
     def pushNode(self, nodeType, ctx):
         parentNode = self.parentStack[-1]
-        node = {"type": nodeType, "text": ctx.getText(), "terminalNodeText": []}
-
+        node = {"type": nodeType, "terminalNodeText": []}
+        if has_node_type_text(nodeType):
+            node["text"] = ctx.getText()
         for child in ctx.children:
             if isinstance(child, TerminalNodeImpl):
                 node["terminalNodeText"].append(child.getText())
 
-        if not "children" in parentNode:
+        if "children" not in parentNode:
             parentNode["children"] = []
 
         parentNode["children"].append(node)

tests/fixtures/ast/%v+2.json

@@ -1,19 +1,16 @@
 {
   "children": [{
     "type": "AdditiveExpression",
-    "text": "%v+2",
     "terminalNodeText": ["+"],
     "children": [{
       "type": "TermExpression",
       "text": "%v",
       "terminalNodeText": [],
       "children": [{
         "type": "ExternalConstantTerm",
-        "text": "%v",
         "terminalNodeText": [],
         "children": [{
           "type": "ExternalConstant",
-          "text": "%v",
           "terminalNodeText": ["%"],
           "children": [{
             "type": "Identifier",

tests/fixtures/ast/Observation.value.json

@@ -9,11 +9,9 @@
       "terminalNodeText": [],
       "children": [{
         "type": "InvocationTerm",
-        "text": "Observation",
         "terminalNodeText": [],
         "children": [{
           "type": "MemberInvocation",
-          "text": "Observation",
           "terminalNodeText": [],
           "children": [{
             "type": "Identifier",
@@ -24,7 +22,6 @@
       }]
     }, {
       "type": "MemberInvocation",
-      "text": "value",
       "terminalNodeText": [],
       "children": [{
         "type": "Identifier",

tests/fixtures/ast/Patient.name.given.json

@@ -13,11 +13,9 @@
         "terminalNodeText": [],
         "children": [{
           "type": "InvocationTerm",
-          "text": "Patient",
           "terminalNodeText": [],
           "children": [{
             "type": "MemberInvocation",
-            "text": "Patient",
             "terminalNodeText": [],
             "children": [{
               "type": "Identifier",
@@ -28,7 +26,6 @@
         }]
       }, {
         "type": "MemberInvocation",
-        "text": "name",
         "terminalNodeText": [],
         "children": [{
           "type": "Identifier",
@@ -38,7 +35,6 @@
       }]
     }, {
       "type": "MemberInvocation",
-      "text": "given",
       "terminalNodeText": [],
       "children": [{
         "type": "Identifier",

tests/fixtures/ast/a.b+2.json

@@ -1,7 +1,6 @@
 {
   "children": [{
     "type": "AdditiveExpression",
-    "text": "a.b+2",
     "terminalNodeText": ["+"],
     "children": [{
       "type": "InvocationExpression",
@@ -13,11 +12,9 @@
         "terminalNodeText": [],
         "children": [{
           "type": "InvocationTerm",
-          "text": "a",
           "terminalNodeText": [],
           "children": [{
             "type": "MemberInvocation",
-            "text": "a",
             "terminalNodeText": [],
             "children": [{
               "type": "Identifier",
@@ -28,7 +25,6 @@
         }]
       }, {
         "type": "MemberInvocation",
-        "text": "b",
         "terminalNodeText": [],
         "children": [{
           "type": "Identifier",