removed shell.py, merged main.py

Author: Vivek Dagar

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='xbasic',
-    version='1.0',
+    version='1.0.2',
     packages=find_packages(),
     install_requires=[
         'click~=8.1.7',

xbasic/Interpreter.py

@@ -1,7 +1,7 @@
-from error_handler.rtresult import RTResult
-from utils.token_list import *
-from number import Number
-from list import List
+from .error_handler.rtresult import RTResult
+from .utils.token_list import *
+from .number import Number
+from .list import List
 
 class Interpreter:
     def visit(self, node, context):
@@ -20,7 +20,7 @@ def visit_NumberNode(self, node, context):
         )
 
     def visit_StringNode(self, node, context):
-        from string import String
+        from .string_value import String
         return RTResult().success(
             String(node.tok.value).set_context(context).set_pos(node.pos_start, node.pos_end)
         )
@@ -43,7 +43,7 @@ def visit_VarAccessNode(self, node, context):
         value = context.symbol_table.get(var_name)
 
         if not value:
-            from error_handler.rterror import RTError
+            from .error_handler.rterror import RTError
             return res.failure(RTError(
                 node.pos_start, node.pos_end,
                 f"'{var_name}' is not defined",
@@ -215,7 +215,7 @@ def visit_FuncDefNode(self, node, context):
         body_node = node.body_node
         arg_names = [arg_name.value for arg_name in node.arg_name_toks]
 
-        from function import Function
+        from .function import Function
         func_value = Function(func_name, body_node, arg_names, node.should_auto_return).set_context(context).set_pos(
             node.pos_start, node.pos_end)
 

xbasic/builtinfunction.py

@@ -1,10 +1,10 @@
-from function import BaseFunction
-from error_handler.rtresult import RTResult
+from .function import BaseFunction
+from .error_handler.rtresult import RTResult
 import os
-from number import Number
-from string_value import String
-from list import List
-from error_handler.rterror import RTError
+from .number import Number
+from .string_value import String
+from .list import List
+from .error_handler.rterror import RTError
 
 
 class BuiltInFunction(BaseFunction):

xbasic/error_handler/error.py

@@ -9,7 +9,7 @@ def as_string(self):
         result = f'{self.error_name}: {self.details}\n'
         result += f'File {self.pos_start.fn}, line {self.pos_start.ln + 1}'
 
-        from string_with_arrows import string_with_arrows
+        from .string_with_arrows import string_with_arrows
         result += '\n\n' + string_with_arrows(self.pos_start.ftxt, self.pos_start, self.pos_end)
         return result
 

xbasic/error_handler/rterror.py

@@ -10,7 +10,7 @@ def as_string(self):
         result = self.generate_traceback()
         result += f'{self.error_name}: {self.details}'
 
-        from string_with_arrows import string_with_arrows
+        from .string_with_arrows import string_with_arrows
         result += '\n\n' + string_with_arrows(self.pos_start.ftxt, self.pos_start, self.pos_end)
         return result
 

xbasic/function.py

@@ -1,6 +1,6 @@
-from value import Value
-from error_handler.rterror import RTError
-from error_handler.rtresult import RTResult
+from .value import Value
+from .error_handler.rterror import RTError
+from .error_handler.rtresult import RTResult
 
 class BaseFunction(Value):
     def __init__(self, name):
@@ -9,10 +9,10 @@ def __init__(self, name):
 
     def generate_new_context(self):
 
-        from context_handler.context import Context
+        from .context_handler.context import Context
         new_context = Context(self.name, self.context, self.pos_start)
 
-        from context_handler.symbol_table import SymbolTable
+        from .context_handler.symbol_table import SymbolTable
         new_context.symbol_table = SymbolTable(new_context.parent.symbol_table)
         return new_context
 
@@ -60,7 +60,7 @@ def __init__(self, name, body_node, arg_names, should_auto_return):
     def execute(self, args):
         res = RTResult()
 
-        from Interpreter import Interpreter
+        from .Interpreter import Interpreter
         interpreter = Interpreter()
         exec_ctx = self.generate_new_context()
 
@@ -70,7 +70,7 @@ def execute(self, args):
         value = res.register(interpreter.visit(self.body_node, exec_ctx))
         if res.should_return() and res.func_return_value == None: return res
 
-        from number import Number
+        from .number import Number
         ret_value = (value if self.should_auto_return else None) or res.func_return_value or Number.null
         return res.success(ret_value)
 

xbasic/init_interp.py

@@ -1,6 +1,6 @@
-from context_handler.symbol_table import SymbolTable
-from builtinfunction import BuiltInFunction
-from number import Number
+from .context_handler.symbol_table import SymbolTable
+from .builtinfunction import BuiltInFunction
+from .number import Number
 
 global_symbol_table = SymbolTable()
 global_symbol_table.set("NULL", Number.null)
@@ -27,22 +27,22 @@
 def run(fn, text):
     # Generate tokens
 
-    from lexer import Lexer
+    from .lexer import Lexer
     lexer = Lexer(fn, text)
     tokens, error = lexer.make_tokens()
     if error: return None, error
 
     # Generate AST
-    from parser import Parser
+    from .parser import Parser
     parser = Parser(tokens)
     ast = parser.parse()
     if ast.error: return None, ast.error
 
     # Run program
-    from Interpreter import Interpreter
+    from .Interpreter import Interpreter
     interpreter = Interpreter()
 
-    from context_handler.context import Context
+    from .context_handler.context import Context
     context = Context('<program>')
     context.symbol_table = global_symbol_table
     result = interpreter.visit(ast.node, context)

xbasic/lexer.py

@@ -1,6 +1,6 @@
-from utils.position import Position
-from utils.token import Token
-from utils.token_list import *
+from .utils.position import Position
+from .utils.token import Token
+from .utils.token_list import *
 
 
 class Lexer:
@@ -76,7 +76,7 @@ def make_tokens(self):
                 char = self.current_char
                 self.advance()
 
-                from error_handler.error import IllegalCharError
+                from .error_handler.error import IllegalCharError
                 return [], IllegalCharError(pos_start, self.pos, "'" + char + "'")
 
         tokens.append(Token(TT_EOF, pos_start=self.pos))
@@ -156,7 +156,7 @@ def make_not_equals(self):
 
         self.advance()
 
-        from error_handler.error import ExpectedCharError
+        from .error_handler.error import ExpectedCharError
         return None, ExpectedCharError(pos_start, self.pos, "'=' (after '!')")
 
     def make_equals(self):

xbasic/list.py

@@ -1,6 +1,6 @@
-from value import Value
-from number import Number
-from error_handler.rterror import RTError
+from .value import Value
+from .number import Number
+from .error_handler.rterror import RTError
 class List(Value):
     def __init__(self, elements):
         super().__init__()

xbasic/main.py

@@ -2,7 +2,7 @@
 import webbrowser
 import platform
 import datetime
-from shell import entry_shell
+from .init_interp import run
 
 
 @click.group()
@@ -17,6 +17,21 @@ def report():
     webbrowser.open("https://github.com/vivekkdagar/xbasic")
 
 
+def entry_shell():
+    while True:
+        text = input('>> ')
+        if text.strip() == "": continue
+        result, error = run('<stdin>', text)
+
+        if error:
+            print(error.as_string())
+        elif result:
+            print(result)
+            #if len(result.elements) == 1:
+             #   print(repr(result.elements[0]))
+           # else:
+            #    print(repr(result))
+
 @cli.command()
 @click.option('-f', type=click.Path(exists=True), default=None, help='Specify a file to execute within the shell.')
 def shell(f):