From a7a3003a96c227c9e3202f2baf276c28693538d7 Mon Sep 17 00:00:00 2001 From: Carl Ansley Date: Fri, 16 Dec 2016 22:29:19 -0500 Subject: [PATCH] Fix build issues --- benchmark/TestPerformance.ts | 18 +++++++++--------- package.json | 14 +++++++------- src/Recognizer.ts | 2 +- test/tool/TestTokenStreamRewriter.ts | 6 +++--- tool/antlr4ts | 0 5 files changed, 20 insertions(+), 20 deletions(-) mode change 100644 => 100755 tool/antlr4ts diff --git a/benchmark/TestPerformance.ts b/benchmark/TestPerformance.ts index d0dad3eb..bcdb4c1b 100644 --- a/benchmark/TestPerformance.ts +++ b/benchmark/TestPerformance.ts @@ -59,15 +59,15 @@ import { TokenStream } from '../src/TokenStream'; import * as Utils from '../src/misc/Utils'; -import { JavaLexer as JavaLexer } from './gen/std/JavaLexer'; -import { JavaLexer as JavaLexerAtn } from './gen/std-atn/JavaLexer'; -import { JavaLRLexer as JavaLRLexer } from './gen/lr/JavaLRLexer'; -import { JavaLRLexer as JavaLRLexerAtn } from './gen/lr-atn/JavaLRLexer'; - -import { JavaParser as JavaParser } from './gen/std/JavaParser'; -import { JavaParser as JavaParserAtn } from './gen/std-atn/JavaParser'; -import { JavaLRParser as JavaLRParser } from './gen/lr/JavaLRParser'; -import { JavaLRParser as JavaLRParserAtn } from './gen/lr-atn/JavaLRParser'; +import { JavaLexer as JavaLexer } from './gen/std/benchmark/JavaLexer'; +import { JavaLexer as JavaLexerAtn } from './gen/std-atn/benchmark/JavaLexer'; +import { JavaLRLexer as JavaLRLexer } from './gen/lr/benchmark/JavaLRLexer'; +import { JavaLRLexer as JavaLRLexerAtn } from './gen/lr-atn/benchmark/JavaLRLexer'; + +import { JavaParser as JavaParser } from './gen/std/benchmark/JavaParser'; +import { JavaParser as JavaParserAtn } from './gen/std-atn/benchmark/JavaParser'; +import { JavaLRParser as JavaLRParser } from './gen/lr/benchmark/JavaLRParser'; +import { JavaLRParser as JavaLRParserAtn } from './gen/lr-atn/benchmark/JavaLRParser'; import * as assert from "assert"; import * as fs from 'fs'; diff --git a/package.json b/package.json index b3d389ec..2dc7b365 100644 --- a/package.json +++ b/package.json @@ -12,13 +12,13 @@ "unlinktool": "cd tool && npm unlink", "clean": "npm run unlink && git clean -idx", "antlr4ts": "npm run antlr4ts-test-xpath && npm run antlr4ts-test-rewriter && npm run antlr4ts-benchmark", - "antlr4ts-test-xpath": "antlr4ts src/tree/xpath/XPathLexer.g4 -DbaseImportPath=../.. -o src/tree/xpath", - "antlr4ts-test-rewriter": "antlr4ts test/tool/RewriterLexer1.g4 test/tool/RewriterLexer2.g4 test/tool/RewriterLexer3.g4 -DbaseImportPath=../../../../src -o test/tool/gen/rewriter", + "antlr4ts-test-xpath": "antlr4ts src/tree/xpath/XPathLexer.g4 -DbaseImportPath=../..", + "antlr4ts-test-rewriter": "antlr4ts test/tool/RewriterLexer1.g4 test/tool/RewriterLexer2.g4 test/tool/RewriterLexer3.g4 -DbaseImportPath=../../src", "antlr4ts-benchmark": "npm run antlr4ts-benchmark-std && npm run antlr4ts-benchmark-std-atn && npm run antlr4ts-benchmark-lr && npm run antlr4ts-benchmark-lr-atn", - "antlr4ts-benchmark-std": "antlr4ts -visitor benchmark/Java.g4 -DbaseImportPath=../../../src -o benchmark/gen/std", - "antlr4ts-benchmark-std-atn": "antlr4ts -visitor -Xforce-atn benchmark/Java.g4 -DbaseImportPath=../../../src -o benchmark/gen/std-atn", - "antlr4ts-benchmark-lr": "antlr4ts -visitor benchmark/JavaLR.g4 -DbaseImportPath=../../../src -o benchmark/gen/lr", - "antlr4ts-benchmark-lr-atn": "antlr4ts -visitor -Xforce-atn benchmark/JavaLR.g4 -DbaseImportPath=../../../src -o benchmark/gen/lr-atn", + "antlr4ts-benchmark-std": "antlr4ts -visitor benchmark/Java.g4 -DbaseImportPath=../../../../src -o benchmark/gen/std", + "antlr4ts-benchmark-std-atn": "antlr4ts -visitor -Xforce-atn benchmark/Java.g4 -DbaseImportPath=../../../../src -o benchmark/gen/std-atn", + "antlr4ts-benchmark-lr": "antlr4ts -visitor benchmark/JavaLR.g4 -DbaseImportPath=../../../../src -o benchmark/gen/lr", + "antlr4ts-benchmark-lr-atn": "antlr4ts -visitor -Xforce-atn benchmark/JavaLR.g4 -DbaseImportPath=../../../../src -o benchmark/gen/lr-atn", "tsc": "tsc", "buildrts": "cd test/runtime && tsc", "test": "mocha", @@ -58,7 +58,7 @@ "source-map-support": "^0.4.3", "std-mocks": "^1.0.1", "typedoc": "^0.5.1", - "typescript": "^2.0.3" + "typescript": "2.0.8" }, "dependencies": {} } diff --git a/src/Recognizer.ts b/src/Recognizer.ts index 092a5628..baa62197 100644 --- a/src/Recognizer.ts +++ b/src/Recognizer.ts @@ -14,7 +14,7 @@ import { ParseInfo } from "./atn/ParseInfo"; import { ProxyErrorListener } from "./ProxyErrorListener"; import { RecognitionException } from "./RecognitionException"; import { RuleContext } from "./RuleContext"; -import { SuppressWarnings, NotNull } from "./decorators"; +import { SuppressWarnings, NotNull } from "./Decorators"; import { Token } from "./Token"; import { Vocabulary } from "./Vocabulary"; import { VocabularyImpl } from "./VocabularyImpl"; diff --git a/test/tool/TestTokenStreamRewriter.ts b/test/tool/TestTokenStreamRewriter.ts index c8ab407b..7226e544 100644 --- a/test/tool/TestTokenStreamRewriter.ts +++ b/test/tool/TestTokenStreamRewriter.ts @@ -19,9 +19,9 @@ import { Lexer } from '../../src/Lexer'; import { LexerInterpreter } from '../../src/LexerInterpreter'; import { TokenStreamRewriter } from '../../src/TokenStreamRewriter'; -import { RewriterLexer1 } from './gen/rewriter/RewriterLexer1'; -import { RewriterLexer2 } from './gen/rewriter/RewriterLexer2'; -import { RewriterLexer3 } from './gen/rewriter/RewriterLexer3'; +import { RewriterLexer1 } from './RewriterLexer1'; +import { RewriterLexer2 } from './RewriterLexer2'; +import { RewriterLexer3 } from './RewriterLexer3'; import * as assert from 'assert'; import { suite, test as Test, skip as Ignore } from 'mocha-typescript'; diff --git a/tool/antlr4ts b/tool/antlr4ts old mode 100644 new mode 100755