parent
92a365d908
commit
c2678fe360
|
@ -175,7 +175,8 @@ def read_start(reader: Reader):
|
||||||
token = reader.next()
|
token = reader.next()
|
||||||
|
|
||||||
if token is None:
|
if token is None:
|
||||||
return []
|
print('eof!')
|
||||||
|
return None
|
||||||
|
|
||||||
ast = []
|
ast = []
|
||||||
res = []
|
res = []
|
||||||
|
@ -184,13 +185,23 @@ def read_start(reader: Reader):
|
||||||
|
|
||||||
# handle blocks
|
# handle blocks
|
||||||
if token.value == '{':
|
if token.value == '{':
|
||||||
while True:
|
# next can be a whitespace, or a }
|
||||||
token = reader.next()
|
token = reader.next()
|
||||||
|
|
||||||
if token.value == '}':
|
print('block start!, next:', token)
|
||||||
break
|
|
||||||
|
|
||||||
res.extend(read_start(reader))
|
if token.type_ == TokenType.whitespace:
|
||||||
|
# keep going on reading
|
||||||
|
while True:
|
||||||
|
token = reader.next()
|
||||||
|
print(token)
|
||||||
|
|
||||||
|
if token.value == '}':
|
||||||
|
break
|
||||||
|
|
||||||
|
res.extend(read_start(reader))
|
||||||
|
elif token.value == '}':
|
||||||
|
res = []
|
||||||
|
|
||||||
# import, fn, etc
|
# import, fn, etc
|
||||||
elif token.type_ == TokenType.reserved:
|
elif token.type_ == TokenType.reserved:
|
||||||
|
@ -205,21 +216,25 @@ def read_start(reader: Reader):
|
||||||
ast.append(res)
|
ast.append(res)
|
||||||
return ast
|
return ast
|
||||||
|
|
||||||
|
|
||||||
def read_loop(reader: Reader):
|
def read_loop(reader: Reader):
|
||||||
|
"""Read the AST."""
|
||||||
final_ast = []
|
final_ast = []
|
||||||
|
|
||||||
while True:
|
while True:
|
||||||
ast = read_start(reader)
|
ast = read_start(reader)
|
||||||
|
|
||||||
if not ast:
|
# break when eof
|
||||||
|
if ast is None:
|
||||||
break
|
break
|
||||||
|
|
||||||
inner = ast[0]
|
try:
|
||||||
|
inner = ast[0]
|
||||||
|
except IndexError:
|
||||||
|
inner = None
|
||||||
|
|
||||||
if not inner:
|
if ast and not inner:
|
||||||
break
|
final_ast.append(ast)
|
||||||
|
|
||||||
final_ast.append(ast)
|
|
||||||
|
|
||||||
return final_ast
|
return final_ast
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue