improvement: allow values without quotes #46
Merged
Conversation
This file contains hidden or 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
Previously, string values would always require quotes since that coresponded to actual scala syntax. Now, we no longer allow using directives in normal Scala code, so we can allow values without quotes. Whenever there is a more complex value like one that requires a space, we would still require them.
ca532f8 to
16d5528
Compare
szymon-rd
approved these changes
Apr 17, 2023
| "Expected primitive value: string, numeric or boolean but found %s. %s", | ||
| in.td.toTokenInfoString(), solution)); | ||
| } else if (in.td.token == Tokens.IDENTIFIER) { | ||
| if (in.td.name.startsWith("-") && in.td.name.chars().allMatch(Character::isDigit)) { |
There was a problem hiding this comment.
i am not sure I understand. -42 begins with -, but - Is not a digit so this check will not pass?
There was a problem hiding this comment.
Yeah, you are right, it doesn't work. I wonder though should we care about numbers. I changed it for now, but it's a bit hacky to make it work. Should we maybe drop numeric values? It can be parsed later on if needed.
362b430 to
ae8c84d
Compare
szymon-rd
reviewed
Apr 25, 2023
src/test/java/com/virtuslab/using_directives/parser/ParserNumericTest.java
Outdated
Show resolved
Hide resolved
src/test/java/com/virtuslab/using_directives/parser/ParserStringTest.java
Outdated
Show resolved
Hide resolved
Numeric values do not need to be treated differently than string ones and especially since it's not needed to use quotes it makes it problematic to check what is a number. I also removed any kind of braces, parens etc. since I would need to fix the tests and they no longer make sense with this version of directives.
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.
Previously, string values would always require quotes since that coresponded to actual scala syntax. Now, we no longer allow using directives in normal Scala code, so we can allow values without quotes. Whenever there is a more complex value like one that requires a space, we would still require them.
Related to VirtusLab/scala-cli#1954
Additionally the values are not treated literally and can contain any special characters since we are not limited by Scala syntax.
I also changed to only allow single line, which simplified tests a bit as they were taking into account newlines in a lot of places.