Fix TypeScript syntax accidentally left in ECMAScript.lexh

Author: idodeclare

opengrok-indexer/src/main/resources/analysis/javascript/ECMAScript.lexh

@@ -29,16 +29,13 @@
  */
 Identifier = [\p{XID_Start}_$] [\p{XID_Continue}$\u{200C}\u{200D}]*
 
-/*
- * TypeScript 2.7 added support for numeric separators.
- */
 NumericLiteral = ({DecimalLiteral} | {BinaryIntegerLiteral} |
     {OctalIntegerLiteral} | {HexIntegerLiteral})
 
 DecimalLiteral = ({DecimalIntegerLiteral} "." {ExponentPart}? |
     {DecimalIntegerLiteral} "." {DecimalDigits} {ExponentPart}? |
     "." {DecimalDigits} {ExponentPart}? |
-    {DecimalIntegerLiteral} ({ExponentPart} | {BigIntSuffix})?)
+    {DecimalIntegerLiteral} {ExponentPart}?)
 /*
  * OpenGrok relaxes from the strict ECMA definition of
  *     DecimalIntegerLiteral::
@@ -48,29 +45,23 @@ DecimalLiteral = ({DecimalIntegerLiteral} "." {ExponentPart}? |
  * NonOctalDecimalIntegerLiteral, or LegacyOctalLikeDecimalIntegerLiteral.
  */
 DecimalIntegerLiteral = {DecimalDigits}
-DecimalDigits = ({DecimalDigit} |
-    {DecimalDigit} {NumericLiteralSeparator} {DecimalDigit})+
+DecimalDigits = {DecimalDigit}+
 DecimalDigit = [0123456789]
 // NonZeroDigit = [123456789]
 ExponentPart = {ExponentIndicator} {SignedInteger}
 ExponentIndicator = [eE]
 SignedInteger = ({DecimalDigits} | "+" {DecimalDigits} | "-" {DecimalDigits})
-NumericLiteralSeparator = "_"    // version 2.7
-BigIntSuffix = "n"    // version 3.2
 
 BinaryIntegerLiteral = "0" [bB] {BinaryDigits}
-BinaryDigits = ({BinaryDigit} |
-    {BinaryDigit} {NumericLiteralSeparator} {BinaryDigit})+
+BinaryDigits = {BinaryDigit}+
 BinaryDigit = [01]
 
 OctalIntegerLiteral = "0" [oO] {OctalDigits}
-OctalDigits = ({OctalDigit} |
-    {OctalDigit} {NumericLiteralSeparator} {OctalDigit})+
+OctalDigits = {OctalDigit}+
 OctalDigit = [01234567]
 
 HexIntegerLiteral = "0" [xX] {HexDigits}
-HexDigits = ({HexDigit} |
-    {HexDigit} {NumericLiteralSeparator} {HexDigit})+
+HexDigits = {HexDigit}+
 HexDigit = [0123456789abcdefABCDEF]
 
 File = [a-zA-Z]{FNameChar}* "." ([Js][Ss] |

opengrok-indexer/src/main/resources/analysis/typescript/TypeScript.lexh

@@ -35,6 +35,15 @@ HexDigits = ({HexDigit} |
     {HexDigit} {NumericLiteralSeparator} {HexDigit})+
 NumericLiteralSeparator = "_"
 
+/*
+ * TypeScript 3.2 added support for a bigint suffix.
+ */
+DecimalLiteral = ({DecimalIntegerLiteral} "." {ExponentPart}? |
+    {DecimalIntegerLiteral} "." {DecimalDigits} {ExponentPart}? |
+    "." {DecimalDigits} {ExponentPart}? |
+    {DecimalIntegerLiteral} ({ExponentPart} | {BigIntSuffix})?)
+BigIntSuffix = "n"    // version 3.2
+
 File = [a-zA-Z]{FNameChar}* "." ([Jj][Ss] | [Tt][Ss][Xx]? |
     [Pp][Rr][Oo][Pp][Ee][Rr][Tt][Ii][Ee][Ss] | [Pp][Rr][Oo][Pp][Ss] |
     [Xx][Mm][Ll] | [Cc][Oo][Nn][Ff] | [Tt][Xx][Tt] | [Hh][Tt][Mm][Ll]? |

opengrok-indexer/src/main/resources/analysis/typescript/TypeScriptSymbolTokenizer.lex

@@ -121,9 +121,11 @@ import java.io.IOException;
 %include Common.lexh
 %include CommonURI.lexh
 %include CommonPath.lexh
-%include TypeScript.lexh
 %include ECMAScript.lexh
+// TypeScript.lexh comes after ECMAScript so that TypeScript macros supersede.
+%include TypeScript.lexh
 
 %%
+// TypeScriptProductions.lexh comes first so that its expressions are preferred.
 %include TypeScriptProductions.lexh
 %include ECMAScriptProductions.lexh

opengrok-indexer/src/main/resources/analysis/typescript/TypeScriptXref.lex

@@ -102,9 +102,11 @@ import java.util.Set;
 %include Common.lexh
 %include CommonURI.lexh
 %include CommonPath.lexh
+// TypeScript.lexh comes after ECMAScript so that TypeScript macros supersede.
 %include ECMAScript.lexh
 %include TypeScript.lexh
 
 %%
+// TypeScriptProductions.lexh comes first so that its expressions are preferred.
 %include TypeScriptProductions.lexh
 %include ECMAScriptProductions.lexh