Implemented parse() and unparse()

Author: elbakramer

main.py

@@ -5,7 +5,7 @@
 
 import pynescript
 
-from pynescript.ast.parser.helpers import parse
+from pynescript.ast import parse, dump
 
 
 def test_random_file():
@@ -18,10 +18,10 @@ def test_random_file():
     script_index = random.randrange(builtin_script_filepaths_count)
     script_filepath = builtin_script_filepaths[script_index]
 
-    res = parse(script_filepath, parse_all=True)
+    tree = parse(script_filepath, debug=True)
 
-    print(res)
     print(script_filepath)
+    print(dump(tree, indent=2))
 
 
 if __name__ == "__main__":

pynescript/ast/__init__.py

@@ -1 +1,3 @@
 from .types import *
+from .parser import *
+from .helpers import *

pynescript/ast/helpers.py

@@ -1,62 +1,62 @@
+from __future__ import annotations
+
 from typing import Union, Optional
 
 from pynescript.ast.types import AST
 
 
-def _dump_value_impl(value, indent: int = 0, depth: int = 0):
-    indent_step = " " * indent
+def iter_fields(node: AST):
+    return node.iter_fields()
+
+
+def _dump_value_impl(value, indent: str = "", depth: int = 0):
     if isinstance(value, AST):
         return _dump_impl(value, indent=indent, depth=depth)
     elif isinstance(value, list) and len(value) > 0:
         lines = []
         lines.append("[")
         for subvalue in value:
             lines.append(
-                f"{indent_step * (depth + 1)}{_dump_value_impl(subvalue, indent=indent, depth=depth + 1)},"
+                f"{indent * (depth + 1)}{_dump_value_impl(subvalue, indent=indent, depth=depth + 1)},"
             )
-        lines.append(f"{indent_step * depth}]")
+        lines.append(f"{indent * depth}]")
         return "\n".join(lines)
     else:
         return f"{value!r}"
 
 
-def _dump_impl(node: AST, indent: int = 0, depth: int = 0):
+def _dump_impl(node: AST, indent: str = "", depth: int = 0):
     class_name = node.__class__.__name__
-    class_params_except = [
-        "loc",
-        "end_loc",
-        "lineno",
-        "col_offset",
-        "end_lineno",
-        "end_col_offset",
-    ]
-    class_params = {
-        name: value
-        for name, value in node.__dict__.items()
-        if name not in class_params_except
-    }
-    if indent > 0 and len(class_params) > 0:
-        indent_step = " " * indent
+    class_params = dict(iter_fields(node))
+    if indent and len(class_params) > 0:
         lines = []
         lines.append(f"{class_name}(")
         for name, value in class_params.items():
             lines.append(
-                f"{indent_step * (depth + 1)}{name}={_dump_value_impl(value, indent=indent, depth=depth + 1)},"
+                f"{indent * (depth + 1)}{name}={_dump_value_impl(value, indent=indent, depth=depth + 1)},"
             )
-        lines.append(f"{indent_step * depth})")
+        lines.append(f"{indent * depth})")
         return "\n".join(lines)
     else:
         class_params = [f"{name}={value!r}" for name, value in class_params.items()]
         class_params = ", ".join(class_params)
         return f"{class_name}({class_params})"
 
 
-def dump(node: AST, indent: Optional[int] = None) -> str:
+def dump(node: AST, indent: Optional[Union[int, str]] = None) -> str:
     if indent is None:
-        indent = 2
-
+        indent = 0
+    if isinstance(indent, int):
+        indent = " " * indent
     return _dump_impl(node, indent=indent)
 
 
+def unparse(node: AST) -> str:
+    from pynescript.ast.node_visitors import Unparser
+
+    unparser = Unparser()
+    return unparser.visit(node)
+
+
 def literal_eval(node_or_string: Union[str, AST]):
     raise NotImplementedError()