WIP #122 support CQL comments #139
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
tabdulradi
requested changes
Jan 9, 2017
| @@ -38,7 +38,7 @@ object CqlParser extends JavaTokenParsers | |||
| parse(phrase(selectStatement <~ semicolon.?), input) | |||
|
|
|||
| def parseDML(input: String): ParseResult[DataManipulation] = | |||
| parse(phrase(dmlDefinition <~ semicolon.?), input) | |||
| parse(phrase(dmlDefinition <~ semicolon.? <~ comment.?), input) | |||
There was a problem hiding this comment.
Comments wont't be supported inside queries. Instead they should be supported inside schema.cql file only.
| def comment: Parser[Comment] = { | ||
| import Comment._ | ||
|
|
||
| def str = "[0-9a-fA-F]".r |
There was a problem hiding this comment.
I am sure we have this regex defined somewhere else we can reuse
| def str = "[0-9a-fA-F]".r | ||
| def dash = s"--$str".r ^^ SingleLineDash | ||
| def slash = s"//$str".r ^^ SingleLineSlash | ||
| def multi = s"/*$str*/".r ^^ MultiLine |
There was a problem hiding this comment.
This won't work, the regex won't allow new lines.
Maybe write a test case first
tabdulradi
reviewed
Jan 21, 2017
|
|
||
| // Comments Parser | ||
| protected override val whiteSpace = """(\s|//.*|--.*|(?m)/\*(\*(?!/)|[^*])*\*/)+""".r | ||
| def comment = ident+ |
tabdulradi
reviewed
Jan 21, 2017
| @@ -74,11 +74,15 @@ object CqlParser extends JavaTokenParsers | |||
|
|
|||
| str | blob | uuid | floats | int | boolean | nullConst | |||
| } | |||
|
|
|||
| // Comments Parser | |||
There was a problem hiding this comment.
This comment can be something line "Ignores comments"
tabdulradi
reviewed
Jan 21, 2017
| user_time time, | ||
| user_status boolean, | ||
| user_balance double, | ||
| user_trans_id bigint |
There was a problem hiding this comment.
What about adding test for comments similar to those?
There was a problem hiding this comment.
in the same file CreateTableParserTest.scala ??
tabdulradi
approved these changes
Feb 1, 2017
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.
#122