fixing parsing tree bug and using lark standalone

Signed-off-by: Aryan Roy <[email protected]>

src/formulate/__init__.py

@@ -7,7 +7,9 @@
 
 from __future__ import annotations
 
-from . import ttreeformula, numexpr  # noqa  # noqa
+from . import ttreeformula_parser, numexpr_parser  # noqa  # noqa
+
+from . import convert_ptree
 
 from . import AST
 
@@ -20,11 +22,13 @@
 
 
 def from_root(exp : str, **kwargs) -> AST :
-    parser = ttreeformula.Lark_StandAlone()
+    parser = ttreeformula_parser.Lark_StandAlone()
     ptree = parser.parse(exp)
+    convert_ptree.convert_ptree(ptree)
     return toast.toast(ptree, nxp=False)
 
 def from_numexpr(exp : str, **kwargs) -> AST :
-    parser = numexpr.Lark_StandAlone()
+    parser = numexpr_parser.Lark_StandAlone()
     ptree = parser.parse(exp)
+    convert_ptree.convert_ptree(ptree)
     return toast.toast(ptree, nxp=True)

src/formulate/convert_ptree.py

@@ -0,0 +1,21 @@
+"""
+Copyright (c) 2023 Aryan Roy. All rights reserved.
+
+formulate:  Easy conversions between different styles of expressions
+"""
+
+from . import matching_tree
+from . import numexpr_parser
+from . import ttreeformula_parser
+
+def convert_ptree(raw_ptree):
+
+    if isinstance(raw_ptree, numexpr_parser.Token) or isinstance(raw_ptree, ttreeformula_parser.Token):
+        return
+
+    raw_ptree.__class__ = matching_tree.ptnode
+
+    for x in raw_ptree.children:
+        convert_ptree(x)
+
+    return

src/formulate/matching_tree.py

@@ -6,7 +6,9 @@
 
 
 import lark
+from . import numexpr_parser
+from . import ttreeformula_parser
 
 
-class ptnode(lark.tree.Tree):
+class ptnode(numexpr_parser.Tree, ttreeformula_parser.Tree):
     __match_args__ = ("data", "children")