Don't use utf decoding...these are just ints (#3573)

parrt · web-flow · commit abac2af0932e · 2022-03-07T21:04:45.000-08:00
diff --git a/runtime/Go/antlr/atn_deserializer.go b/runtime/Go/antlr/atn_deserializer.go
@@ -7,7 +7,6 @@ package antlr
 import (
 	"fmt"
 	"strconv"
-	"unicode/utf16"
 )
 
 var SerializedVersion = 4
@@ -24,7 +23,7 @@ type BlockStartStateIntPair struct {
 
 type ATNDeserializer struct {
 	deserializationOptions *ATNDeserializationOptions
-	data                   []rune
+	data                   []uint16
 	pos                    int
 }
 
@@ -47,7 +46,7 @@ func stringInSlice(a string, list []string) int {
 }
 
 func (a *ATNDeserializer) DeserializeFromUInt16(data []uint16) *ATN {
-	a.data = utf16.Decode(data)
+	a.data = data
 	a.pos = 0
 	a.checkVersion()
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ package antlr`
`7`	`7`	`import (`
`8`	`8`	`"fmt"`
`9`	`9`	`"strconv"`
`10`		`- "unicode/utf16"`
`11`	`10`	`)`
`12`	`11`
`13`	`12`	`var SerializedVersion = 4`
`@@ -24,7 +23,7 @@ type BlockStartStateIntPair struct {`
`24`	`23`
`25`	`24`	`type ATNDeserializer struct {`
`26`	`25`	`deserializationOptions *ATNDeserializationOptions`
`27`		`- data []rune`
	`26`	`+ data []uint16`
`28`	`27`	`pos int`
`29`	`28`	`}`
`30`	`29`
`@@ -47,7 +46,7 @@ func stringInSlice(a string, list []string) int {`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`func (a ATNDeserializer) DeserializeFromUInt16(data []uint16) ATN {`
`50`		`- a.data = utf16.Decode(data)`
	`49`	`+ a.data = data`
`51`	`50`	`a.pos = 0`
`52`	`51`	`a.checkVersion()`
`53`	`52`