fix: correct the grammar usage, especially in the parts targeting javascript (#109)

* build: ignore gen folder

* fix: correct the grammar when targeting Typescript

* fix: move base Lexer and fix javascript syntax

* fix: correct the usage of Javascript in grammar

Author: wewoor

.gitignore

@@ -6,4 +6,5 @@ package-lock.json
 dist/
 src/**/.antlr
 coverage
-.idea
+.idea
+gen/

src/grammar/pgsql/PostgreSQLLexer.g4

@@ -178,14 +178,14 @@ PARAM
 
 Operator
    : ((OperatorCharacter | ('+' | '-'
-   {checkLA('-')}?)+ (OperatorCharacter | '/'
-   {checkLA('*')}?) | '/'
-   {checkLA('*')}?)+ | // special handling for the single-character operators + and -
+   {this.checkLA('-')}?)+ (OperatorCharacter | '/'
+   {this.checkLA('*')}?) | '/'
+   {this.checkLA('*')}?)+ | // special handling for the single-character operators + and -
    [+-])
    //TODO somehow rewrite this part without using Actions
 
    {
-    HandleLessLessGreaterGreater();
+    this.HandleLessLessGreaterGreater();
    }
    ;
 /* This rule handles operators which end with + or -, and sets the token type to Operator. It is comprised of four
@@ -202,9 +202,9 @@ Operator
 
 OperatorEndingWithPlusMinus
    : (OperatorCharacterNotAllowPlusMinusAtEnd | '-'
-   {checkLA('-')}? | '/'
-   {checkLA('*')}?)* OperatorCharacterAllowPlusMinusAtEnd Operator? ('+' | '-'
-   {checkLA('-')}?)+ -> type (Operator)
+   {this.checkLA('-')}? | '/'
+   {this.checkLA('*')}?)* OperatorCharacterAllowPlusMinusAtEnd Operator? ('+' | '-'
+   {this.checkLA('-')}?)+ -> type (Operator)
    ;
    // Each of the following fragment rules omits the +, -, and / characters, which must always be handled in a special way
 
@@ -2200,11 +2200,11 @@ fragment IdentifierStartChar
    [\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF]
    | // these are the letters above 0xFF which only need a single UTF-16 code unit
    [\u0100-\uD7FF\uE000-\uFFFF]
-   {charIsLetter()}?
+   {this.charIsLetter()}?
    | // letters which require multiple UTF-16 code units
    [\uD800-\uDBFF] [\uDC00-\uDFFF]
    {
-    CheckIfUtf32Letter()
+    this.CheckIfUtf32Letter()
    }?
 
    ;
@@ -2315,7 +2315,7 @@ UnterminatedUnicodeEscapeStringConstant
 
 BeginDollarStringConstant
    : '$' Tag? '$'
-   {pushTag();} -> pushMode (DollarQuotedStringMode)
+   {this.pushTag();} -> pushMode (DollarQuotedStringMode)
    ;
 /* "The tag, if any, of a dollar-quoted string follows the same rules as an
  * unquoted identifier, except that it cannot contain a dollar sign."
@@ -2366,7 +2366,7 @@ Integral
 
 NumericFail
    : Digits '..'
-   {HandleNumericFail();}
+   {this.HandleNumericFail();}
    ;
 
 Numeric
@@ -2424,7 +2424,7 @@ UnterminatedBlockComment
    // Optional assertion to make sure this rule is working as intended
 
    {
-            UnterminatedBlockCommentDebugAssert();
+      this.UnterminatedBlockCommentDebugAssert();
    }
    ;
    //
@@ -2538,7 +2538,6 @@ DollarText
 
 EndDollarStringConstant
    : ('$' Tag? '$')
-   {isTag()}?
-   {popTag();} -> popMode
+   {this.isTag()}?
+   {this.popTag();} -> popMode
    ;
-

src/grammar/pgsql/PostgreSQLParser.g4

@@ -1957,10 +1957,8 @@ aggregate_with_argtypes_list
 createfunc_opt_list
    : createfunc_opt_item+
    {
-                ParseRoutineBody(_localctx);
-            }
-   //                    | createfunc_opt_list createfunc_opt_item
-
+      this.ParseRoutineBody(localctx);
+   }
    ;
 
 common_func_opt_item
@@ -4562,7 +4560,6 @@ from pl_gram.y, line ~2982
 	 * at least we need not worry about it appearing as an identifier.
 */
 
-
    //                 | INTO
    | LATERAL_P
    | LEADING
@@ -4606,7 +4603,8 @@ from pl_gram.y, line ~2982
 
 /*PLSQL grammar */
 
-   /************************************************************************************************************************************************************/ pl_function
+/************************************************************************************************************************************************************/ 
+pl_function
    : comp_options pl_block opt_semi
    ;
 
@@ -4925,7 +4923,6 @@ exit_type
    : EXIT
    | CONTINUE_P
    ;
-   //todo implement RETURN statement according to initial grammar line 1754
 
 stmt_return
    : RETURN (NEXT sql_expression | QUERY (EXECUTE a_expr opt_for_using_expression | selectstmt) | opt_return_result) SEMI
@@ -5324,4 +5321,3 @@ opt_returning_clause_into
    : INTO opt_strict into_target
    |
    ;
-

src/grammar/plsql/PlSqlLexer.g4

@@ -24,10 +24,6 @@ options {
     superClass=PlSqlBaseLexer;
 }
 
-@lexer::postinclude {
-#include <PlSqlBaseLexer.h>
-}
-
 ABORT:                        'ABORT';
 ABS:                          'ABS';
 ACCESS:                       'ACCESS';
@@ -2342,17 +2338,17 @@ INTRODUCER: '_';
 SINGLE_LINE_COMMENT: '--' ~('\r' | '\n')* NEWLINE_EOF                 -> channel(HIDDEN);
 MULTI_LINE_COMMENT:  '/*' .*? '*/'                                    -> channel(HIDDEN);
 // https://docs.oracle.com/cd/E11882_01/server.112/e16604/ch_twelve034.htm#SQPUG054
-REMARK_COMMENT:      'REM' {IsNewlineAtPos(-4)}? 'ARK'? (' ' ~('\r' | '\n')*)? NEWLINE_EOF -> channel(HIDDEN);
+REMARK_COMMENT:      'REM' {this.IsNewlineAtPos(-4)}? 'ARK'? (' ' ~('\r' | '\n')*)? NEWLINE_EOF -> channel(HIDDEN);
 
 // https://docs.oracle.com/cd/E11882_01/server.112/e16604/ch_twelve032.htm#SQPUG052
-PROMPT_MESSAGE:      'PRO' {IsNewlineAtPos(-4)}? 'MPT'? (' ' ~('\r' | '\n')*)? NEWLINE_EOF;
+PROMPT_MESSAGE:      'PRO' {this.IsNewlineAtPos(-4)}? 'MPT'? (' ' ~('\r' | '\n')*)? NEWLINE_EOF;
 
 // TODO: should starts with newline
 START_CMD
     //: 'STA' 'RT'? SPACE ~('\r' | '\n')* NEWLINE_EOF
     // https://docs.oracle.com/cd/B19306_01/server.102/b14357/ch12002.htm
     // https://docs.oracle.com/cd/B19306_01/server.102/b14357/ch12003.htm
-    : '@' {IsNewlineAtPos(-2)}? '@'? ~('\r' | '\n')* NEWLINE_EOF
+    : '@' {this.IsNewlineAtPos(-2)}? '@'? ~('\r' | '\n')* NEWLINE_EOF
     ;
 
 REGULAR_ID: SIMPLE_LETTER (SIMPLE_LETTER | '$' | '_' | '#' | [0-9])*;
@@ -2366,4 +2362,4 @@ fragment QUESTION_MARK  : '?';
 fragment SIMPLE_LETTER  : [A-Z];
 fragment FLOAT_FRAGMENT : UNSIGNED_INTEGER* '.'? UNSIGNED_INTEGER+;
 fragment NEWLINE        : '\r'? '\n';
-fragment SPACE          : [ \t];
+fragment SPACE          : [ \t];

src/grammar/plsql/PlSqlParser.g4

@@ -25,10 +25,6 @@ options {
     superClass=PlSqlBaseParser;
 }
 
-@parser::postinclude {
-#include <PlSqlBaseParser.h>
-}
-
 program: sql_script EOF;
 
 sql_script
@@ -2254,7 +2250,7 @@ partial_database_recovery
     ;
 
 partial_database_recovery_10g
-    : {isVersion10()}? STANDBY
+    : {this.isVersion10()}? STANDBY
       ( TABLESPACE tablespace (',' tablespace)*
       | DATAFILE CHAR_STRING | filenumber (',' CHAR_STRING | filenumber)*
       )
@@ -6760,4 +6756,4 @@ numeric_function_name
     | NVL
     | ROUND
     | SUM
-    ;
+    ;