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

Merge pull request #1508 from janyou/Fixes-1298 

Fixes #1298 for Swift target
This commit is contained in:
Terence Parr 2016-12-14 13:25:27 -08:00 committed by GitHub
parent 8b75e3fc5b 0c835a248a
commit fd3bd91828
2 changed files with 13 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 @Override
public boolean ignore(String targetName) { public boolean ignore(String targetName) {
return !targetName.matches("Java|Python2|Python3|Node"); return !targetName.matches("Java|Python2|Python3|Node|Swift");
} }
} }

12
runtime/Swift/Antlr4/org/antlr/v4/runtime/ParserRuleContext.swift
View File

@ -79,6 +79,18 @@ open class ParserRuleContext: RuleContext {
self.start = ctx.start self.start = ctx.start
self.stop = ctx.stop self.stop = ctx.stop
// copy any error nodes to alt label node
if ctx.children != nil{
self.children = Array<ParseTree>()
// reset parent pointer for any error nodes
for child: ParseTree in ctx.children! {
if child is ErrorNode{
self.children?.append(child)
( (child as! ErrorNode)).parent = self
}
}
}
} }
public init(_ parent: ParserRuleContext?, _ invokingStateNumber: Int) { public init(_ parent: ParserRuleContext?, _ invokingStateNumber: Int) {