fix: circle dependency

Author: luomingtao

benchmark/TestPerformance.ts

@@ -45,7 +45,7 @@ import { ParserRuleContext } from "../src/ParserRuleContext";
 import { ParseTree } from "../src/tree/ParseTree";
 import { ParseTreeListener } from "../src/tree/ParseTreeListener";
 import { ParseTreeWalker } from "../src/tree/ParseTreeWalker";
-import { PredictionContextCache } from "../src/atn/PredictionContextCache";
+import { PredictionContextCache } from "../src/atn/PredictionContext";
 import { PredictionMode } from "../src/atn/PredictionMode";
 import { RecognitionException } from "../src/RecognitionException";
 import { Recognizer } from "../src/Recognizer";

src/Parser.ts

@@ -24,6 +24,7 @@ import { IntStream } from "./IntStream";
 import { Lexer } from "./Lexer";
 import { Override, NotNull, Nullable } from "./Decorators";
 import { ParseInfo } from "./atn/ParseInfo";
+import { ProfilingATNSimulator } from "./atn/ProfilingATNSimulator";
 import { ParserATNSimulator } from "./atn/ParserATNSimulator";
 import { ParserErrorListener } from "./ParserErrorListener";
 import { ParserRuleContext } from "./ParserRuleContext";
@@ -39,7 +40,6 @@ import { Token } from "./Token";
 import { TokenFactory } from "./TokenFactory";
 import { TokenSource } from "./TokenSource";
 import { TokenStream } from "./TokenStream";
-import { ProfilingATNSimulator } from "./atn/ProfilingATNSimulator";
 import { ParseTreePatternMatcher } from "./tree/pattern/ParseTreePatternMatcher";
 
 class TraceListener implements ParseTreeListener {

src/ParserInterpreter.ts

@@ -5,6 +5,8 @@
 
 // ConvertTo-TS run at 2016-10-04T11:26:53.1043451-07:00
 
+import { Parser } from "./Parser";
+import { ParserATNSimulator } from "./atn/ParserATNSimulator";
 import { ActionTransition } from "./atn/ActionTransition";
 import { ATN } from "./atn/ATN";
 import { ATNState } from "./atn/ATNState";
@@ -18,8 +20,6 @@ import { InterpreterRuleContext } from "./InterpreterRuleContext";
 import { LoopEndState } from "./atn/LoopEndState";
 import { NotNull } from "./Decorators";
 import { Override } from "./Decorators";
-import { Parser } from "./Parser";
-import { ParserATNSimulator } from "./atn/ParserATNSimulator";
 import { ParserRuleContext } from "./ParserRuleContext";
 import { PrecedencePredicateTransition } from "./atn/PrecedencePredicateTransition";
 import { PredicateTransition } from "./atn/PredicateTransition";

src/atn/ParserATNSimulator.ts

@@ -5,6 +5,7 @@
 
 // ConvertTo-TS run at 2016-10-04T11:26:31.1989835-07:00
 
+import { Parser } from "../Parser";
 import { AcceptStateInfo } from "../dfa/AcceptStateInfo";
 import { ActionTransition } from "./ActionTransition";
 import { Array2DHashSet } from "../misc/Array2DHashSet";
@@ -30,7 +31,6 @@ import { NotNull, Nullable, Override } from "../Decorators";
 import { NotSetTransition } from "./NotSetTransition";
 import { NoViableAltException } from "../NoViableAltException";
 import { ObjectEqualityComparator } from "../misc/ObjectEqualityComparator";
-import { Parser } from "../Parser";
 import { ParserRuleContext } from "../ParserRuleContext";
 import { PrecedencePredicateTransition } from "./PrecedencePredicateTransition";
 import { PredicateTransition } from "./PredicateTransition";

src/atn/ProfilingATNSimulator.ts

@@ -5,6 +5,8 @@
 
 // ConvertTo-TS run at 2016-10-04T11:26:36.4188352-07:00
 
+import { Parser } from "../Parser";
+import { ParserATNSimulator } from "./ParserATNSimulator";
 import { AmbiguityInfo } from "./AmbiguityInfo";
 import { INVALID_ALT_NUMBER } from "./Constant";
 import { ATNConfigSet } from "./ATNConfigSet";
@@ -17,8 +19,6 @@ import { DFAState } from "../dfa/DFAState";
 import { ErrorInfo } from "./ErrorInfo";
 import { NotNull, Override } from "../Decorators";
 import { LookaheadEventInfo } from "./LookaheadEventInfo";
-import { Parser } from "../Parser";
-import { ParserATNSimulator } from "./ParserATNSimulator";
 import { ParserRuleContext } from "../ParserRuleContext";
 import { PredicateEvalInfo } from "./PredicateEvalInfo";
 import { PredictionContextCache } from "./PredictionContext";

src/index.ts

@@ -2,12 +2,12 @@
  * Copyright 2016 The ANTLR Project. All rights reserved.
  * Licensed under the BSD-3-Clause license. See LICENSE file in the project root for license information.
  */
-
+export * from "./ParserInterpreter";
+export * from "./Parser";
 export * from "./ANTLRErrorListener";
 export * from "./ANTLRErrorStrategy";
 // export * from "./ANTLRFileStream";
 export * from "./ANTLRInputStream";
-export * from "./BailErrorStrategy";
 export * from "./BufferedTokenStream";
 export * from "./CharStream";
 export * from "./CharStreams";
@@ -29,9 +29,7 @@ export * from "./LexerInterpreter";
 export * from "./LexerNoViableAltException";
 export * from "./ListTokenSource";
 export * from "./NoViableAltException";
-export * from "./Parser";
 export * from "./ParserErrorListener";
-export * from "./ParserInterpreter";
 export * from "./ParserRuleContext";
 export * from "./ProxyErrorListener";
 export * from "./ProxyParserErrorListener";
@@ -51,3 +49,6 @@ export * from "./TokenStreamRewriter";
 export * from "./Vocabulary";
 export * from "./VocabularyImpl";
 export * from "./WritableToken";
+export * from "./BailErrorStrategy";
+export * from "./atn";
+export * from "./misc";

src/misc/index.ts

@@ -16,7 +16,7 @@ export * from "./EqualityComparator";
 // export * from "./FlexibleHashMap";
 export * from "./IntegerList";
 export * from "./IntegerStack";
-export * from "./InterpreterDataReader";
+// export * from "./InterpreterDataReader";
 export * from "./Interval";
 export * from "./IntervalSet";
 export * from "./IntSet";

test/tool/TestGraphNodes.ts

@@ -10,7 +10,7 @@ import assertEquals = assert.strictEqual;
 import { test as Test, suite } from "mocha-typescript";
 
 import { PredictionContext } from "../../src/atn/PredictionContext";
-import { PredictionContextCache } from "../../src/atn/PredictionContextCache";
+import { PredictionContextCache } from "../../src/atn/PredictionContext";
 
 /// Assuming that IdentityHashMap<K, V> == Map<K, V>;