Repository navigation
fix for escaped and grouping parentheses in like/regex operations - #46
Open
javierlores wants to merge 3 commits into
Open
javierlores wants to merge 3 commits into
javierlores wants to merge 3 commits into
Conversation
…nthesis-fix Resolved conflicts in grammar/grammar.jjt: - kept develop's command tokens and this branch's escape tokens; - NON_ALPHANUMERIC excludes both the backslash and the semicolon; - took develop's UnaryExpression with ScopedExpression; - UnaryValue and BinaryValue keep the escape prefix and use develop's Parsing.resolveLocalReference and ASTERISK_SUFFIXED_STRING; - RegexValue keeps this branch's nested grouping and accepts ASTERISK_SUFFIXED_STRING; - SearchValue, new in develop, also accepts the escape tokens, since a backslash no longer lexes inside a word. Regenerated src/main/java/com/cinchapi/ccl/generated/Grammar.java, GrammarConstants.java and GrammarTokenManager.java from the merged grammar.
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
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.
Added missing support for parentheses within regex/like operators which are required to be escaped
Added missing support for grouping with parentheses within regex/like operator
Modified to handle escaped links and escaped local resolution seperately to avoid conflict with escaped parenthesis