refactor: Use general parser.common import for StrRegion and .common

Author: MarcellPerger1

parser/common/__init__.py

@@ -0,0 +1,4 @@
+from .common import *
+from .error import *  # <^ might add some stuff so `import *`
+from .str_region import StrRegion  # <-- won't add stuff to str_region so not `import *`
+from .tree_print import *

parser/common/common.py

@@ -2,6 +2,8 @@
 
 from .str_region import StrRegion
 
+__all__ = ['HasRegion', 'RegionUnionArgT', 'region_union']
+
 
 class HasRegion:
     region: StrRegion

parser/common/error.py

@@ -9,6 +9,8 @@
 from .common import HasRegion
 from .str_region import StrRegion
 
+__all__ = ['BaseParseError', 'BaseLocatedError']
+
 
 # We unconditionally add this polyfill to ensure that
 # exceptions are always part of str(exc).

parser/common/str_region.py

@@ -2,6 +2,8 @@
 
 from dataclasses import dataclass
 
+__all__ = ['StrRegion']
+
 
 @dataclass
 class StrRegion:

parser/cst/base_node.py

@@ -2,8 +2,7 @@
 
 from dataclasses import dataclass, field
 
-from ..common.common import HasRegion
-from ..common.str_region import StrRegion
+from ..common import StrRegion, HasRegion
 from ..tokens import Token
 
 

parser/cst/named_node.py

@@ -4,10 +4,10 @@
 from typing import TYPE_CHECKING, overload, Sequence, cast, Literal
 
 from .base_node import Leaf, AnyNode, Node
-from parser.common.str_region import StrRegion
+from ..common import StrRegion
 
 if TYPE_CHECKING:
-    from parser.tokens import Token
+    from ..tokens import Token
 
 
 # NOTE: these classes only follow the Liskov substitution principle on

parser/cst/treegen.py

@@ -6,9 +6,8 @@
 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.common import region_union, RegionUnionArgT
+from ..common import StrRegion, 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 ..tokens import *

parser/lexer/tokenizer.py

@@ -11,8 +11,8 @@
     SemicolonToken, AttrNameToken, IdentNameToken,
     GETATTR_VALID_AFTER_CLS, EofToken
 )
+from ..common import StrRegion
 from ..common.error import BaseParseError, BaseLocatedError
-from ..common.str_region import StrRegion
 from ..operators import OPS_SET, MAX_OP_LEN, OP_FIRST_CHARS
 
 if TYPE_CHECKING:

parser/lexer/tokens.py

@@ -4,8 +4,7 @@
 from enum import Enum
 from typing import Union, Callable, TYPE_CHECKING
 
-from ..common.str_region import HasRegion
-from ..common.str_region import StrRegion
+from ..common import HasRegion, StrRegion
 
 __all__ = [
     'AnyCommentToken', 'AnyNameToken', 'AttrNameToken', 'BlockCommentToken',

test/common.py

@@ -5,10 +5,10 @@
 from enum import IntFlag, Enum
 from typing import Sequence, TypeVar
 
-from parser.cst.base_node import Leaf, AnyNode, Node
+from parser.common.error import BaseParseError
 from parser.common.tree_print import tformat
+from parser.cst.base_node import Leaf, AnyNode, Node
 from parser.cst.treegen import TreeGen, CstParseError
-from parser.common.error import BaseParseError
 from parser.lexer import Tokenizer
 from parser.lexer.tokens import Token, OpToken
 from test.snapshottest import SnapshotTestCase