cmd/eval/main.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	"code.betamike.com/mediocregopher/ginger/gg"
+	"github.com/mediocregopher/ginger/gg"
-	"code.betamike.com/mediocregopher/ginger/vm"
+	"github.com/mediocregopher/ginger/vm"
 )
 
 func main() {

gg/decoder.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"unicode"
 
-	. "code.betamike.com/mediocregopher/ginger/gg/grammar"
+	. "github.com/mediocregopher/ginger/gg/grammar"
-	"code.betamike.com/mediocregopher/ginger/graph"
+	"github.com/mediocregopher/ginger/graph"
 	"golang.org/x/exp/slices"
 )
 
@@ -53,7 +53,9 @@ var (
 		Rune('-'),
 		positiveNumber,
 		func(neg Located[rune], posNum Located[string]) Located[string] {
-			return Locate(neg.Location, string(neg.Value)+posNum.Value)
+			return Located[string]{
+				neg.Location, string(neg.Value) + posNum.Value,
+			}
 		},
 	)
 
@@ -66,7 +68,7 @@ var (
 				panic(fmt.Errorf("parsing %q as int: %w", str, err))
 			}
 
-			return Locate(str.Location, Number(i))
+			return Located[Value]{str.Location, Number(i)}
 		},
 	)
 )
@@ -91,7 +93,7 @@ var (
 			for _, r := range tail {
 				name = append(name, r.Value)
 			}
-			return Locate(head.Location, Name(string(name)))
+			return Located[Value]{head.Location, Name(string(name))}
 		},
 	)
 )
@@ -226,7 +228,7 @@ var graphSym, value = func() (
 				gs.g = new(Graph)
 			}
 
-			return Locate(r.Location, Value{Graph: gs.g})
+			return Located[Value]{r.Location, Value{Graph: gs.g}}
 		},
 	)
 

gg/decoder_test.go

@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"testing"
 
-	. "code.betamike.com/mediocregopher/ginger/gg/grammar"
+	. "github.com/mediocregopher/ginger/gg/grammar"
-	"code.betamike.com/mediocregopher/ginger/graph"
+	"github.com/mediocregopher/ginger/graph"
 	"github.com/stretchr/testify/assert"
 )
 

gg/gg.go

@@ -4,7 +4,7 @@ package gg
 import (
 	"fmt"
 
-	"code.betamike.com/mediocregopher/ginger/graph"
+	"github.com/mediocregopher/ginger/graph"
 )
 
 // Type aliases for convenience

gg/grammar/location.go

@@ -18,11 +18,6 @@ type Located[T any] struct {
 	Value T
 }
 
-// Locate returns a Located instance combining the given values.
-func Locate[T any](l Location, v T) Located[T] {
-	return Located[T]{l, v}
-}
-
 // LocatedError is an error related to a specific point within a stream of
 // runes.
 type LocatedError Located[error]

go.mod

@@ -1,4 +1,4 @@
-module code.betamike.com/mediocregopher/ginger
+module github.com/mediocregopher/ginger
 
 go 1.18
 

vm/function.go

@@ -3,8 +3,8 @@ package vm
 import (
 	"fmt"
 
-	"code.betamike.com/mediocregopher/ginger/gg"
+	"github.com/mediocregopher/ginger/gg"
-	"code.betamike.com/mediocregopher/ginger/graph"
+	"github.com/mediocregopher/ginger/graph"
 )
 
 // Function is an entity which accepts an argument Value and performs some

vm/scope_global.go

@@ -3,7 +3,7 @@ package vm
 import (
 	"fmt"
 
-	"code.betamike.com/mediocregopher/ginger/gg"
+	"github.com/mediocregopher/ginger/gg"
 )
 
 func globalFn(fn func(Value) (Value, error)) Value {

vm/vm.go

@@ -7,8 +7,8 @@ import (
 	"io"
 	"strings"
 
-	"code.betamike.com/mediocregopher/ginger/gg"
+	"github.com/mediocregopher/ginger/gg"
-	"code.betamike.com/mediocregopher/ginger/graph"
+	"github.com/mediocregopher/ginger/graph"
 )
 
 // ZeroValue is a Value with no fields set. It is equivalent to the 0-tuple.

vm/vm_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"code.betamike.com/mediocregopher/ginger/gg"
+	"github.com/mediocregopher/ginger/gg"
 	"github.com/stretchr/testify/assert"
 )