Add e-notation double (#4616)

* Add e-notation double * Run clang-format --------- Co-authored-by: CI Bot <[email protected]>
kuzudb · Dec 10, 2024 · 6a4685b · 6a4685b
1 parent 0a68e24
commit 6a4685b
Show file tree

Hide file tree

Showing 9 changed files with 1,000 additions and 944 deletions.
diff --git a/scripts/antlr4/Cypher.g4 b/scripts/antlr4/Cypher.g4
@@ -886,7 +886,12 @@ ZeroDigit
     : '0' ;
 
 oC_DoubleLiteral
-    : RegularDecimalReal ;
+    : ExponentDecimalReal
+        | RegularDecimalReal
+        ;
+
+ExponentDecimalReal
+    : ( ( Digit )+ | ( ( Digit )+ '.' ( Digit )+ ) | ( '.' ( Digit )+ ) ) ( 'E' | 'e' ) '-'? ( Digit )+ ;
 
 RegularDecimalReal
     : ( Digit )* '.' ( Digit )+ ;

diff --git a/scripts/antlr4/hash.md5 b/scripts/antlr4/hash.md5
@@ -1 +1 @@
-d9c5285da41449cec8a219dc7d558e11
+81546847023f2a4c8d1fec8ef8ff0d88
diff --git a/src/antlr4/Cypher.g4 b/src/antlr4/Cypher.g4
@@ -659,7 +659,12 @@ ZeroDigit
     : '0' ;
 
 oC_DoubleLiteral
-    : RegularDecimalReal ;
+    : ExponentDecimalReal
+        | RegularDecimalReal
+        ;
+
+ExponentDecimalReal
+    : ( ( Digit )+ | ( ( Digit )+ '.' ( Digit )+ ) | ( '.' ( Digit )+ ) ) ( 'E' | 'e' ) '-'? ( Digit )+ ;
 
 RegularDecimalReal
     : ( Digit )* '.' ( Digit )+ ;

diff --git a/src/parser/transform/transform_expression.cpp b/src/parser/transform/transform_expression.cpp
@@ -664,7 +664,8 @@ std::unique_ptr<ParsedExpression> Transformer::transformIntegerLiteral(
 
 std::unique_ptr<ParsedExpression> Transformer::transformDoubleLiteral(
     CypherParser::OC_DoubleLiteralContext& ctx) {
-    auto text = ctx.RegularDecimalReal()->getText();
+    auto text = ctx.ExponentDecimalReal() ? ctx.ExponentDecimalReal()->getText() :
+                                            ctx.RegularDecimalReal()->getText();
     ku_string_t literal{text.c_str(), text.length()};
     double result = 0;
     function::CastString::operation(literal, result);

diff --git a/test/test_files/projection/single_label.test b/test/test_files/projection/single_label.test
@@ -20,6 +20,14 @@ abc|1
 2|person
 2|person
 
+-LOG ReturnEDecimal
+-STATEMENT RETURN -9.13e-02
+---- 1
+-0.091300
+-STATEMENT RETURN -9.13e-02 + 1
+---- 1
+0.908700
+
 -LOG ReturnNullLiteral
 -STATEMENT RETURN (NULL = NULL) IS NOT NULL, NULL, NULL = NULL
 ---- 1

diff --git a/third_party/antlr4_cypher/cypher_lexer.cpp b/third_party/antlr4_cypher/cypher_lexer.cpp
diff --git a/third_party/antlr4_cypher/cypher_parser.cpp b/third_party/antlr4_cypher/cypher_parser.cpp
diff --git a/third_party/antlr4_cypher/include/cypher_lexer.h b/third_party/antlr4_cypher/include/cypher_lexer.h
@@ -41,9 +41,10 @@ class  CypherLexer : public antlr4::Lexer {
     L_SKIP = 153, INVALID_NOT_EQUAL = 154, MINUS = 155, FACTORIAL = 156, 
     COLON = 157, StringLiteral = 158, EscapedChar = 159, DecimalInteger = 160, 
     HexLetter = 161, HexDigit = 162, Digit = 163, NonZeroDigit = 164, NonZeroOctDigit = 165, 
-    ZeroDigit = 166, RegularDecimalReal = 167, UnescapedSymbolicName = 168, 
-    IdentifierStart = 169, IdentifierPart = 170, EscapedSymbolicName = 171, 
-    SP = 172, WHITESPACE = 173, CypherComment = 174, Unknown = 175
+    ZeroDigit = 166, ExponentDecimalReal = 167, RegularDecimalReal = 168, 
+    UnescapedSymbolicName = 169, IdentifierStart = 170, IdentifierPart = 171, 
+    EscapedSymbolicName = 172, SP = 173, WHITESPACE = 174, CypherComment = 175, 
+    Unknown = 176
   };
 
   explicit CypherLexer(antlr4::CharStream *input);

diff --git a/third_party/antlr4_cypher/include/cypher_parser.h b/third_party/antlr4_cypher/include/cypher_parser.h
@@ -41,9 +41,10 @@ class  CypherParser : public antlr4::Parser {
     L_SKIP = 153, INVALID_NOT_EQUAL = 154, MINUS = 155, FACTORIAL = 156, 
     COLON = 157, StringLiteral = 158, EscapedChar = 159, DecimalInteger = 160, 
     HexLetter = 161, HexDigit = 162, Digit = 163, NonZeroDigit = 164, NonZeroOctDigit = 165, 
-    ZeroDigit = 166, RegularDecimalReal = 167, UnescapedSymbolicName = 168, 
-    IdentifierStart = 169, IdentifierPart = 170, EscapedSymbolicName = 171, 
-    SP = 172, WHITESPACE = 173, CypherComment = 174, Unknown = 175
+    ZeroDigit = 166, ExponentDecimalReal = 167, RegularDecimalReal = 168, 
+    UnescapedSymbolicName = 169, IdentifierStart = 170, IdentifierPart = 171, 
+    EscapedSymbolicName = 172, SP = 173, WHITESPACE = 174, CypherComment = 175, 
+    Unknown = 176
   };
 
   enum {
@@ -2790,6 +2791,7 @@ class  CypherParser : public antlr4::Parser {
   public:
     OC_DoubleLiteralContext(antlr4::ParserRuleContext *parent, size_t invokingState);
     virtual size_t getRuleIndex() const override;
+    antlr4::tree::TerminalNode *ExponentDecimalReal();
     antlr4::tree::TerminalNode *RegularDecimalReal();
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		d9c5285da41449cec8a219dc7d558e11
		81546847023f2a4c8d1fec8ef8ff0d88