improved py_scadparser error messages

jeff-dh · May 22, 2021 · 7a0f612 · 7a0f612
1 parent 18fe487
commit 7a0f612
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/solid/py_scadparser/scad_parser.py b/solid/py_scadparser/scad_parser.py
@@ -240,12 +240,12 @@ def p_module(p):
     p[0] = ScadModule(p[2], params)
 
 def p_error(p):
-    print(f'{p.lineno}:{p.lexpos} {p.type} - {p.value}')
-    print("syntex error")
+    print(f'py_scadparser: Syntax error: {p.lexer.filename}({p.lineno}) {p.type} - {p.value}')
 
 def parseFile(scadFile):
 
     lexer = lex.lex()
+    lexer.filename = scadFile
     parser = yacc.yacc()
 
     uses = []

diff --git a/solid/py_scadparser/scad_tokens.py b/solid/py_scadparser/scad_tokens.py
@@ -84,7 +84,7 @@ def t_NUMBER(t):
     return t
 
 def t_error(t):
-    print(f'Illegal character ({t.lexer.lineno}) "{t.value[0]}"')
+    print(f'py_scadparser: Illegal character: {t.lexer.filename}({t.lexer.lineno}) "{t.value[0]}"')
     t.lexer.skip(1)
 
 if __name__ == "__main__":
@@ -97,9 +97,10 @@ def t_error(t):
 
     p = Path(sys.argv[1])
     f = p.open()
-    lex.lex()
-    lex.input(''.join(f.readlines()))
-    for tok in iter(lex.token, None):
+    lexer = lex.lex()
+    lexer.filename = p.as_posix()
+    lexer.input(''.join(f.readlines()))
+    for tok in iter(lexer.token, None):
         if tok.type == "MODULE":
             print("")
         print(repr(tok.type), repr(tok.value), end='')