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

runtime-testsuite/go: Make path construction slightly more robust. 

* also piggy back a typo fix.
This commit is contained in:
Wolfgang Johannes Kohnen 2016-05-28 11:15:14 +02:00
parent f2dc9f476b
commit 4fd4e51810
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime-testsuite/test/org/antlr/v4/test/runtime/go/BaseTest.java
View File

@ -444,7 +444,7 @@ public abstract class BaseTest {
paths.add("c:\\Go\\bin");
for (String path : paths) {
File candidate = new File(path + File.separatorChar + tool);
File candidate = new File(new File(path), tool);
if (candidate.exists()) {
return candidate.getPath();
}

2
runtime/Go/antlr/error_strategy.go
View File

@ -655,7 +655,7 @@ func (d *DefaultErrorStrategy) escapeWSAndQuote(s string) string {
// reSync to one of those tokens. Note that FOLLOW(c)='^' and if
// we reSync'd to that token, we'd consume until EOF. We need to
// Sync to context-sensitive FOLLOWs for a, b, and c: {']','^'}.
// In d case, for input "[]", LA(1) is ']' and in the set, so we would
// In this case, for input "[]", LA(1) is ']' and in the set, so we would
// not consume anything. After printing an error, rule c would
// return normally. Rule b would not find the required '^' though.
// At this point, it gets a mismatched token error and panics an