Skip to content

Error messages + immutable naturals #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ParsaAlizadeh merged 3 commits into from
Jan 6, 2025
Merged

Error messages + immutable naturals #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f33f068
Improve error messages
ParsaAlizadeh Jan 6, 2025
20b38d3
Make Natural immutable
ParsaAlizadeh Jan 6, 2025
2771a80
Feels wrong
ParsaAlizadeh Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 25 additions & 29 deletions rfpl/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ def syntaxError(self, recognizer, offendingSymbol, line, column, msg, e):


def check_grammar(cmd, superc=True):
if superc and re.match(r'^\s*(exit|finish|end|list|save\s+[\w/\-]+)\s*$',
cmd):
if superc and re.match(r'^\s*(exit|finish|end|list|save\s+[\w/\-]+)\s*$', cmd):
return True
if re.match(r'^\s*load\s+[\w/\-]+\s*$', cmd):
return True
input_stream = antlr4.InputStream(cmd)
lexer = RFPLLexer(input_stream)
stream = antlr4.CommonTokenStream(lexer)
parser = RFPLParser(stream)
error_listener = QuietErrorListener()
lexer.removeErrorListeners()
lexer.addErrorListener(error_listener)
parser.removeErrorListeners()
parser.addErrorListener(error_listener)
try:
input_stream = antlr4.InputStream(cmd)
lexer = RFPLLexer(input_stream)
stream = antlr4.CommonTokenStream(lexer)
parser = RFPLParser(stream)
error_listener = QuietErrorListener()
parser.removeErrorListeners()
parser.addErrorListener(error_listener)
parser.line()
except Exception:
return False

return not error_listener.has_errors


Expand Down Expand Up @@ -95,27 +95,23 @@ def load(intr: Interpreter, filename: str, loaded=[]):
for line in lines:
if line[0] == ';':
continue
cmd += line.strip() + ' '
if cmd == ' ':
cmd = ''
continue
if not line.strip():
print(f'\033[31mSorry, I didn\'t understood this one:\n{cmd.strip()}\033[0m')
cmd = ''
cmd += line.strip()
if not cmd:
continue
cmd += ' '
if not check_grammar(cmd, superc=False):
continue
mtch = re.match(r'^\s*load\s+(?P<FILE>[\w/\-]+)\s*$', cmd)
if mtch:
load(intr, mtch.group('FILE'), loaded + [filename])
else:
suc, res = intr.interpret(cmd)
if suc != 'Success':
print(f'\033[31m{suc}\033[0m')
elif isinstance(res, Natural):
print(f'\033[33m = {res}\033[0m')
ok, result = intr.interpret(cmd)
if not ok:
print(f'\033[31m{result}\033[0m')
elif isinstance(result, Natural):
print(f'\033[33m = {result}\033[0m')
else:
print(f'\033[33m . {res}\033[0m')
print(f'\033[33m . {result}\033[0m')
cmd = ''
print()
except Exception as e:
Expand Down Expand Up @@ -161,10 +157,10 @@ def save(filename:str):
save(mtch.group('FILE'))
continue
hist += line.strip() + '\n\n'
suc, res = intr.interpret(line)
if suc != 'Success':
print(f'\033[31m{suc}\033[0m\n')
elif isinstance(res, Natural):
print(f'\033[33m = {res}\033[0m\n')
ok, result = intr.interpret(line)
if not ok:
print(f'\033[31m{result}\033[0m')
elif isinstance(result, Natural):
print(f'\033[33m = {result}\033[0m\n')
else:
print(f'\033[33m . {res}\033[0m\n')
print(f'\033[33m . {result}\033[0m\n')
Loading