fix conflict

Author: yulingtianxia

lib/java/DNJavaConverter.js

@@ -2,7 +2,6 @@ var antlr4 = require('antlr4')
 var JavaLexer = require('../../parser/java/Java9Lexer').Java9Lexer
 var JavaParser = require('../../parser/java/Java9Parser').Java9Parser
 var DNJavaParserListener = require('./DNJavaParserListener').DNJavaParserListener
-var ConsoleErrorListener = require('antlr4/error/ErrorListener').ConsoleErrorListener
 
 let parentPort, workerData
 try {
@@ -29,15 +28,12 @@ function convert(content, cb) {
  try {
  var chars = new antlr4.InputStream(content)
  var lexer = new JavaLexer(chars)
- lexer.addErrorListener(new ConsoleErrorListener())
 
- var tokens = new antlr4.CommonTokenStream(lexer)
- var parser = new JavaParser(tokens)
- parser.addErrorListener(new ConsoleErrorListener())
-
- let isPartOfFile = workerData ? workerData.isPartOfFile : false
- var listener = new DNJavaParserListener(cb, isPartOfFile)
- var tree = parser.compilationUnit()
+ const tokens = new antlr4.CommonTokenStream(lexer)
+ const parser = new JavaParser(tokens)
+ const tree = parser.compilationUnit()
+ const isPartOfFile = workerData ? workerData.isPartOfFile : false
+ const listener = new DNJavaParserListener(cb, isPartOfFile)
  antlr4.tree.ParseTreeWalker.DEFAULT.walk(listener, tree)
  } catch (e) {
  cb(null, e)

lib/objc/DNObjectiveCConverter.js

@@ -2,7 +2,6 @@ let antlr4 = require('antlr4')
 let ObjectiveCLexer = require('../../parser/objc/ObjectiveCLexer').ObjectiveCLexer
 let ObjectiveCParser = require('../../parser/objc/ObjectiveCParser').ObjectiveCParser
 let DNObjectiveCParserListener = require('./DNObjectiveCParserListener').DNObjectiveCParserListener
-let ConsoleErrorListener = require('antlr4/error/ErrorListener').ConsoleErrorListener
 
 let parentPort, workerData
 try {
@@ -30,14 +29,11 @@ function convert(content, cb) {
  try {
  const chars = new antlr4.InputStream(content)
  const lexer = new ObjectiveCLexer(chars)
- const errorListener = new ConsoleErrorListener()
- lexer.addErrorListener(errorListener)
 
  const tokens = new antlr4.CommonTokenStream(lexer)
  const parser = new ObjectiveCParser(tokens)
- parser.addErrorListener(errorListener)
  const tree = parser.translationUnit()
- let isPartOfFile = workerData ? workerData.isPartOfFile : false
+ const isPartOfFile = workerData ? workerData.isPartOfFile : false
  const listener = new DNObjectiveCParserListener(cb, isPartOfFile)
  antlr4.tree.ParseTreeWalker.DEFAULT.walk(listener, tree)
  } catch (e) {

package.json

@@ -1,6 +1,6 @@
 {
  "name": "@dartnative/codegen",
- "version": "1.1.1",
+ "version": "1.1.5",
  "description": "Code generator for dart_native.",
  "main": "index.js",
  "bin": {
@@ -30,7 +30,7 @@
  },
  "homepage": "https://github.com/dart-native/codegen#readme",
  "dependencies": {
- "antlr4": "^4.8.0",
+ "antlr4": "4.8.0",
  "commander": "^5.0.0",
  "js-yaml": "^3.14.0"
  },

parser/java/Java9Lexer.js

@@ -1,6 +1,6 @@
 // Generated from Java9.g4 by ANTLR 4.8
 // jshint ignore: start
-var antlr4 = require('antlr4/index');
+var antlr4 = require('antlr4');
 
 
 

parser/java/Java9Listener.js

@@ -1,6 +1,6 @@
 // Generated from Java9.g4 by ANTLR 4.8
 // jshint ignore: start
-var antlr4 = require('antlr4/index');
+var antlr4 = require('antlr4');
 
 // This class defines a complete listener for a parse tree produced by Java9Parser.
 function Java9Listener() {

parser/java/Java9Parser.js

@@ -1,6 +1,6 @@
 // Generated from Java9.g4 by ANTLR 4.8
 // jshint ignore: start
-var antlr4 = require('antlr4/index');
+var antlr4 = require('antlr4');
 var Java9Listener = require('./Java9Listener').Java9Listener;
 var grammarFileName = "Java9.g4";
 

parser/objc/ObjectiveCLexer.js

@@ -1,6 +1,6 @@
 // Generated from ObjectiveCLexer.g4 by ANTLR 4.8
 // jshint ignore: start
-var antlr4 = require('antlr4/index');
+var antlr4 = require('antlr4');
 
 
 

parser/objc/ObjectiveCParser.js

@@ -1,6 +1,6 @@
 // Generated from ObjectiveCParser.g4 by ANTLR 4.8
 // jshint ignore: start
-var antlr4 = require('antlr4/index');
+var antlr4 = require('antlr4');
 var ObjectiveCParserListener = require('./ObjectiveCParserListener').ObjectiveCParserListener;
 var grammarFileName = "ObjectiveCParser.g4";
 

parser/objc/ObjectiveCParserListener.js

@@ -1,6 +1,6 @@
 // Generated from ObjectiveCParser.g4 by ANTLR 4.8
 // jshint ignore: start
-var antlr4 = require('antlr4/index');
+var antlr4 = require('antlr4');
 
 // This class defines a complete listener for a parse tree produced by ObjectiveCParser.
 function ObjectiveCParserListener() {

parser/objc/ObjectiveCPreprocessorParser.js

@@ -1,6 +1,6 @@
 // Generated from ObjectiveCPreprocessorParser.g4 by ANTLR 4.8
 // jshint ignore: start
-var antlr4 = require('antlr4/index');
+var antlr4 = require('antlr4');
 var ObjectiveCPreprocessorParserListener = require('./ObjectiveCPreprocessorParserListener').ObjectiveCPreprocessorParserListener;
 var grammarFileName = "ObjectiveCPreprocessorParser.g4";