Emmanuel Bourg pushed to branch master at Debian Med / beast2-mcmc
Commits: 7e93f6af by Emmanuel Bourg at 2018-11-14T00:19:52Z Fixed the compatibility with the version of ANTLR in Debian - - - - - 2 changed files: - + debian/patches/antlr-compatibility.patch - debian/patches/series Changes: ===================================== debian/patches/antlr-compatibility.patch ===================================== @@ -0,0 +1,33 @@ +Descrition: Fixes the compatibility with the version of ANTLR in Debian +Author: Emmanuel Bourg <ebo...@apache.org> +Forwarded: not-needed +--- a/src/beast/util/TreeParser.java ++++ b/src/beast/util/TreeParser.java +@@ -349,8 +349,6 @@ + * @return root node of tree + */ + public Node parseNewick(String newick) { +- CharStream charStream = CharStreams.fromString(newick); +- + // Custom parse/lexer error listener + BaseErrorListener errorListener = new BaseErrorListener() { + @Override +@@ -364,7 +362,7 @@ + + // Use lexer to produce token stream + +- NewickLexer lexer = new NewickLexer(charStream); ++ NewickLexer lexer = new NewickLexer(new org.antlr.v4.runtime.ANTLRInputStream(newick)); + lexer.removeErrorListeners(); + lexer.addErrorListener(errorListener); + +--- a/src/beast/util/treeparser/NewickLexer.java ++++ b/src/beast/util/treeparser/NewickLexer.java +@@ -95,7 +95,6 @@ + @Override + public String getSerializedATN() { return _serializedATN; } + +- @Override + public String[] getChannelNames() { return channelNames; } + + @Override ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ fix_classpath_in_build_xml.patch remove_appbundler.patch # reverted_to_antlr_4.5_deacdc96.patch # revert_NewickLexer.java_to_antlr_4.5.patch +antlr-compatibility.patch View it on GitLab: https://salsa.debian.org/med-team/beast2-mcmc/commit/7e93f6afe32fdb1e8043631f604064bb01266e6c -- View it on GitLab: https://salsa.debian.org/med-team/beast2-mcmc/commit/7e93f6afe32fdb1e8043631f604064bb01266e6c You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list debian-med-com...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit