From fc35818c5249dda6311d31845651a025a6386b45 Mon Sep 17 00:00:00 2001
From: Peter Boyer <peter.b.boyer@gmail.com>
Date: Sat, 5 Nov 2016 16:36:53 -0400
Subject: [PATCH] Update import statements after merge

---
 doc/go-target.md                                     |  2 +-
 .../test/org/antlr/v4/test/runtime/go/BaseTest.java  |  6 +++---
 .../org/antlr/v4/tool/templates/codegen/Go/Go.stg    | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/go-target.md b/doc/go-target.md
index 9844daacf..0263a9569 100644
--- a/doc/go-target.md
+++ b/doc/go-target.md
@@ -10,5 +10,5 @@
 Reference the go runtime package like this:
 
 ```go
-import "github.com/pboyer/antlr4/runtime/Go/antlr"
+import "github.com/antlr/antlr4/runtime/Go/antlr"
 ```
\ No newline at end of file
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/go/BaseTest.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/go/BaseTest.java
index bea5701e7..04ef6bd56 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/go/BaseTest.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/go/BaseTest.java
@@ -110,7 +110,7 @@ public abstract class BaseTest {
 	public File tmpdir = null;
 	public File parserpkgdir = null; // this is where the parser package is stored, typically inside the tmpdir
 	private static File tmpGopath = null;
-	private static final String GO_RUNTIME_IMPORT_PATH = "github.com/pboyer/antlr4/runtime/Go/antlr"; // TODO: Change this before merging with upstream
+	private static final String GO_RUNTIME_IMPORT_PATH = "github.com/antlr/antlr4/runtime/Go/antlr"; // TODO: Change this before merging with upstream
 
 	/**
 	 * If error during parser execution, store stderr here; can't return stdout
@@ -839,7 +839,7 @@ public abstract class BaseTest {
 			ST outputFileST = new ST(
 					"package main\n" +
 						"import (\n"
-						+"	\"github.com/pboyer/antlr4/runtime/Go/antlr\"\n"
+						+"	\"github.com/antlr/antlr4/runtime/Go/antlr\"\n"
 						+"	\"./parser\"\n"
 						+"	\"os\"\n"
 						+")\n"
@@ -894,7 +894,7 @@ public abstract class BaseTest {
 		ST outputFileST = new ST(
 				"package main\n" +
 				"import (\n"
-					+ "	\"github.com/pboyer/antlr4/runtime/Go/antlr\"\n"
+					+ "	\"github.com/antlr/antlr4/runtime/Go/antlr\"\n"
 					+ "	\"./parser\"\n"
 					+ "	\"os\"\n"
 					+ "	\"fmt\"\n"
diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg
index d7ffdf334..078bd23b4 100644
--- a/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg
+++ b/tool/resources/org/antlr/v4/tool/templates/codegen/Go/Go.stg
@@ -16,7 +16,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/pboyer/antlr4/runtime/Go/antlr"
+	"github.com/antlr/antlr4/runtime/Go/antlr"
 )
 
 <if(namedActions.header)>
@@ -45,7 +45,7 @@ package <file.genPackage> // <file.grammarName>
 package parser // <file.grammarName>
 <endif>
 
-import "github.com/pboyer/antlr4/runtime/Go/antlr"
+import "github.com/antlr/antlr4/runtime/Go/antlr"
 
 // <file.grammarName>Listener is a complete listener for a parse tree produced by <file.parserName>.
 type <file.grammarName>Listener interface {
@@ -69,7 +69,7 @@ package <file.genPackage> // <file.grammarName>
 package parser // <file.grammarName>
 <endif>
 
-import "github.com/pboyer/antlr4/runtime/Go/antlr"
+import "github.com/antlr/antlr4/runtime/Go/antlr"
 
 // Base<file.grammarName>Listener is a complete listener for a parse tree produced by <file.parserName>.
 type Base<file.grammarName>Listener struct{}
@@ -105,7 +105,7 @@ package <file.genPackage> // <file.grammarName>
 package parser // <file.grammarName>
 <endif>
 
-import "github.com/pboyer/antlr4/runtime/Go/antlr"
+import "github.com/antlr/antlr4/runtime/Go/antlr"
 <if(header)>
 
 <header>
@@ -131,7 +131,7 @@ package <file.genPackage> // <file.grammarName>
 package parser // <file.grammarName>
 <endif>
 
-import "github.com/pboyer/antlr4/runtime/Go/antlr"
+import "github.com/antlr/antlr4/runtime/Go/antlr"
 
 type Base<file.grammarName>Visitor struct {
 	*antlr.BaseParseTreeVisitor
@@ -1340,7 +1340,7 @@ import (
 	"fmt"
 	"unicode"
 
-	"github.com/pboyer/antlr4/runtime/Go/antlr"
+	"github.com/antlr/antlr4/runtime/Go/antlr"
 )
 <if(namedActions.header)>