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

Fix issue printing tokens from IntervalSet

This commit is contained in:
Peter Boyer 2016-01-03 22:44:36 -05:00
parent fa46c498af
commit ddd706baf2
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pb/src/parserTest/foo.txt
View File

@ -1 +1 @@
1 + 2 + 32 + (1 + 2) = 3 + 5 fail 1 + 2 + 32 + (1 + 2) = 3 + 5 ok-fkj

1
runtime/Go/src/antlr4/ErrorStrategy.go
View File

@ -347,7 +347,6 @@ func (this *DefaultErrorStrategy) ReportUnwantedToken(recognizer Parser) {
var expecting = this.getExpectedTokens(recognizer) var expecting = this.getExpectedTokens(recognizer)
var msg = "extraneous input " + tokenName + " expecting " + var msg = "extraneous input " + tokenName + " expecting " +
expecting.StringVerbose(recognizer.GetLiteralNames(), recognizer.GetSymbolicNames(), false) expecting.StringVerbose(recognizer.GetLiteralNames(), recognizer.GetSymbolicNames(), false)
panic(msg)
recognizer.NotifyErrorListeners(msg, t, nil) recognizer.NotifyErrorListeners(msg, t, nil)
} }

5
runtime/Go/src/antlr4/IntervalSet.go
View File

@ -282,8 +282,7 @@ func (is *IntervalSet) toIndexString() string {
func (is *IntervalSet) toTokenString(literalNames []string, symbolicNames []string) string { func (is *IntervalSet) toTokenString(literalNames []string, symbolicNames []string) string {
var names = make([]string, 0) var names = make([]string, 0)
for i := 0; i < len(is.intervals); i++ { for _,v := range is.intervals {
var v = is.intervals[i]
for j := v.start; j < v.stop; j++ { for j := v.start; j < v.stop; j++ {
names = append(names, is.elementName(literalNames, symbolicNames, j)) names = append(names, is.elementName(literalNames, symbolicNames, j))
} }
@ -301,7 +300,7 @@ func (i *IntervalSet) elementName(literalNames []string, symbolicNames []string,
} else if a == TokenEpsilon { } else if a == TokenEpsilon {
return "<EPSILON>" return "<EPSILON>"
} else { } else {
if literalNames[a] != "" { if a < len(literalNames) && literalNames[a] != "" {
return literalNames[a] return literalNames[a]
} else { } else {
return symbolicNames[a] return symbolicNames[a]

2
runtime/Go/src/antlr4/Recognizer.go
View File

@ -69,7 +69,7 @@ func (this *BaseRecognizer) GetTokenNames() []string {
} }
func (this *BaseRecognizer) GetSymbolicNames() []string { func (this *BaseRecognizer) GetSymbolicNames() []string {
return this.LiteralNames return this.SymbolicNames
} }
func (this *BaseRecognizer) GetLiteralNames() []string { func (this *BaseRecognizer) GetLiteralNames() []string {

5
runtime/JavaScript/src/antlr4/IntervalSet.js
View File

@ -274,6 +274,11 @@ IntervalSet.prototype.toIndexString = function() {
IntervalSet.prototype.toTokenString = function(literalNames, symbolicNames) { IntervalSet.prototype.toTokenString = function(literalNames, symbolicNames) {
console.log(symbolicNames)
console.log(literalNames)
console.log(symbolicNames.length)
console.log(literalNames.length)
console.log(this.toString())
var names = []; var names = [];
for (var i = 0; i < this.intervals.length; i++) { for (var i = 0; i < this.intervals.length; i++) {
var v = this.intervals[i]; var v = this.intervals[i];

2
runtime/JavaScript/src/foo.txt
View File

@ -1 +1 @@
1 + 2 + 32 + (1 + 2) = 3 + 5 fail 1 + 2 + 32 + (1 + 2) = 3 + 5 ok-fkj