refactor: Remove trees/ directory. Seems that the AST and CST nodes are very different.

Author: MarcellPerger1

main.py

@@ -4,7 +4,7 @@
 from util import readfile
 from parser.cst.treegen import TreeGen
 from parser.lexer import Tokenizer, print_tokens
-from parser.trees.tree_print import tprint
+from parser.tree_print import tprint
 
 
 def make_tree(src: str):

parser/trees/base_node.py parser/cst/base_node.pyparser/trees/base_node.py renamed to parser/cst/base_node.py

@@ -3,8 +3,8 @@
 from typing import cast
 
 from util import checked_cast
-from ..trees.named_node import (NamedLeafCls, NamedNodeCls, NamedSizedNodeCls,
-                                register_corresponding_token)
+from .named_node import (NamedLeafCls, NamedNodeCls, NamedSizedNodeCls,
+                         register_corresponding_token)
 
 __all__ = [
     "ProgramNode", "NumberNode", "StringNode", "AnyNameLeaf", "IdentNode",

parser/trees/named_node.py parser/cst/named_node.pyparser/trees/named_node.py renamed to parser/cst/named_node.py

@@ -2,6 +2,8 @@
 
 from typing import (TypeVar, cast, Sequence, overload, Iterable, Callable)
 
+from .base_node import AnyNode, Node
+from .named_node import AnyNamedNode, node_from_token, node_cls_from_name
 from .nodes import *
 from .token_matcher import OpM, KwdM, Matcher, PatternT
 from ..common import region_union, RegionUnionArgT
@@ -10,8 +12,6 @@
 from ..operators import UNARY_OPS, COMPARISONS, ASSIGN_OPS
 from ..str_region import StrRegion
 from ..tokens import *
-from ..trees.base_node import AnyNode, Node
-from ..trees.named_node import AnyNamedNode, node_from_token, node_cls_from_name
 
 DT = TypeVar('DT')
 

parser/cst/nodes.py

@@ -4,8 +4,8 @@
 from io import StringIO
 from typing import IO, Sequence
 
-from .base_node import Leaf, AnyNode, Node
-from parser.str_region import StrRegion
+from .cst.base_node import Leaf, AnyNode, Node
+from .str_region import StrRegion
 
 __all__ = [
     'TreePrinter', 'tree_print', 'tree_format', 'tprint', 'tformat'

parser/cst/treegen.py

@@ -5,8 +5,8 @@
 from enum import IntFlag, Enum
 from typing import Sequence, TypeVar
 
-from parser.trees.base_node import Leaf, AnyNode, Node
-from parser.trees.tree_print import tformat
+from parser.cst.base_node import Leaf, AnyNode, Node
+from parser.tree_print import tformat
 from parser.cst.treegen import TreeGen, CstParseError
 from parser.error import BaseParseError
 from parser.lexer import Tokenizer

parser/trees/tree_print.py parser/tree_print.pyparser/trees/tree_print.py renamed to parser/tree_print.py

@@ -2,7 +2,7 @@
 
 from parser.str_region import StrRegion
 from parser.tokens import NumberToken, IdentNameToken
-from parser.trees.named_node import node_from_token
+from parser.cst.named_node import node_from_token
 from parser.cst.nodes import NumberNode, IdentNode