Skip to content

Fix parser crash when assigning substr #224

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
merged 1 commit into from
Sep 28, 2019
Merged

Fix parser crash when assigning substr #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions tests/functional/substr_err.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
IF k$<>s$ THEN REM
IF m$(s(1),s(2))="\b" THEN LET m$(s(1),s(2))="\c"
9 changes: 8 additions & 1 deletion zxbparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,10 +1166,17 @@ def p_substr_assignment(p):
if entry.class_ == CLASS.unknown:
entry.class_ = CLASS.var

assert entry.class_ == CLASS.var and entry.type_ == TYPE.string
if entry.class_ != CLASS.var:
api.errmsg.syntax_error_cannot_assign_not_a_var(p.lineno(2), p[2])
return

if entry.type_ != TYPE.string:
api.errmsg.syntax_error_expected_string(p.lineno(2), entry.type_)
return

if p[5].type_ != TYPE.string:
api.errmsg.syntax_error_expected_string(p.lineno(4), p[5].type_)
return

if len(p[3]) > 1:
syntax_error(p.lineno(2), "Accessing string with too many indexes. Expected only one.")
Expand Down