From fa39aa338097dfac823864103a24cfa082969e4d Mon Sep 17 00:00:00 2001 From: Patrick Damme Date: Tue, 28 Jan 2025 15:01:17 +0100 Subject: [PATCH] Finalization. - Removed superfluous parentheses in FLOAT_LITERAL. - Edited comment lines in test scripts. --- src/parser/sql/SQLGrammar.g4 | 2 +- test/api/cli/sql/between_1.daphne | 2 +- test/api/cli/sql/between_2.daphne | 2 +- test/api/cli/sql/between_3.daphne | 2 +- test/api/cli/sql/between_4.daphne | 2 +- test/api/cli/sql/strings_1.daphne | 2 +- test/api/cli/sql/strings_2.daphne | 2 +- test/api/cli/sql/strings_3.daphne | 2 +- test/api/cli/sql/strings_4.daphne | 2 +- test/api/cli/sql/strings_5.daphne | 2 +- test/api/cli/sql/strings_6.daphne | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/parser/sql/SQLGrammar.g4 b/src/parser/sql/SQLGrammar.g4 index 1593c07c8..31692eddc 100644 --- a/src/parser/sql/SQLGrammar.g4 +++ b/src/parser/sql/SQLGrammar.g4 @@ -194,7 +194,7 @@ INT_LITERAL: '-'? DIGIT+; FLOAT_LITERAL: - '-'? (( DIGIT* '.' DIGIT+) | ((DIGIT+ '.' DIGIT*))); + '-'? (( DIGIT* '.' DIGIT+) | (DIGIT+ '.' DIGIT*)); STRING_LITERAL: ('"' (ESCAPE_SEQ | ~[\\"])* '"') | ('\'' (ESCAPE_SEQ | ~['\\])* '\''); diff --git a/test/api/cli/sql/between_1.daphne b/test/api/cli/sql/between_1.daphne index b010967a1..43195658e 100644 --- a/test/api/cli/sql/between_1.daphne +++ b/test/api/cli/sql/between_1.daphne @@ -1,4 +1,4 @@ -# BETWEEN clause test with Strings as attributes +# BETWEEN clause with strings as attributes. f = createFrame( [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9], diff --git a/test/api/cli/sql/between_2.daphne b/test/api/cli/sql/between_2.daphne index 1a264e5c1..fa55d07a0 100644 --- a/test/api/cli/sql/between_2.daphne +++ b/test/api/cli/sql/between_2.daphne @@ -1,4 +1,4 @@ -# BETWEEN clause test with Integers as attribute +# BETWEEN clause with integers as attributes. f = createFrame( [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9], diff --git a/test/api/cli/sql/between_3.daphne b/test/api/cli/sql/between_3.daphne index 30a97fa2e..03c54ea98 100644 --- a/test/api/cli/sql/between_3.daphne +++ b/test/api/cli/sql/between_3.daphne @@ -1,4 +1,4 @@ -# Multiple BETWEEN clause test +# Multiple BETWEEN clauses. f = createFrame( [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9], diff --git a/test/api/cli/sql/between_4.daphne b/test/api/cli/sql/between_4.daphne index 78f5f8d57..478e3b5d4 100644 --- a/test/api/cli/sql/between_4.daphne +++ b/test/api/cli/sql/between_4.daphne @@ -1,4 +1,4 @@ -# BETWEEN clause test with following AND from the WHERE clause +# BETWEEN clause with following AND from the WHERE clause. f = createFrame( [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9], diff --git a/test/api/cli/sql/strings_1.daphne b/test/api/cli/sql/strings_1.daphne index 00f8f21f3..e5389fe14 100644 --- a/test/api/cli/sql/strings_1.daphne +++ b/test/api/cli/sql/strings_1.daphne @@ -1,4 +1,4 @@ -# String for SQL test using equality +# String equality. f = createFrame( [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9], diff --git a/test/api/cli/sql/strings_2.daphne b/test/api/cli/sql/strings_2.daphne index 8b4dbc2e0..8e939c527 100644 --- a/test/api/cli/sql/strings_2.daphne +++ b/test/api/cli/sql/strings_2.daphne @@ -1,4 +1,4 @@ -# String for SQL test using greater than comparision +# String greater-than comparision. f = createFrame( [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9], diff --git a/test/api/cli/sql/strings_3.daphne b/test/api/cli/sql/strings_3.daphne index 0595e0918..ff49008b9 100644 --- a/test/api/cli/sql/strings_3.daphne +++ b/test/api/cli/sql/strings_3.daphne @@ -1,4 +1,4 @@ -# String for SQL test using unequal and escaped double quotes +# String unequal and escaped double quotes. f = createFrame( [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9], diff --git a/test/api/cli/sql/strings_4.daphne b/test/api/cli/sql/strings_4.daphne index 7a8445446..90dfdd465 100644 --- a/test/api/cli/sql/strings_4.daphne +++ b/test/api/cli/sql/strings_4.daphne @@ -1,4 +1,4 @@ -# String for SQL test using equality and multi character Strings +# String equality and multi-character strings. f = createFrame( [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9], diff --git a/test/api/cli/sql/strings_5.daphne b/test/api/cli/sql/strings_5.daphne index eb2f20589..61f922b19 100644 --- a/test/api/cli/sql/strings_5.daphne +++ b/test/api/cli/sql/strings_5.daphne @@ -1,4 +1,4 @@ -# String for SQL test using greater equal and multi character Strings +# String greater-equal and multi-character strings. f = createFrame( [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9], diff --git a/test/api/cli/sql/strings_6.daphne b/test/api/cli/sql/strings_6.daphne index b63379e26..d162e8cc7 100644 --- a/test/api/cli/sql/strings_6.daphne +++ b/test/api/cli/sql/strings_6.daphne @@ -1,4 +1,4 @@ -# String for SQL test for escape character +# String escape characters. f = createFrame( [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9],