lists? not sure if they fully work, but somewhat

1 files changed, 20 insertions, 8 deletions

diff --git a/lexer.py b/lexer.py
index e6116cd..0d9ed87 100644
--- a/lexer.py
+++ b/lexer.py
@@ -5,6 +5,8 @@ DOUBLE_QUOTE = '"'
 BACKSLASH = "\\"
 OPEN_PAREN = "("
 CLOSE_PAREN = ")"
+OPEN_BRACE = "["
+CLOSE_BRACE = "]"
 DIGITS = "0123456789"
 LETTERS = "abcdefghijklmnopqrstuvwxyz"
 PUNCTUATION = "-_!*$@%^&=+/?<>~"
@@ -48,7 +50,7 @@ def lex_bool(inp):
     else:
         raise Exception("invalid boolean")
     
-    if peek(inp[len(str(token)):]) not in (None, " ", CLOSE_PAREN):
+    if peek(inp[len(str(token)):]) not in (None, " ", CLOSE_PAREN, CLOSE_BRACE):
         raise Exception("invalid boolean")
         
     #return token, inp[len(str(token)):]
@@ -58,7 +60,7 @@ def lex_bool(inp):
 def lex_number(inp):
     token = ""
     for idx, c in enumerate(inp):
-        if c in (" ", CLOSE_PAREN):
+        if c in (" ", CLOSE_PAREN, CLOSE_BRACE):
             if "." in token:
                 #return float(token), inp[idx:]
                 return NebFloat(float(token)), inp[idx:]
@@ -96,14 +98,13 @@ def lex_number(inp):
 def lex_symbol(inp):
     token = ""
     for idx, c in enumerate(inp):
-        if c in (CLOSE_PAREN, " "):
+        if c in (CLOSE_PAREN, CLOSE_BRACE, " "):
             return NebSymbol(token), inp[idx:]
         elif c in SYMBOL_VALS:
             token += c
         else:
             raise Exception("improper symbol")
     return NebSymbol(token), ""
-    
 
 def peek(inp):
     if len(inp) == 0:
@@ -123,6 +124,13 @@ def lex(inp, tokens):
     elif nxt == CLOSE_PAREN:
         tokens.append(NebClose())
         return lex(inp[1:], tokens)
+    # braces
+    elif nxt == OPEN_BRACE:
+        tokens.append(NebListStart())
+        return lex(inp[1:], tokens)
+    elif nxt == CLOSE_BRACE:
+        tokens.append(NebListEnd())
+        return lex(inp[1:], tokens)
     # numbers
     elif nxt in list(DIGITS) or nxt in ("+", "-", "."):
         # + and - are symbols, too
@@ -130,7 +138,8 @@ def lex(inp, tokens):
             after = peek(inp[1:])
             if after not in DIGITS: # parse a symbol
                 token, remainder = lex_symbol(inp)
-                if peek(remainder) not in (None, CLOSE_PAREN, " "):
+                if peek(remainder) not in (None, CLOSE_PAREN, CLOSE_BRACE, " "):
+                    print(f"{peek(remainder)}")
                     raise Exception("spaces required between tokens")
                 tokens.append(token)
                 return lex(remainder, tokens)
@@ -141,21 +150,24 @@ def lex(inp, tokens):
     elif nxt == DOUBLE_QUOTE:
         token, remainder = lex_string(inp[1:])
         #print(f"received [{token}] [{remainder}]")
-        if peek(remainder) not in (None, CLOSE_PAREN, " "):
+        if peek(remainder) not in (None, CLOSE_PAREN, " ", CLOSE_BRACE):
+            print(f"{peek(remainder)}")
             raise Exception("spaces required between tokens")
         tokens.append(token)
         return lex(remainder, tokens)
     # bool
     elif nxt == "#":
         token, remainder = lex_bool(inp[1:])
-        if peek(remainder) not in (None, CLOSE_PAREN, " "):
+        if peek(remainder) not in (None, CLOSE_PAREN, " ", CLOSE_BRACE):
+            print(f"{peek(remainder)}")
             raise Exception("spaces required between tokens")
         tokens.append(token)
         return lex(remainder, tokens)
     # symbols
     elif nxt in SYMBOL_VALS:
         token, remainder = lex_symbol(inp)
-        if peek(remainder) not in (None, CLOSE_PAREN, " "):
+        if peek(remainder) not in (None, CLOSE_PAREN, " ", CLOSE_BRACE):
+            print(f"{peek(remainder)}")
             raise Exception("spaces required between tokens")
         tokens.append(token)
         return lex(remainder, tokens)