fix: thread the mode into the parser #3599
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ggreif
force-pushed
the
gabor/viper-parser-mode
branch
from
cd3c655
to
273833f
Compare
ggreif
commented
Nov 22, 2022
ggreif
commented
Nov 22, 2022
| @@ -1,4 +1,26 @@ | |||
| (* Viper only tokens and productions *) | |||
| %{ | |||
There was a problem hiding this comment.
moved here from parser.mly
|
I've tested that this PR enables the moc test/viper/invariant.mo
test/viper/invariant.mo:9.10-9.19: syntax error [M0001], unexpected token 'invariant', expected one of token or <phrase> sequence:
system <exp_nest>
return <exp_nest>
invariant <exp_nest>
func <exp_nest>
<nat> : async <exp_nest>whereas beforehand we had [nix-shell:~/workdir/motoko]$ moc test/viper/invariant.mo
test/viper/invariant.mo:9.3-9.71: syntax error [M0181], verification assertions not permitted in normal mode
test/viper/invariant.mo:10.3-10.29: syntax error [M0181], verification assertions not permitted in normal mode
test/viper/invariant.mo:11.3-11.50: syntax error [M0181], verification assertions not permitted in normal mode
test/viper/invariant.mo:14.7-14.29: syntax error [M0181], verification assertions not permitted in normal mode
test/viper/invariant.mo:16.7-16.31: syntax error [M0181], verification assertions not permitted in normal modewhich was more verbose. This is just FYI; I don't consider the new behavior problematic. |
ggreif
commented
Nov 22, 2022
| @@ -9,7 +9,10 @@ type import = string * string | |||
|
|
|||
| let parse_with mode lexbuf parser = | |||
| let tokenizer, _ = Lexer.tokenizer mode lexbuf in | |||
| Ok (Parsing.parse 0 (parser lexbuf.Lexing.lex_curr_p) tokenizer lexbuf) | |||
| Ok | |||
| (Parsing.parse Lexer_lib.mode 0 | |||
There was a problem hiding this comment.
passing an additional argument
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Turns out I was doing a bunch of things wrong. Now we make the relevant
Lexer_lib.modeaccessible from the parser productions (previously it just accessed a constant thing).This makes
--viperto select theverificationmode in the parser too (lexer was already fine).