Make 'go build' work, without need for 'go build mlr.go' (#622)

.github/workflows/go.yml

@@ -29,7 +29,7 @@ jobs:
       # In the event of needing to debug failures you can modify `./mlr regtest` verbosity
       # using `-v`, `-vv`, or `-vvv`. Commit changes to this file and re-push to GitHub
       # and let the GitHub Actions re-run.
-      run: cd go && go test -v miller/src/... && ./mlr regtest -s 5
+      run: cd go && go test -v mlr/src/... && ./mlr regtest -s 5
 
     - name: PrepareArtifactNonWindows
       if: matrix.os != 'windows-latest'

go/.vimrc

@@ -1,2 +1,2 @@
-map \d :w<C-m>:!clear;echo Building ...; echo; go build mlr.go<C-m>
+map \d :w<C-m>:!clear;echo Building ...; echo; go build<C-m>
 map \f :w<C-m>:!clear;echo Building ...; echo; build; echo; main<C-m>

go/README.md

@@ -2,14 +2,16 @@
 
 A TL;DR for anyone wanting to compile and run the Go port of Miller:
 
-* `go build mlr.go` -- produces the `mlr` executable
+* `go build` -- produces the `mlr` executable
 * `go test ./...` -- runs a relatively small number of unit tests
 * `go test` -- runs the same as `mlr regtest`. Note that (see `mlr regtest -h`) the latter gives you more options.
 * `./mlr regtest` -- runs `regtest/cases`, which are cases passing on all platforms
   * `./mlr regtest regtest/cases-pending-go-port` -- needing Go code to be ported from C
   * `./mlr regtest regtest/cases-pending-windows` -- for Go code already ported from C but needing some work for Windows
 
-Pre-release/rough-draft docs are at http://johnkerl.org/miller-releases/miller-head/docs6/site/index.html.
+Pre-release/rough-draft docs are at http://johnkerl.org/miller6.
+
+See also the tracking issue (somewhat redundant to this README file) https://github.com/johnkerl/miller/issues/372.
 
 A note on Continuous Integration:
 

go/build

@@ -18,13 +18,13 @@ fi
 
 echo ================================================================
 echo BUILD
-go build mlr.go
+go build
 echo Compile OK
 echo
 
 echo ================================================================
 echo UNIT TESTS
-go test -v miller/src/...
+go test -v mlr/src/...
 # 'go test' (with no arguments) is the same as 'mlr regtest'
 
 echo

go/build-dsl

@@ -31,9 +31,9 @@ fi
 rm -f src/parsing/*.txt
 if [ "$verbose" = "true" ]; then
   lr1="src/parsing/LR1_conflicts.txt"
-  $bingocc -v -o ./src/parsing -p miller/src/parsing src/parsing/mlr.bnf || expand -2 $lr1
+  $bingocc -v -o ./src/parsing -p mlr/src/parsing src/parsing/mlr.bnf || expand -2 $lr1
 else
-  $bingocc -o ./src/parsing -p miller/src/parsing src/parsing/mlr.bnf
+  $bingocc -o ./src/parsing -p mlr/src/parsing src/parsing/mlr.bnf
 fi
 
 # Code-gen directories:

go/buildw.cmd

@@ -1,6 +1,6 @@
-go build mlr.go
+go build
 
-go test -v miller/src/...
+go test -v mlr/src/...
 # 'go test' (with no arguments) is the same as 'mlr regtest'
 
 mlr regtest regtest/cases

go/go.mod

@@ -1,4 +1,4 @@
-module miller
+module mlr
 
 go 1.15
 

go/mlr.go

@@ -7,7 +7,7 @@ import (
 	"runtime/debug"
 	"runtime/pprof"
 
-	"miller/src/entrypoint"
+	"mlr/src/entrypoint"
 )
 
 // ----------------------------------------------------------------

go/regression_test.go

@@ -12,8 +12,8 @@ package main
 import (
 	"testing"
 
-	"miller/src/auxents/regtest"
-	"miller/src/lib"
+	"mlr/src/auxents/regtest"
+	"mlr/src/lib"
 )
 
 func TestRegression(t *testing.T) {

go/src/auxents/auxents.go

@@ -9,9 +9,9 @@ import (
 	"fmt"
 	"os"
 
-	"miller/src/auxents/help"
-	"miller/src/auxents/regtest"
-	"miller/src/auxents/repl"
+	"mlr/src/auxents/help"
+	"mlr/src/auxents/regtest"
+	"mlr/src/auxents/repl"
 )
 
 // ----------------------------------------------------------------

go/src/auxents/help/entry.go

@@ -10,11 +10,11 @@ import (
 
 	"github.com/mattn/go-isatty"
 
-	"miller/src/cliutil"
-	"miller/src/dsl/cst"
-	"miller/src/lib"
-	"miller/src/transformers"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/dsl/cst"
+	"mlr/src/lib"
+	"mlr/src/transformers"
+	"mlr/src/types"
 )
 
 // ================================================================
@@ -183,7 +183,7 @@ func helpAuxents() {
 They do not participate in any other parts of Miller.
 Please "mlr aux-list" for more information.
 `)
-	// imports miller/src/auxents: import cycle not allowed
+	// imports mlr/src/auxents: import cycle not allowed
 	// auxents.ShowAuxEntries(o)
 }
 

go/src/auxents/regtest/invoker.go

@@ -5,7 +5,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"miller/src/platform"
+	"mlr/src/platform"
 )
 
 // RunMillerCommand runs a string like 'mlr cat foo.dat', with specified mlr

go/src/auxents/regtest/regtester.go

@@ -13,8 +13,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"miller/src/colorizer"
-	"miller/src/lib"
+	"mlr/src/colorizer"
+	"mlr/src/lib"
 )
 
 const DefaultPath = "./regtest/cases"

go/src/auxents/repl/ast.go

@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"os"
 
-	"miller/src/dsl"
-	"miller/src/parsing/lexer"
-	"miller/src/parsing/parser"
+	"mlr/src/dsl"
+	"mlr/src/parsing/lexer"
+	"mlr/src/parsing/parser"
 )
 
 // ----------------------------------------------------------------

go/src/auxents/repl/dsl.go

@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"strings"
 
-	"miller/src/types"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/auxents/repl/entry.go

@@ -27,7 +27,7 @@ import (
 	"path"
 	"strings"
 
-	"miller/src/cliutil"
+	"mlr/src/cliutil"
 )
 
 // ================================================================

go/src/auxents/repl/prompt.go

@@ -11,9 +11,9 @@ import (
 
 	"golang.org/x/term"
 
-	"miller/src/colorizer"
-	"miller/src/lib"
-	"miller/src/version"
+	"mlr/src/colorizer"
+	"mlr/src/lib"
+	"mlr/src/version"
 )
 
 const ENV_PRIMARY_PROMPT = "MLR_REPL_PS1"

go/src/auxents/repl/session.go

@@ -26,13 +26,13 @@ import (
 	"strings"
 	"syscall"
 
-	"miller/src/cliutil"
-	"miller/src/dsl/cst"
-	"miller/src/input"
-	"miller/src/lib"
-	"miller/src/output"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/dsl/cst"
+	"mlr/src/input"
+	"mlr/src/lib"
+	"mlr/src/output"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/auxents/repl/types.go

@@ -7,12 +7,12 @@ package repl
 import (
 	"os"
 
-	"miller/src/cliutil"
-	"miller/src/dsl/cst"
-	"miller/src/input"
-	"miller/src/output"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/dsl/cst"
+	"mlr/src/input"
+	"mlr/src/output"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ================================================================

go/src/auxents/repl/verbs.go

@@ -9,10 +9,10 @@ import (
 	"os"
 	"strings"
 
-	"miller/src/colorizer"
-	"miller/src/dsl/cst"
-	"miller/src/lib"
-	"miller/src/types"
+	"mlr/src/colorizer"
+	"mlr/src/dsl/cst"
+	"mlr/src/lib"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/cli/mlrcli_mlrrc.go

@@ -8,7 +8,7 @@ import (
 	"regexp"
 	"strings"
 
-	"miller/src/cliutil"
+	"mlr/src/cliutil"
 )
 
 // ----------------------------------------------------------------

go/src/cli/mlrcli_parse.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"os"
 
-	"miller/src/auxents/help"
-	"miller/src/cliutil"
-	"miller/src/lib"
-	"miller/src/transformers"
-	"miller/src/types"
-	"miller/src/version"
+	"mlr/src/auxents/help"
+	"mlr/src/cliutil"
+	"mlr/src/lib"
+	"mlr/src/transformers"
+	"mlr/src/types"
+	"mlr/src/version"
 )
 
 // ----------------------------------------------------------------

go/src/cliutil/option_parse.go

@@ -10,8 +10,8 @@ import (
 	"fmt"
 	"os"
 
-	"miller/src/colorizer"
-	"miller/src/lib"
+	"mlr/src/colorizer"
+	"mlr/src/lib"
 )
 
 const ASV_FS = "\x1f"

go/src/cliutil/option_types.go

@@ -7,7 +7,7 @@
 package cliutil
 
 import (
-	"miller/src/lib"
+	"mlr/src/lib"
 )
 
 // ----------------------------------------------------------------

go/src/cliutil/verb_utils.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	"strconv"
 
-	"miller/src/lib"
+	"mlr/src/lib"
 )
 
 // For flags with values, e.g. ["-n" "10"], while we're looking at the "-n" this let us see if the "10" slot exists.

go/src/dsl/ast_build.go

@@ -10,8 +10,8 @@ import (
 	"fmt"
 	"strings"
 
-	"miller/src/lib"
-	"miller/src/parsing/token"
+	"mlr/src/lib"
+	"mlr/src/parsing/token"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/ast_types.go

@@ -5,7 +5,7 @@
 package dsl
 
 import (
-	"miller/src/parsing/token"
+	"mlr/src/parsing/token"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/assignments.go

@@ -5,9 +5,9 @@
 package cst
 
 import (
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
 )
 
 // ================================================================

go/src/dsl/cst/block-exit.go

@@ -8,9 +8,9 @@ package cst
 import (
 	"errors"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/blocks.go

@@ -6,9 +6,9 @@
 package cst
 
 import (
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/builtin_function_manager.go

@@ -12,8 +12,8 @@ import (
 	"sort"
 	"strings"
 
-	"miller/src/lib"
-	"miller/src/types"
+	"mlr/src/lib"
+	"mlr/src/types"
 )
 
 type TFunctionClass string

go/src/dsl/cst/builtin_functions.go

@@ -8,10 +8,10 @@ import (
 	"errors"
 	"fmt"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/collections.go

@@ -6,10 +6,10 @@
 package cst
 
 import (
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/cond.go

@@ -8,10 +8,10 @@ package cst
 import (
 	"errors"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 type CondBlockNode struct {

go/src/dsl/cst/dump.go

@@ -22,11 +22,11 @@ import (
 	"os"
 	"strings"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/output"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/output"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ================================================================

go/src/dsl/cst/emit_emitp.go

@@ -42,11 +42,11 @@ import (
 	"errors"
 	"fmt"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/output"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/output"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ================================================================

go/src/dsl/cst/emitf.go

@@ -9,11 +9,11 @@ import (
 	"errors"
 	"fmt"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/output"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/output"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ================================================================

go/src/dsl/cst/env.go

@@ -10,10 +10,10 @@ package cst
 import (
 	"os"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 type EnvironmentVariableNode struct {

go/src/dsl/cst/evaluable.go

@@ -11,10 +11,10 @@ import (
 	"fmt"
 	"os"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/filter.go

@@ -5,9 +5,9 @@
 package cst
 
 import (
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/for.go

@@ -7,10 +7,10 @@ package cst
 import (
 	"errors"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/functions.go

@@ -9,8 +9,8 @@
 package cst
 
 import (
-	"miller/src/dsl"
-	"miller/src/lib"
+	"mlr/src/dsl"
+	"mlr/src/lib"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/if.go

@@ -7,10 +7,10 @@ package cst
 import (
 	"errors"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/keyword_usage.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"miller/src/lib"
+	"mlr/src/lib"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/leaves.go

@@ -8,10 +8,10 @@ import (
 	"errors"
 	"math"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/lvalues.go

@@ -10,10 +10,10 @@ import (
 	"fmt"
 	"os"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/print.go

@@ -10,11 +10,11 @@ import (
 	"fmt"
 	"os"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/output"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/output"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/root.go

@@ -11,11 +11,11 @@ import (
 	"fmt"
 	"os"
 
-	"miller/src/cliutil"
-	"miller/src/dsl"
-	"miller/src/output"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/dsl"
+	"mlr/src/output"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/signature.go

@@ -6,7 +6,7 @@
 package cst
 
 import (
-	"miller/src/types"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/statements.go

@@ -8,7 +8,7 @@ package cst
 import (
 	"errors"
 
-	"miller/src/dsl"
+	"mlr/src/dsl"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/subroutines.go

@@ -9,8 +9,8 @@
 package cst
 
 import (
-	"miller/src/dsl"
-	"miller/src/lib"
+	"mlr/src/dsl"
+	"mlr/src/lib"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/tee.go

@@ -8,11 +8,11 @@ import (
 	"errors"
 	"fmt"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/output"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/output"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/types.go

@@ -7,10 +7,10 @@ package cst
 import (
 	"container/list"
 
-	"miller/src/cliutil"
-	"miller/src/dsl"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/dsl"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/udf.go

@@ -9,10 +9,10 @@ import (
 	"fmt"
 	"os"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/uds.go

@@ -8,10 +8,10 @@ import (
 	"errors"
 	"fmt"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
-	"miller/src/types"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/validate.go

@@ -10,8 +10,8 @@ import (
 	"errors"
 	"fmt"
 
-	"miller/src/dsl"
-	"miller/src/lib"
+	"mlr/src/dsl"
+	"mlr/src/lib"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/warn.go

@@ -11,8 +11,8 @@ import (
 	"fmt"
 	"os"
 
-	"miller/src/dsl"
-	"miller/src/lib"
+	"mlr/src/dsl"
+	"mlr/src/lib"
 )
 
 // ----------------------------------------------------------------

go/src/dsl/cst/while.go

@@ -7,9 +7,9 @@ package cst
 import (
 	"errors"
 
-	"miller/src/dsl"
-	"miller/src/lib"
-	"miller/src/runtime"
+	"mlr/src/dsl"
+	"mlr/src/lib"
+	"mlr/src/runtime"
 )
 
 // ================================================================

go/src/entrypoint/entrypoint.go

@@ -11,14 +11,14 @@ import (
 	"os"
 	"path"
 
-	"miller/src/platform"
+	"mlr/src/platform"
 
-	"miller/src/auxents"
-	"miller/src/cli"
-	"miller/src/cliutil"
-	"miller/src/lib"
-	"miller/src/stream"
-	"miller/src/transformers"
+	"mlr/src/auxents"
+	"mlr/src/cli"
+	"mlr/src/cliutil"
+	"mlr/src/lib"
+	"mlr/src/stream"
+	"mlr/src/transformers"
 )
 
 // ----------------------------------------------------------------

go/src/input/record_reader.go

@@ -1,7 +1,7 @@
 package input
 
 import (
-	"miller/src/types"
+	"mlr/src/types"
 )
 
 // Since Go is concurrent, the context struct (AWK-like variables such as

go/src/input/record_reader_csv.go

@@ -9,9 +9,9 @@ import (
 	"strconv"
 	"strings"
 
-	"miller/src/cliutil"
-	"miller/src/lib"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/lib"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/input/record_reader_csvlite.go

@@ -26,9 +26,9 @@ import (
 	"strconv"
 	"strings"
 
-	"miller/src/cliutil"
-	"miller/src/lib"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/lib"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/input/record_reader_dkvp.go

@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"strings"
 
-	"miller/src/cliutil"
-	"miller/src/lib"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/lib"
+	"mlr/src/types"
 )
 
 type RecordReaderDKVP struct {

go/src/input/record_reader_factory.go

@@ -1,7 +1,7 @@
 package input
 
 import (
-	"miller/src/cliutil"
+	"mlr/src/cliutil"
 )
 
 func Create(readerOptions *cliutil.TReaderOptions) IRecordReader {

go/src/input/record_reader_json.go

@@ -7,9 +7,9 @@ import (
 
 	"encoding/json"
 
-	"miller/src/cliutil"
-	"miller/src/lib"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/lib"
+	"mlr/src/types"
 )
 
 type RecordReaderJSON struct {

go/src/input/record_reader_nidx.go

@@ -6,9 +6,9 @@ import (
 	"strconv"
 	"strings"
 
-	"miller/src/cliutil"
-	"miller/src/lib"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/lib"
+	"mlr/src/types"
 )
 
 type RecordReaderNIDX struct {

go/src/input/record_reader_xtab.go

@@ -8,9 +8,9 @@ import (
 	"regexp"
 	"strings"
 
-	"miller/src/cliutil"
-	"miller/src/lib"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/lib"
+	"mlr/src/types"
 )
 
 type RecordReaderXTAB struct {

go/src/lib/halfpipe.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"miller/src/platform"
+	"mlr/src/platform"
 )
 
 // OpenOutboundHalfPipe returns a handle to a process. Writing to that handle

go/src/output/channel_writer.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"miller/src/types"
+	"mlr/src/types"
 )
 
 func ChannelWriter(

go/src/output/file-output-handlers.go

@@ -18,9 +18,9 @@ import (
 	"io"
 	"os"
 
-	"miller/src/cliutil"
-	"miller/src/lib"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/lib"
+	"mlr/src/types"
 )
 
 // ================================================================

go/src/output/record_writer.go

@@ -3,7 +3,7 @@ package output
 import (
 	"io"
 
-	"miller/src/types"
+	"mlr/src/types"
 )
 
 // Convention: nil outrec signifies end of record stream

go/src/output/record_writer_csv.go

@@ -5,9 +5,9 @@ import (
 	"io"
 	"strings"
 
-	"miller/src/cliutil"
-	"miller/src/colorizer"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/colorizer"
+	"mlr/src/types"
 )
 
 type RecordWriterCSV struct {

go/src/output/record_writer_csvlite.go

@@ -5,9 +5,9 @@ import (
 	"io"
 	"strings"
 
-	"miller/src/cliutil"
-	"miller/src/colorizer"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/colorizer"
+	"mlr/src/types"
 )
 
 type RecordWriterCSVLite struct {

go/src/output/record_writer_dkvp.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"io"
 
-	"miller/src/cliutil"
-	"miller/src/colorizer"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/colorizer"
+	"mlr/src/types"
 )
 
 type RecordWriterDKVP struct {

go/src/output/record_writer_factory.go

@@ -1,7 +1,7 @@
 package output
 
 import (
-	"miller/src/cliutil"
+	"mlr/src/cliutil"
 )
 
 func Create(writerOptions *cliutil.TWriterOptions) IRecordWriter {

go/src/output/record_writer_json.go

@@ -6,8 +6,8 @@ import (
 	"io"
 	"os"
 
-	"miller/src/cliutil"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/output/record_writer_markdown.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"io"
 
-	"miller/src/cliutil"
-	"miller/src/colorizer"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/colorizer"
+	"mlr/src/types"
 )
 
 type RecordWriterMarkdown struct {

go/src/output/record_writer_nidx.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"io"
 
-	"miller/src/cliutil"
-	"miller/src/colorizer"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/colorizer"
+	"mlr/src/types"
 )
 
 type RecordWriterNIDX struct {

go/src/output/record_writer_pprint.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"miller/src/cliutil"
-	"miller/src/colorizer"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/colorizer"
+	"mlr/src/types"
 )
 
 type RecordWriterPPRINT struct {

go/src/output/record_writer_xtab.go

@@ -5,9 +5,9 @@ import (
 	"io"
 	"unicode/utf8"
 
-	"miller/src/cliutil"
-	"miller/src/colorizer"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/colorizer"
+	"mlr/src/types"
 )
 
 type RecordWriterXTAB struct {

go/src/parsing/README.md

@@ -1,5 +1,5 @@
 This directory contains a single source file, `mlr.bnf`, which is the lexical/semantic grammar file for the Miller `put`/`filter` DSL using the GOCC framework. (In a classical Lex/Yacc framework, there would be separate `mlr.l` and `mlr.y` files; using GOCC, there is a single `mlr.bnf` file.)
 
-All subdirectories of `src/parsing/` are autogen code created by GOCC's processing of `mlr.bnf`. They are nonetheless committed to source control, since running GOCC takes quite a bit longer than the `go build mlr.go` does, and the BNF file doesn't often change. See the top-level `miller/go` build scripts for how to rerun GOCC. As of this writing, it's `bin/gocc -o src/parsing src/parsing/mlr.bnf` as invoked from the `miller/go` base directory.
+All subdirectories of `src/parsing/` are autogen code created by GOCC's processing of `mlr.bnf`. They are nonetheless committed to source control, since running GOCC takes quite a bit longer than the `go build` does, and the BNF file doesn't often change. See the top-level `miller/go` build scripts for how to rerun GOCC. As of this writing, it's `bin/gocc -o src/parsing src/parsing/mlr.bnf` as invoked from the `miller/go` base directory.
 
 Making changes to `mlr.bnf` requires several minutes to re-run GOCC. For experimental changes, please see the [experiments](../../../experiments/dsl-parser) directory.

go/src/parsing/errors.go.template

@@ -14,7 +14,7 @@ import (
 	"fmt"
 	"strings"
 
-	"miller/src/parsing/token"
+	"mlr/src/parsing/token"
 )
 
 type ErrorSymbol interface {

go/src/parsing/errors/errors.go

@@ -14,7 +14,7 @@ import (
 	"fmt"
 	"strings"
 
-	"miller/src/parsing/token"
+	"mlr/src/parsing/token"
 )
 
 type ErrorSymbol interface {

go/src/parsing/lexer/acttab.go

@@ -5,7 +5,7 @@ package lexer
 import (
 	"fmt"
 
-	"miller/src/parsing/token"
+	"mlr/src/parsing/token"
 )
 
 type ActionTable [NumStates]ActionRow

go/src/parsing/lexer/lexer.go

@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"unicode/utf8"
 
-	"miller/src/parsing/token"
+	"mlr/src/parsing/token"
 )
 
 const (

go/src/parsing/mlr.bnf

@@ -28,7 +28,7 @@
 // * The <<...>> code called by the gocc framework must accept interface{} at
 //   all parameters, to be generic, but in practice all arguments end up being
 //   either token.Token (regcognizable here via string-literals or snake-cased
-//   namees) or *miller.dsl.AstNode (recognizable here via camel-cased names).
+//   namees) or *dsl.AstNode (recognizable here via camel-cased names).
 //
 // * Another pattern worth pointing out is that in the gocc framework,
 //   return-types from AST methods must be a pair of (interface{}, error),
@@ -319,7 +319,7 @@ panic : '%' '%' '%' 'p' 'a' 'n' 'i' 'c' '%' '%' '%' ;
 // ================================================================
 
 // Import the AST/ASTNode types and functions
-<< import "miller/src/dsl" >>
+<< import "mlr/src/dsl" >>
 
 // ================================================================
 // TOP-LEVEL PRODUCTION RULE FOR THE MILLER DSL

go/src/parsing/parser/parser.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"strings"
 
-	parseError "miller/src/parsing/errors"
-	"miller/src/parsing/token"
+	parseError "mlr/src/parsing/errors"
+	"mlr/src/parsing/token"
 )
 
 const (

go/src/parsing/parser/productionstable.go

@@ -2,7 +2,7 @@
 
 package parser
 
-import "miller/src/dsl"
+import "mlr/src/dsl"
 
 type (
 	ProdTab      [numProductions]ProdTabEntry

go/src/runtime/stack.go

@@ -30,8 +30,8 @@ import (
 	"errors"
 	"fmt"
 
-	"miller/src/lib"
-	"miller/src/types"
+	"mlr/src/lib"
+	"mlr/src/types"
 )
 
 // ================================================================

go/src/runtime/state.go

@@ -6,7 +6,7 @@
 package runtime
 
 import (
-	"miller/src/types"
+	"mlr/src/types"
 )
 
 type State struct {

go/src/stream/stream.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"os"
 
-	"miller/src/cliutil"
-	"miller/src/input"
-	"miller/src/output"
-	"miller/src/transformers"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/input"
+	"mlr/src/output"
+	"mlr/src/transformers"
+	"mlr/src/types"
 )
 
 // Since Go is concurrent, the context struct (AWK-like variables such as

go/src/transformers/aaa_chain_transformer.go

@@ -1,7 +1,7 @@
 package transformers
 
 import (
-	"miller/src/types"
+	"mlr/src/types"
 )
 
 func ChainTransformer(

go/src/transformers/aaa_record_transformer.go

@@ -3,8 +3,8 @@ package transformers
 import (
 	"os"
 
-	"miller/src/cliutil"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/types"
 )
 
 type IRecordTransformer interface {

go/src/transformers/aaa_transformer_table.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"miller/src/lib"
+	"mlr/src/lib"
 )
 
 // ----------------------------------------------------------------

go/src/transformers/altkv.go

@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"strings"
 
-	"miller/src/cliutil"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/transformers/bar.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"strings"
 
-	"miller/src/cliutil"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/types"
 )
 
 const barDefaultFillString = "*"

go/src/transformers/bootstrap.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"strings"
 
-	"miller/src/cliutil"
-	"miller/src/lib"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/lib"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/transformers/cat.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"strings"
 
-	"miller/src/cliutil"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/transformers/check.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"strings"
 
-	"miller/src/cliutil"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------

go/src/transformers/clean-whitespace.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"strings"
 
-	"miller/src/cliutil"
-	"miller/src/types"
+	"mlr/src/cliutil"
+	"mlr/src/types"
 )
 
 // ----------------------------------------------------------------