Fix scan failures on nested compiler directives #262
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
This type was exposed through public methods, so it shouldn't be package-private.
denieu
approved these changes
Jun 20, 2024
zaneduffield
requested changes
Jun 20, 2024
delphi-frontend/src/main/antlr3/au/com/integradev/delphi/antlr/Delphi.g
Outdated
Show resolved
Hide resolved
delphi-frontend/src/main/antlr3/au/com/integradev/delphi/antlr/Delphi.g
Outdated
Show resolved
Hide resolved
...c/test/java/au/com/integradev/delphi/preprocessor/directive/CompilerDirectiveParserTest.java
Outdated
Show resolved
Hide resolved
...c/main/java/au/com/integradev/delphi/preprocessor/directive/CompilerDirectiveParserImpl.java
Show resolved
Hide resolved
...rc/main/java/au/com/integradev/delphi/preprocessor/directive/expression/ExpressionLexer.java
Show resolved
Hide resolved
Cirras
force-pushed
the
recursive_directives
branch
from
6875948 to
e7e4f26
Compare
delphi-frontend/src/test/resources/au/com/integradev/delphi/preprocessor/Expressions.pas
Outdated
Show resolved
Hide resolved
Compiler directives (and comments) can appear nested within the constant
expressions of `{$if}` and `{$elseif}` directives.
Cirras
force-pushed
the
recursive_directives
branch
from
e7e4f26 to
434e3e2
Compare
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.
This PR:
Token.TokenTypeto public visibility (incidental QA)IFdirective:{$ifǣ <> 123}Note that this does not add proper support or evaluation for nested compiler directives.
That would be quite challenging to accomplish without first doing #261.
Fixes #260.