Commit v1.1.0 content

Pushed v1.1.0 content for release.

changelogs/v1.1.0/README.md

@@ -0,0 +1,13 @@
+# Changelog
+### Local Debugging
+* Debugging of **JeeScript** files can be done using the ``MODE DEBUG`` line at the end of the file.
+### Interpreter
+* Relabeled sections of interpreter-file.
+* Renamed interpreter-file from ``lexer.py`` to ``interpreter.py``; ``interpreter.py`` includes the lexer, parser, and correction functions.
+* Changed ``if`` statement for the debugging mode to ``elif`` to prevent command-prompt errors from occurring.
+* Made the interpreter check the file being executed to see if it's a compatible **JeeScript** file.
+* Added the ``funcdata`` variable for use collecting function information.
+### Command-Prompt/Terminal
+* Debugging can now be enabled via the command-prompt by adding ``DEBUG`` to the end of the arguments. This is the equivalent to adding ``MODE DEBUG`` within a **JeeScript** file, but this method is less-dependent on when the tokens are added to the interpreter.
+### Functions
+* **JeeScript's** interpreter now comes with a built-in function that can be used by typing ``LOAD`` or ``load``. This function allows developers to load separate **JeeScript** files programmatically for execution.

src/lexer/lexer2.py → src/interpreter/interpreter.py

@@ -1,3 +1,6 @@
+# COPYRIGHT (C) GAVIN ISGAR 2018
+# JEESCRIPT V1.1.0 INTERPRETER
+
 from sys import *
 
 tokens = []
@@ -12,9 +15,12 @@ def lex(filecontents):
     token = ""
     stringstate = 0
     isexpr = 0
+    ismode = 0
+    isfunc = 0
     string = ""
     expr = ""
-    n = ""
+    funcdata = ""
+
     filecontents = list(filecontents)
     for char in filecontents:
         token += char
@@ -23,6 +29,7 @@ def lex(filecontents):
                 token = ""
             else:
                 token = " "
+        # NEWLINE/EOF ---
         elif token == "\n" or token == "<EOF>":
             if expr != "" and isexpr == 1:
                 tokens.append("EXPR: " + expr)
@@ -31,9 +38,17 @@ def lex(filecontents):
                 tokens.append("NUM: " + expr)
                 expr == ""
             token = ""
+        # ---------------
+        # ACTIONS ---
         elif token == "write" or token == "WRITE":
             tokens.append("WRITE")
             token = ""
+        elif token == "mode" or token == "MODE":
+            tokens.append("MODE")
+            ismode = 1
+            token = ""
+        # -----------
+        # NUMBERS/EXPR/LETTERS ---
         elif token == "0" or token == "1" or token == "2" or token == "3" or token == "4" or token == "5" or token == "6" or token == "7" or token == "8" or token == "9":
             if stringstate == 1:
                 string += token
@@ -42,26 +57,51 @@ def lex(filecontents):
                 expr += token
                 token = ""
         elif token == "+" or token == "-" or token == "*" or token == "/" or token == "%" or token == "(" or token == ")":
-            if stringstate == 0:  
+            if token == ")" and isfunc == 1:
+                tokens.append("FUNCDATA: " + funcdata[0:-1])
+                funcdata = ""
+                isfunc = 0
+                token = ""
+            elif stringstate == 0:  
                 isexpr = 1
                 expr += token
                 token = ""
+        # ------------------------
+        # STRINGS ---
         elif token == "\"":
             if stringstate == 0:
                 stringstate = 1
             elif stringstate == 1:
-                tokens.append("STRING: " + string + "\"")
-                string = ""
-                stringstate = 0
-                token = ""
+                if isfunc == 1:
+                    funcdata += token
+                    token = ""
+                elif isfunc == 0:
+                    tokens.append("STRING: " + string + "\"")
+                    string = ""
+                    stringstate = 0
+                    token = ""
         elif stringstate == 1:
-            string += token
+            if isfunc == 1:
+                funcdata += token
+                token = ""
+            elif isfunc == 0:
+                string += token
+                token = ""
+        # -----------
+        # FUNCTIONS ---
+        elif token == "LOAD" or token == "load":
+            isfunc = 1
+            tokens.append("FUNCTION [LOAD]")
             token = ""
-        #if token == "DEBUG":
-            #if not tokens:
-                #print("**INTERNAL ERROR** " + "Debug list is empty; no debug information to display")
-            #else:
-                #print(tokens)
+        # -------------
+        # MODES TYPES ---
+        elif token == "DEBUG":
+            if ismode == 1:
+                tokens.append("DEBUG")
+                ismode = 0
+                token = ""
+        # ---------------
+
     #Debugging purposes --> print(tokens)
     return tokens
 
@@ -90,12 +130,29 @@ def parse(tokens):
                 correctPrint(tokens[i+1])
             elif tokens[i+1][0:4] == "EXPR":
                 correctPrint(tokens[i+1])
-
             i+=2
+        elif tokens[i] + " " + tokens[i+1][0:5] == "MODE DEBUG":
+            if tokens[i+1][0:5] == "DEBUG":
+                print(tokens)
+                i+=2
+        elif tokens[i][0:8] + " " + tokens[i+1][0:8] == "FUNCTION FUNCDATA":
+            if tokens[i] == "FUNCTION [LOAD]":
+                lex(open_file(tokens[i+1][11:]))
+            i+=2
+
 
 def run():
-    data = open_file(argv[1])
-    tokens = lex(data)
-    parse(tokens)
+    if argv[1].endswith(".jee"):
+        data = open_file(argv[1])
+        tokens = lex(data)
+        # "DEBUG" method is currently a placeholder; will change if new argv arguments are added
+        # This method is not dependent on when the tokens are appended; the tokens are appended before this is ran
+        if argv.__contains__("DEBUG") or argv.__contains__("debug"):
+            print(tokens)
+        else:
+            print("**ARGS** No arguments are being used; placeholder for background-logging")
+        parse(tokens)
+    else:
+        print("**ERROR** Only JeeScript files can be executed.")
 
 run()

src/lexer/lexer.py → src/interpreter/outdated/lexer.py

@@ -1,3 +1,6 @@
+# COPYRIGHT (C) GAVIN ISGAR 2018
+# JEESCRIPT V1.0.0 INTERPRETER
+
 from sys import *
 
 tokens = []

src/tests/hi.jee

@@ -0,0 +1 @@
+WRITE "This is a test"

src/tests/test.jee

@@ -1,3 +1,4 @@
 WRITE "Hello World"
-write "Hi"
-WRITE "200+200"
+WRITE "Hello 2"
+WRITE (2+2)
+LOAD("../tests/hi.jee")