Refactor folders to compact folder structure

DavidMacDonald11 · Jan 23, 2022 · 5c47cad · 5c47cad
1 parent aabd867
commit 5c47cad
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 10 deletions.
diff --git a/modules/errors/errors.py b/modules/errors/errors.py
@@ -1,4 +1,4 @@
-from position.position import Position
+from lexing.position.position import Position
 
 class SeaError(Exception):
     def __init__(self, position = None, message = ""):

diff --git a/modules/position/__init__.py → modules/interfaces/streams/__init__.py b/modules/position/__init__.py → modules/interfaces/streams/__init__.py
diff --git a/modules/streams/general.py → modules/interfaces/streams/general.py b/modules/streams/general.py → modules/interfaces/streams/general.py
diff --git a/modules/streams/holder.py → modules/interfaces/streams/holder.py b/modules/streams/holder.py → modules/interfaces/streams/holder.py
diff --git a/modules/streams/terminal.py → modules/interfaces/streams/terminal.py b/modules/streams/terminal.py → modules/interfaces/streams/terminal.py
diff --git a/modules/interfaces/terminal.py b/modules/interfaces/terminal.py
@@ -1,5 +1,5 @@
-from streams.holder import StreamHolder
-from streams.terminal import TerminalInStream, TerminalOutStream, TerminalErrorStream
+from .streams.holder import StreamHolder
+from .streams.terminal import TerminalInStream, TerminalOutStream, TerminalErrorStream
 from . import general
 
 def interface(debug):

diff --git a/modules/lexing/lexer.py b/modules/lexing/lexer.py
@@ -1,8 +1,8 @@
-from position.position import Position
-from position.symbol_position import SymbolPosition
-from tokens.constant import NumericalConstant
-from tokens.punctuator import Operator
-from tokens.punctuator import Punctuator, Punc
+from .position.position import Position
+from .position.symbol_position import SymbolPosition
+from .tokens.constant import NumericalConstant
+from .tokens.punctuator import Operator
+from .tokens.punctuator import Punctuator
 from . import errors
 
 class Lexer:

diff --git a/modules/streams/__init__.py → modules/lexing/position/__init__.py b/modules/streams/__init__.py → modules/lexing/position/__init__.py
diff --git a/modules/position/position.py → modules/lexing/position/position.py b/modules/position/position.py → modules/lexing/position/position.py
diff --git a/modules/position/symbol_position.py → modules/lexing/position/symbol_position.py b/modules/position/symbol_position.py → modules/lexing/position/symbol_position.py
diff --git a/modules/tokens/__init__.py → modules/lexing/tokens/__init__.py b/modules/tokens/__init__.py → modules/lexing/tokens/__init__.py
diff --git a/modules/tokens/constant.py → modules/lexing/tokens/constant.py b/modules/tokens/constant.py → modules/lexing/tokens/constant.py
@@ -1,5 +1,5 @@
-from lexing import errors
 from .token import Token
+from .. import errors
 
 class Constant(Token):
     def __init__(self, value, position = None):

diff --git a/modules/tokens/punctuator.py → modules/lexing/tokens/punctuator.py b/modules/tokens/punctuator.py → modules/lexing/tokens/punctuator.py
@@ -1,6 +1,6 @@
 from enum import Enum, unique
-from lexing import errors
 from .token import Token
+from .. import errors
 
 class Punctuator(Token):
     @property

diff --git a/modules/tokens/token.py → modules/lexing/tokens/token.py b/modules/tokens/token.py → modules/lexing/tokens/token.py