Resilient parsing!
This commit is contained in:
@@ -11,3 +11,11 @@ class Atom:
|
||||
|
||||
def append(self, atom: Atom):
|
||||
self.cdr = atom
|
||||
|
||||
def __str__(self):
|
||||
if type(self.car) is Atom:
|
||||
return "(" + self.car.__str__() + ("" if self.cdr is None else (" " + self.cdr.__str__())) + ")"
|
||||
elif self.car is None:
|
||||
return "()"
|
||||
else:
|
||||
return self.car + ("" if self.cdr is None else self.cdr.__str__())
|
||||
@@ -2,8 +2,5 @@ import atom
|
||||
import reader
|
||||
|
||||
class Lisp:
|
||||
def parse(self, expression):
|
||||
return reader.tokenize(expression)
|
||||
|
||||
def evaluate(self, expression: str):
|
||||
return self.parse(expression)
|
||||
def evaluate(self, expression):
|
||||
print(expression)
|
||||
@@ -11,11 +11,13 @@ class Reader:
|
||||
self.tokens = []
|
||||
self.interpreter = lisp.Lisp()
|
||||
|
||||
def run(self):
|
||||
while self.peek() != "":
|
||||
self.interpreter.evaluate(self.read_expression())
|
||||
self.consume()
|
||||
|
||||
def tokenize(self, expression: str):
|
||||
self.tokens += re.findall(r"""[\s,]*[;.*]*([()']|"(?:\\.|[^\\"])*"?|[^\s()'",;]*)""", expression)
|
||||
while self.peek() != "":
|
||||
self.read_expression()
|
||||
self.consume()
|
||||
|
||||
def peek(self):
|
||||
return self.tokens[0]
|
||||
@@ -25,27 +27,35 @@ class Reader:
|
||||
self.tokens = self.tokens[1:]
|
||||
return token
|
||||
|
||||
def read_expression(self) -> atom.Atom | None:
|
||||
def read_expression(self):
|
||||
if len(self.tokens) == 0:
|
||||
return None
|
||||
if self.peek() == "(":
|
||||
self.consume()
|
||||
return self.read_list()
|
||||
atomlist = []
|
||||
token = self.peek()
|
||||
while token != ")":
|
||||
atomlist.append(self.read_expression())
|
||||
while self.peek() == "":
|
||||
self.consume()
|
||||
expression: str = input("... ")
|
||||
self.tokenize(expression)
|
||||
token = self.peek()
|
||||
self.consume()
|
||||
return atomlist
|
||||
else:
|
||||
return self.read_atom()
|
||||
|
||||
def read_list(self):
|
||||
token = self.peek()
|
||||
last = atom.Atom(None, None)
|
||||
first = last
|
||||
while token != ")":
|
||||
last.setval(self.read_expression())
|
||||
last.append(atom.Atom(None, None))
|
||||
last = last.cdr
|
||||
token = self.peek()
|
||||
self.consume()
|
||||
return first
|
||||
|
||||
def read_atom(self) -> atom.Atom:
|
||||
print(self.peek())
|
||||
return atom.Atom(self.consume(), None)
|
||||
def read_atom(self):
|
||||
token = self.consume()
|
||||
if token.upper() == "T":
|
||||
return True
|
||||
elif token.upper() == "NIL":
|
||||
return False
|
||||
try:
|
||||
return int(token)
|
||||
except ValueError:
|
||||
try:
|
||||
return float(token)
|
||||
except ValueError:
|
||||
return token
|
||||
Reference in New Issue
Block a user