This is an automated email from the ASF dual-hosted git repository.
brads pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a55574e29d1cd0b36336fb2867d31d6e08d9080c
Author: vgali7 <vga...@gatech.edu>
AuthorDate: Tue Aug 8 13:59:22 2023 -0400
cassandra-17667
---
pylib/cqlshlib/cql3handling.py | 11 ++++++-----
pylib/cqlshlib/cqlshmain.py | 1 -
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index d5e1ac96b0..01ea4fd2ca 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -183,6 +183,12 @@ JUNK ::= /([
\t\r\f\v]+|(--|[/][/])[^\n\r]*([\n\r]|$)|[/][*].*?[*][/])/ ;
<quotedStringLiteral> ::= /'([^']|'')*'/ ;
<pgStringLiteral> ::= /\$\$(?:(?!\$\$).)*\$\$/;
<quotedName> ::= /"([^"]|"")*"/ ;
+
+<unclosedPgString>::= /\$\$(?:(?!\$\$).)*/ ;
+<unclosedString> ::= /'([^']|'')*/ ;
+<unclosedName> ::= /"([^"]|"")*/ ;
+<unclosedComment> ::= /[/][*].*$/ ;
+
<float> ::= /-?[0-9]+\.[0-9]+/ ;
<uuid> ::=
/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/ ;
<blobLiteral> ::= /0x[0-9a-f]+/ ;
@@ -200,11 +206,6 @@ JUNK ::= /([
\t\r\f\v]+|(--|[/][/])[^\n\r]*([\n\r]|$)|[/][*].*?[*][/])/ ;
| "false"
;
-<unclosedPgString>::= /\$\$(?:(?!\$\$).)*/ ;
-<unclosedString> ::= /'([^']|'')*/ ;
-<unclosedName> ::= /"([^"]|"")*/ ;
-<unclosedComment> ::= /[/][*].*$/ ;
-
<term> ::= <stringLiteral>
| <integer>
| <float>
diff --git a/pylib/cqlshlib/cqlshmain.py b/pylib/cqlshlib/cqlshmain.py
index 29445ba07f..676dbf2e3d 100755
--- a/pylib/cqlshlib/cqlshmain.py
+++ b/pylib/cqlshlib/cqlshmain.py
@@ -838,7 +838,6 @@ class Shell(cmd.Cmd):
Returns true if the statement is complete and was handled (meaning it
can be reset).
"""
- statementtext = self.strip_comment_blocks(statementtext)
try:
statements, endtoken_escaped =
cqlruleset.cql_split_statements(statementtext)
except pylexotron.LexingError as e:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
