Skip to content

Commit 54da044

Browse files
committed
Revert "fix: exception in node v14"
This reverts commit b670753.
1 parent b670753 commit 54da044

12 files changed

+21
-14
lines changed

lib/java/DNJavaConverter.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var rf = require("fs")
33
var JavaLexer = require('../../parser/java/Java9Lexer').Java9Lexer
44
var JavaParser = require('../../parser/java/Java9Parser').Java9Parser
55
var DNJavaParserListener = require('./DNJavaParserListener').DNJavaParserListener
6+
var ConsoleErrorListener = require('antlr4/error/ErrorListener').ConsoleErrorListener
67

78
let parentPort, workerData
89
try {
@@ -28,9 +29,11 @@ function convert(path, cb) {
2829
var content = rf.readFileSync(path, "utf-8")
2930
var chars = new antlr4.InputStream(content)
3031
var lexer = new JavaLexer(chars)
32+
lexer.addErrorListener(new ConsoleErrorListener())
3133

3234
var tokens = new antlr4.CommonTokenStream(lexer)
3335
var parser = new JavaParser(tokens)
36+
parser.addErrorListener(new ConsoleErrorListener())
3437

3538
var listener = new DNJavaParserListener(cb, path)
3639
var tree = parser.compilationUnit()

lib/objc/DNObjectiveCConverter.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ let antlr4 = require('antlr4')
22
let ObjectiveCLexer = require('../../parser/objc/ObjectiveCLexer').ObjectiveCLexer
33
let ObjectiveCParser = require('../../parser/objc/ObjectiveCParser').ObjectiveCParser
44
let DNObjectiveCParserListener = require('./DNObjectiveCParserListener').DNObjectiveCParserListener
5+
let ConsoleErrorListener = require('antlr4/error/ErrorListener').ConsoleErrorListener
56

67
let parentPort, workerData
78
try {
@@ -29,9 +30,12 @@ function convert(content, cb) {
2930
try {
3031
const chars = new antlr4.InputStream(content)
3132
const lexer = new ObjectiveCLexer(chars)
33+
const errorListener = new ConsoleErrorListener()
34+
lexer.addErrorListener(errorListener)
3235

3336
const tokens = new antlr4.CommonTokenStream(lexer)
3437
const parser = new ObjectiveCParser(tokens)
38+
parser.addErrorListener(errorListener)
3539
const tree = parser.translationUnit()
3640
let isPartOfFile = workerData ? workerData.isPartOfFile : false
3741
const listener = new DNObjectiveCParserListener(cb, isPartOfFile)

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@dartnative/codegen",
3-
"version": "1.1.2",
3+
"version": "1.1.1",
44
"description": "Code generator for dart_native.",
55
"main": "index.js",
66
"bin": {
@@ -30,7 +30,7 @@
3030
},
3131
"homepage": "https://github.com/dart-native/codegen#readme",
3232
"dependencies": {
33-
"antlr4": "^4.9.0",
33+
"antlr4": "^4.8.0",
3434
"commander": "^5.0.0",
3535
"js-yaml": "^3.14.0"
3636
},

parser/java/Java9Lexer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Generated from Java9.g4 by ANTLR 4.8
22
// jshint ignore: start
3-
var antlr4 = require('antlr4');
3+
var antlr4 = require('antlr4/index');
44

55

66

parser/java/Java9Listener.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Generated from Java9.g4 by ANTLR 4.8
22
// jshint ignore: start
3-
var antlr4 = require('antlr4');
3+
var antlr4 = require('antlr4/index');
44

55
// This class defines a complete listener for a parse tree produced by Java9Parser.
66
function Java9Listener() {

parser/java/Java9Parser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Generated from Java9.g4 by ANTLR 4.8
22
// jshint ignore: start
3-
var antlr4 = require('antlr4');
3+
var antlr4 = require('antlr4/index');
44
var Java9Listener = require('./Java9Listener').Java9Listener;
55
var grammarFileName = "Java9.g4";
66

parser/objc/ObjectiveCLexer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Generated from ObjectiveCLexer.g4 by ANTLR 4.8
22
// jshint ignore: start
3-
var antlr4 = require('antlr4');
3+
var antlr4 = require('antlr4/index');
44

55

66

parser/objc/ObjectiveCParser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Generated from ObjectiveCParser.g4 by ANTLR 4.8
22
// jshint ignore: start
3-
var antlr4 = require('antlr4');
3+
var antlr4 = require('antlr4/index');
44
var ObjectiveCParserListener = require('./ObjectiveCParserListener').ObjectiveCParserListener;
55
var grammarFileName = "ObjectiveCParser.g4";
66

parser/objc/ObjectiveCParserListener.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Generated from ObjectiveCParser.g4 by ANTLR 4.8
22
// jshint ignore: start
3-
var antlr4 = require('antlr4');
3+
var antlr4 = require('antlr4/index');
44

55
// This class defines a complete listener for a parse tree produced by ObjectiveCParser.
66
function ObjectiveCParserListener() {

parser/objc/ObjectiveCPreprocessorParser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Generated from ObjectiveCPreprocessorParser.g4 by ANTLR 4.8
22
// jshint ignore: start
3-
var antlr4 = require('antlr4');
3+
var antlr4 = require('antlr4/index');
44
var ObjectiveCPreprocessorParserListener = require('./ObjectiveCPreprocessorParserListener').ObjectiveCPreprocessorParserListener;
55
var grammarFileName = "ObjectiveCPreprocessorParser.g4";
66

parser/objc/ObjectiveCPreprocessorParserListener.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Generated from ObjectiveCPreprocessorParser.g4 by ANTLR 4.8
22
// jshint ignore: start
3-
var antlr4 = require('antlr4');
3+
var antlr4 = require('antlr4/index');
44

55
// This class defines a complete listener for a parse tree produced by ObjectiveCPreprocessorParser.
66
function ObjectiveCPreprocessorParserListener() {

0 commit comments

Comments
 (0)