s/INTEGER/DIGITS/
simplify rules for IDENTIFIER and VARIABLE
diff --git a/asterix-aql/src/main/javacc/AQL.jj b/asterix-aql/src/main/javacc/AQL.jj
index fdcd86e..fdbcc71 100644
--- a/asterix-aql/src/main/javacc/AQL.jj
+++ b/asterix-aql/src/main/javacc/AQL.jj
@@ -2109,17 +2109,17 @@
TOKEN:
{
- < DOUBLE_LITERAL: <INTEGER>
- | <INTEGER> ( "." <INTEGER> )?
- | "." <INTEGER>
+ < DOUBLE_LITERAL: <DIGITS>
+ | <DIGITS> ( "." <DIGITS> )?
+ | "." <DIGITS>
>
|
- < FLOAT_LITERAL: <INTEGER> ( "f" | "F" )
- | <INTEGER> ( "." <INTEGER> ( "f" | "F" ) )?
- | "." <INTEGER> ( "f" | "F" )
+ < FLOAT_LITERAL: <DIGITS> ( "f" | "F" )
+ | <DIGITS> ( "." <DIGITS> ( "f" | "F" ) )?
+ | "." <DIGITS> ( "f" | "F" )
>
|
- <INTEGER : (<DIGIT>)+ >
+ <DIGITS : (<DIGIT>)+ >
}
<DEFAULT>
@@ -2147,14 +2147,14 @@
<DEFAULT>
TOKEN :
{
- <IDENTIFIER : (<LETTER>)+ (<LETTER> | <DIGIT> | <SPECIALCHARS>)*>
+ <IDENTIFIER : <LETTER> (<LETTER> | <DIGIT> | <SPECIALCHARS>)*>
}
<DEFAULT>
TOKEN :
{
- <VARIABLE : "$" (<LETTER>)+ (<LETTER> | <DIGIT> | "_")* >
+ <VARIABLE : "$" <LETTER> (<LETTER> | <DIGIT> | "_")*>
}
SKIP: