More comples NUMBER definition

INTEGER, DECIMAL, DOUBLE with EXPONENT
lszeremeta · Aug 17, 2020 · d25073a · d25073a
1 parent 5f76cb5
commit d25073a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/other-notations/YARSpg.ebnf b/other-notations/YARSpg.ebnf
@@ -146,7 +146,13 @@ SECTION_NAME
            | 'EDGES'
 COMMENT  ::= '#' [^#xd#xa#xc]*
 STRING   ::= STRING_LITERAL_QUOTE
-NUMBER   ::= SIGN? [0-9]+ '.'? [0-9]*
+NUMBER   ::= INTEGER
+           | DECIMAL
+           | DOUBLE
+INTEGER  ::= SIGN? [0-9]+
+DECIMAL  ::= SIGN? [0-9]* '.' [0-9]+
+DOUBLE   ::= SIGN? ([0-9]+ '.' [0-9]* EXPONENT | '.' [0-9]+ EXPONENT | [0-9]+ EXPONENT)
+EXPONENT ::= [eE] SIGN? [0-9]+
 BOOL     ::= 'true'
            | 'false'
 DATETYPE ::= DATETIME
@@ -157,8 +163,6 @@ TIME     ::= [0-9] [0-9] ':' [0-9] [0-9] ':' [0-9] [0-9] TIMEZONE?
 TIMEZONE ::= SIGN? [0-9] [0-9] ':' [0-9] [0-9]
 DATETIME
          ::= DATE 'T' TIME
-SIGN     ::= '+'
-           | '-'
 STRING_LITERAL_QUOTE
          ::= '"' ([^"\#xd#xa] | "'" | '\"')* '"'
 ALNUM_PLUS

diff --git a/yarspg/YARSpg.g4 b/yarspg/YARSpg.g4
@@ -253,9 +253,27 @@ STRING
     ;
 
 NUMBER
-    : SIGN? [0-9]+'.'?[0-9]*
+    : INTEGER
+    | DECIMAL
+    | DOUBLE
     ;
 
+INTEGER
+   : SIGN? [0-9]+
+   ;
+
+DECIMAL
+   : SIGN? [0-9]* '.' [0-9]+
+   ;
+
+DOUBLE
+   : SIGN? ([0-9]+ '.' [0-9]* EXPONENT | '.' [0-9]+ EXPONENT | [0-9]+ EXPONENT)
+   ;
+
+EXPONENT
+   : [eE] SIGN? [0-9]+
+   ;
+
 BOOL
     : 'true'
     | 'false'