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

Fix PredictionContext merge() typo (#61) 

* Fix pred context typo

* Adjust array lengths
This commit is contained in:
Peter Boyer 2016-10-06 16:18:18 -04:00 committed by GitHub
parent 499d9d3f89
commit a5859fd54e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/Go/antlr/prediction_context.go
View File

@ -383,7 +383,7 @@ func merge(a, b PredictionContext, rootIsWildcard bool, mergeCache *DoubleDict)
}
ac, ok1 := a.(*BaseSingletonPredictionContext)
bc, ok2 := a.(*BaseSingletonPredictionContext)
bc, ok2 := b.(*BaseSingletonPredictionContext)
if ok1 && ok2 {
return mergeSingletons(ac, bc, rootIsWildcard, mergeCache)
@ -615,8 +615,8 @@ func mergeArrays(a, b *ArrayPredictionContext, rootIsWildcard bool, mergeCache *
var j = 0 // walks b
var k = 0 // walks target M array
var mergedReturnStates = make([]int, 0)
var mergedParents = make([]PredictionContext, 0)
var mergedReturnStates = make([]int, len(a.returnStates) + len(b.returnStates))
var mergedParents = make([]PredictionContext, len(a.returnStates) + len(b.returnStates))
// walk and merge to yield mergedParents, mergedReturnStates
for i < len(a.returnStates) && j < len(b.returnStates) {
var aParent = a.parents[i]