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
This commit is contained in:
Ziv
2023-05-24 15:07:53 +08:00
committed by GitHub
parent 9c82a5d248
commit eeb111b5c5
23 changed files with 231 additions and 215 deletions

View File

@ -1,18 +1,17 @@
// dt-sql-parser/src/grammar/plsql/PlSqlLexer.g4 by ANTLR 4.12.0
// Generated from /Users/ziv/github.com/dt-sql-parser/src/grammar/plsql/PlSqlLexer.g4 by ANTLR 4.12.0
// noinspection ES6UnusedImports,JSUnusedGlobalSymbols,JSUnusedLocalSymbols
import {
ATN,
ATNDeserializer,
CharStream,
DecisionState, DFA,
Lexer,
LexerATNSimulator,
RuleContext,
PredictionContextCache,
Token
} from "antlr4";
import PlSqlBaseLexer from './base/PlSqlBaseLexer';
import PlSqlBaseLexer from './PlSqlBaseLexer';
export default class PlSqlLexer extends PlSqlBaseLexer {
public static readonly ABORT = 1;

View File

@ -1,20 +1,24 @@
// dt-sql-parser/src/grammar/plsql/PlSqlParser.g4 by ANTLR 4.12.0
// Generated from /Users/ziv/github.com/dt-sql-parser/src/grammar/plsql/PlSqlParser.g4 by ANTLR 4.12.0
// noinspection ES6UnusedImports,JSUnusedGlobalSymbols,JSUnusedLocalSymbols
import {
ATN,
ATNDeserializer, DecisionState, DFA, FailedPredicateException,
RecognitionException, NoViableAltException, ParserATNSimulator,
RuleContext, ParserRuleContext, PredictionContextCache,
TerminalNode,
Token, CommonTokenStream,
RecognitionException, NoViableAltException, BailErrorStrategy,
Parser, ParserATNSimulator,
RuleContext, ParserRuleContext, PredictionMode, PredictionContextCache,
TerminalNode, RuleNode,
Token, TokenStream,
Interval, IntervalSet
} from 'antlr4';
import PlSqlParserListener from "./PlSqlParserListener.js";
import PlSqlParserVisitor from "./PlSqlParserVisitor.js";
import PlSqlBaseParser from './base/PlSqlBaseParser';
// for running tests with parameters, TODO: discuss strategy for typed parameters in CI
// eslint-disable-next-line no-unused-vars
type int = number;
import PlSqlBaseParser from './PlSqlBaseParser';
export default class PlSqlParser extends PlSqlBaseParser {
public static readonly ABORT = 1;
@ -6984,7 +6988,7 @@ export default class PlSqlParser extends PlSqlBaseParser {
return new FailedPredicateException(this, predicate, message);
}
constructor(input: CommonTokenStream) {
constructor(input: TokenStream) {
super(input);
this._interp = new ParserATNSimulator(this, PlSqlParser._ATN, PlSqlParser.DecisionsToDFA, new PredictionContextCache());
}
@ -55509,7 +55513,7 @@ export default class PlSqlParser extends PlSqlBaseParser {
{
this.state = 6733;
if (!(this.isVersion10())) {
throw this.createFailedPredicateException("isVersion10()");
throw this.createFailedPredicateException("this.isVersion10()");
}
this.state = 6734;
this.match(PlSqlParser.STANDBY);
@ -100098,7 +100102,6 @@ export default class PlSqlParser extends PlSqlBaseParser {
let _parentctx: ParserRuleContext = this._ctx;
let _parentState: number = this.state;
let localctx: Logical_expressionContext = new Logical_expressionContext(this, this._ctx, _parentState);
// @ts-ignore
let _prevctx: Logical_expressionContext = localctx;
let _startState: number = 1238;
this.enterRecursionRule(localctx, 1238, PlSqlParser.RULE_logical_expression, _p);
@ -100424,7 +100427,6 @@ export default class PlSqlParser extends PlSqlBaseParser {
let _parentctx: ParserRuleContext = this._ctx;
let _parentState: number = this.state;
let localctx: Relational_expressionContext = new Relational_expressionContext(this, this._ctx, _parentState);
// @ts-ignore
let _prevctx: Relational_expressionContext = localctx;
let _startState: number = 1246;
this.enterRecursionRule(localctx, 1246, PlSqlParser.RULE_relational_expression, _p);
@ -100800,7 +100802,6 @@ export default class PlSqlParser extends PlSqlBaseParser {
let _parentctx: ParserRuleContext = this._ctx;
let _parentState: number = this.state;
let localctx: ConcatenationContext = new ConcatenationContext(this, this._ctx, _parentState);
// @ts-ignore
let _prevctx: ConcatenationContext = localctx;
let _startState: number = 1256;
this.enterRecursionRule(localctx, 1256, PlSqlParser.RULE_concatenation, _p);

View File

@ -1,4 +1,4 @@
// dt-sql-parser/src/grammar/plsql/PlSqlParser.g4 by ANTLR 4.12.0
// Generated from /Users/ziv/github.com/dt-sql-parser/src/grammar/plsql/PlSqlParser.g4 by ANTLR 4.12.0
import {ParseTreeListener} from "antlr4";

View File

@ -1,4 +1,4 @@
// dt-sql-parser/src/grammar/plsql/PlSqlParser.g4 by ANTLR 4.12.0
// Generated from /Users/ziv/github.com/dt-sql-parser/src/grammar/plsql/PlSqlParser.g4 by ANTLR 4.12.0
import {ParseTreeVisitor} from 'antlr4';