[Go] Fix for #3441 and #3443 -- expose Reset() and String() methods.

runtime/Go/antlr/lexer.go

@@ -118,7 +118,7 @@ const (
 	LexerMaxCharValue        = 0x10FFFF
 )
 
-func (b *BaseLexer) reset() {
+func (b *BaseLexer) Reset() {
 	// wack Lexer state variables
 	if b.input != nil {
 		b.input.Seek(0) // rewind the input
@@ -282,7 +282,7 @@ func (b *BaseLexer) inputStream() CharStream {
 func (b *BaseLexer) SetInputStream(input CharStream) {
 	b.input = nil
 	b.tokenFactorySourcePair = &TokenSourceCharStreamPair{b, b.input}
-	b.reset()
+	b.Reset()
 	b.input = input
 	b.tokenFactorySourcePair = &TokenSourceCharStreamPair{b, b.input}
 }

runtime/Go/antlr/testing_api_test.go

@@ -0,0 +1,35 @@
+// Run via "go test"
+
+package antlr
+
+import (
+	"testing"
+)
+
+func next(t *testing.T, lexer *LexerB, want string) {
+    var token = lexer.NextToken()
+    var got = token.String()
+    if got != want {
+        t.Errorf("got %q, wanted %q", got, want)
+    }
+}
+
+func TestString(t *testing.T){
+    str := NewInputStream("a b c 1 2 3")
+    lexer := NewLexerB(str)
+    next(t, lexer, "[@-1,0:0='a',<1>,1:0]")
+    next(t, lexer, "[@-1,1:1=' ',<7>,1:1]")
+    next(t, lexer, "[@-1,2:2='b',<1>,1:2]")
+    next(t, lexer, "[@-1,3:3=' ',<7>,1:3]")
+    next(t, lexer, "[@-1,4:4='c',<1>,1:4]")
+    next(t, lexer, "[@-1,5:5=' ',<7>,1:5]")
+    next(t, lexer, "[@-1,6:6='1',<2>,1:6]")
+    next(t, lexer, "[@-1,7:7=' ',<7>,1:7]")
+    next(t, lexer, "[@-1,8:8='2',<2>,1:8]")
+    next(t, lexer, "[@-1,9:9=' ',<7>,1:9]")
+    next(t, lexer, "[@-1,10:10='3',<2>,1:10]")
+    next(t, lexer, "[@-1,11:10='<EOF>',<-1>,1:11]")
+}
+
+
+

runtime/Go/antlr/token.go

@@ -35,6 +35,7 @@ type Token interface {
 
 	GetTokenSource() TokenSource
 	GetInputStream() CharStream
+	String() string
 }
 
 type BaseToken struct {