refactor: Add common/ directory

MarcellPerger1 · MarcellPerger1 · commit 48aed2cdc1e6 · 2024-11-01T14:27:42.000Z
diff --git a/fuzz.py b/fuzz.py
@@ -2,7 +2,7 @@
 
 from parser.lexer.tokenizer import Tokenizer
 from parser.cst.treegen import TreeGen
-from parser.error import BaseParseError
+from parser.common.error import BaseParseError
 
 from pythonfuzz.fuzzer import Fuzzer
 import pythonfuzz.fuzzer as fuzzer_ns  # For patching pythonfuzz
diff --git a/main.py b/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.tree_print import tprint
+from parser.common.tree_print import tprint
 
 
 def make_tree(src: str):
diff --git a/parser/common/__init__.py b/parser/common/__init__.py
diff --git a/parser/common/common.py b/parser/common/common.py
diff --git a/parser/common/error.py b/parser/common/error.py
diff --git a/parser/common/str_region.py b/parser/common/str_region.py
diff --git a/parser/common/tree_print.py b/parser/common/tree_print.py
@@ -4,7 +4,7 @@
 from io import StringIO
 from typing import IO, Sequence
 
-from .cst.base_node import Leaf, AnyNode, Node
+from ..cst.base_node import Leaf, AnyNode, Node
 from .str_region import StrRegion
 
 __all__ = [
diff --git a/parser/cst/base_node.py b/parser/cst/base_node.py
@@ -2,9 +2,9 @@
 
 from dataclasses import dataclass, field
 
-from ..common import HasRegion
+from ..common.common import HasRegion
+from ..common.str_region import StrRegion
 from ..tokens import Token
-from ..str_region import StrRegion
 
 
 @dataclass
diff --git a/parser/cst/named_node.py b/parser/cst/named_node.py
@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, overload, Sequence, cast, Literal
 
 from .base_node import Leaf, AnyNode, Node
-from parser.str_region import StrRegion
+from parser.common.str_region import StrRegion
 
 if TYPE_CHECKING:
     from parser.tokens import Token
diff --git a/parser/cst/treegen.py b/parser/cst/treegen.py
@@ -6,11 +6,11 @@
 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
-from ..error import BaseParseError, BaseLocatedError
+from ..common.common import region_union, RegionUnionArgT
+from ..common.error import BaseParseError, BaseLocatedError
+from ..common.str_region import StrRegion
 from ..lexer import Tokenizer
 from ..operators import UNARY_OPS, COMPARISONS, ASSIGN_OPS
-from ..str_region import StrRegion
 from ..tokens import *
 
 DT = TypeVar('DT')
diff --git a/parser/lexer/tokenizer.py b/parser/lexer/tokenizer.py
@@ -11,9 +11,9 @@
     SemicolonToken, AttrNameToken, IdentNameToken,
     GETATTR_VALID_AFTER_CLS, EofToken
 )
-from ..error import BaseParseError, BaseLocatedError
+from ..common.error import BaseParseError, BaseLocatedError
+from ..common.str_region import StrRegion
 from ..operators import OPS_SET, MAX_OP_LEN, OP_FIRST_CHARS
-from ..str_region import StrRegion
 
 if TYPE_CHECKING:
     from .tokens import ParenTokenT
diff --git a/parser/lexer/tokens.py b/parser/lexer/tokens.py
@@ -4,8 +4,8 @@
 from enum import Enum
 from typing import Union, Callable, TYPE_CHECKING
 
-from ..common import HasRegion
-from ..str_region import StrRegion
+from ..common.str_region import HasRegion
+from ..common.str_region import StrRegion
 
 __all__ = [
     'AnyCommentToken', 'AnyNameToken', 'AttrNameToken', 'BlockCommentToken',
diff --git a/test/common.py b/test/common.py
@@ -6,9 +6,9 @@
 from typing import Sequence, TypeVar
 
 from parser.cst.base_node import Leaf, AnyNode, Node
-from parser.tree_print import tformat
+from parser.common.tree_print import tformat
 from parser.cst.treegen import TreeGen, CstParseError
-from parser.error import BaseParseError
+from parser.common.error import BaseParseError
 from parser.lexer import Tokenizer
 from parser.lexer.tokens import Token, OpToken
 from test.snapshottest import SnapshotTestCase
diff --git a/test/test_error.py b/test/test_error.py
@@ -1,8 +1,8 @@
 import unittest
 from unittest.mock import patch
 
-from parser.error import BaseLocatedError
-from parser.str_region import StrRegion
+from parser.common.error import BaseLocatedError
+from parser.common.str_region import StrRegion
 
 
 class TestLocatedError(unittest.TestCase):
diff --git a/test/test_integration/test_treegen.py b/test/test_integration/test_treegen.py
@@ -3,7 +3,7 @@
 from parser.lexer.tokenizer import Tokenizer
 from parser.operators import BINARY_OPS
 from parser.cst.treegen import TreeGen, LocatedCstError
-from parser.str_region import StrRegion
+from parser.common.str_region import StrRegion
 from test.common import CommonTestCase
 
 
diff --git a/test/test_node.py b/test/test_node.py
@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from parser.str_region import StrRegion
+from parser.common.str_region import StrRegion
 from parser.tokens import NumberToken, IdentNameToken
 from parser.cst.named_node import node_from_token
 from parser.cst.nodes import NumberNode, IdentNode
diff --git a/test/test_tokenizer.py b/test/test_tokenizer.py
@@ -2,7 +2,7 @@
 
 from parser.lexer import Tokenizer
 from parser.lexer.tokens import WhitespaceToken, StringToken, EofToken, NumberToken
-from parser.str_region import StrRegion
+from parser.common.str_region import StrRegion
 from parser.tokens import IdentNameToken, DotToken, AttrNameToken, OpToken
 from test.common import CommonTestCase, TokenStreamFlag
 
