forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Merge pull request #1494 from ericvergnaud/fix-#1298-for-JavaScript 

Fix #1298 for JavaScript
This commit is contained in:
Terence Parr 2016-12-12 16:08:47 -08:00 committed by GitHub
parent b2d67261f2 caa581a9e0
commit e279cd699e
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime-testsuite/test/org/antlr/v4/test/runtime/descriptors/ParseTreesDescriptors.java
View File

@ -112,7 +112,7 @@ public class ParseTreesDescriptors {
@Override
public boolean ignore(String targetName) {
return !targetName.matches("Java|Python2|Python3");
return !targetName.matches("Java|Python2|Python3|Node");
}
}

11
runtime/JavaScript/src/antlr4/ParserRuleContext.js
View File

@ -64,6 +64,17 @@ ParserRuleContext.prototype.copyFrom = function(ctx) {
this.children = null;
this.start = ctx.start;
this.stop = ctx.stop;
// copy any error nodes to alt label node
if(ctx.children) {
this.children = [];
// reset parent pointer for any error nodes
ctx.children.map(function(child) {
if (child instanceof ErrorNodeImpl) {
this.children.push(child);
child.parentCtx = this;
}
}, this);
}
};
// Double dispatch methods for listeners