Skip to content

Fix 168 #175

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

Open
jeff-dh wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Fix 168 #175

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cc28da6
added py_scadparser
jeff-dh May 16, 2021
e64dff0
removed unused function extract_callable_signatures
jeff-dh May 16, 2021
49988f2
use py_scadparser
jeff-dh May 16, 2021
243bfd7
fixed wrong openscad function syntax in examples/scad_to_include.scad
jeff-dh May 16, 2021
c749460
added another test module to examples/scad_to_include.scad
jeff-dh May 16, 2021
b883cfa
added support for (non)optional arguments
jeff-dh May 16, 2021
9860be4
fixed test_parse_scad_callables
jeff-dh May 19, 2021
1ece137
(hopefully) made run_all_tests.sh more portable
jeff-dh May 19, 2021
010c815
fixed unclosed file handle in py_scadparser
jeff-dh May 19, 2021
18fe487
allow strings to be quoted by single ticks -> '
jeff-dh May 22, 2021
7a0f612
improved py_scadparser error messages
jeff-dh May 22, 2021
7f65b21
fix #168
jeff-dh May 22, 2021
a2e6b05
removed unused function _get_include_path
jeff-dh May 22, 2021
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
Prev Previous commit
Next Next commit
improved py_scadparser error messages
  • Loading branch information
@jeff-dh
jeff-dh committed May 22, 2021
commit 7a0f612e105de3a9a07f17c81fe10036c6728e1d
4 changes: 2 additions & 2 deletions solid/py_scadparser/scad_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
9 changes: 5 additions & 4 deletions solid/py_scadparser/scad_tokens.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__":
Expand All @@ -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='')
Expand Down