Skip to content
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.

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

Fix parseFill to check for fill ident before attempting to parse an expression #6547

Merged
merged 1 commit into from
Aug 1, 2016

Conversation

jsternberg
Copy link
Contributor

The previous parseFill would try to parse an expression and only unscan
one token when it failed. This caused it to not put back the correct
number of tokens with some expression.

Now it has been modified to check for the fill ident ahead of time and
then use ParseExpr() to parse the call. If the expression fails to parse
into a call, it will send an error instead of trying to continue with an
invalid parser state.

Fixes #6543.

@jsternberg jsternberg force-pushed the js-6543-parse-fill-bad-query branch from 294f262 to 632bdb3 Compare May 10, 2016 14:22
@jsternberg
Copy link
Contributor Author

@benbjohnson

@jsternberg jsternberg force-pushed the js-6543-parse-fill-bad-query branch from 632bdb3 to 16abf0a Compare May 10, 2016 17:22
@jsternberg jsternberg force-pushed the js-6543-parse-fill-bad-query branch from 16abf0a to 58e45b1 Compare August 1, 2016 16:37
…xpression

The previous parseFill would try to parse an expression and only unscan
one token when it failed. This caused it to not put back the correct
number of tokens with some expression.

Now it has been modified to check for the fill ident ahead of time and
then use ParseExpr() to parse the call. If the expression fails to parse
into a call, it will send an error instead of trying to continue with an
invalid parser state.

Fixes #6543.
@jsternberg jsternberg force-pushed the js-6543-parse-fill-bad-query branch from 58e45b1 to 2c739c0 Compare August 1, 2016 16:38
@dgnorton
Copy link
Contributor

dgnorton commented Aug 1, 2016

👍 lgtm

@jsternberg jsternberg merged commit 155ef81 into master Aug 1, 2016
@jsternberg jsternberg deleted the js-6543-parse-fill-bad-query branch August 1, 2016 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants