From 6d1254bb5ab84a64f2e83022aa280f2182e403c3 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Fri, 6 Aug 2021 10:08:21 -0400 Subject: [PATCH] Make 'go build' work, without need for 'go build mlr.go' (#622) --- .github/workflows/go.yml | 2 +- go/.vimrc | 2 +- go/README.md | 6 ++++-- go/build | 4 ++-- go/build-dsl | 4 ++-- go/buildw.cmd | 4 ++-- go/go.mod | 2 +- go/mlr.go | 2 +- go/regression_test.go | 4 ++-- go/src/auxents/auxents.go | 6 +++--- go/src/auxents/help/entry.go | 12 ++++++------ go/src/auxents/regtest/invoker.go | 2 +- go/src/auxents/regtest/regtester.go | 4 ++-- go/src/auxents/repl/ast.go | 6 +++--- go/src/auxents/repl/dsl.go | 2 +- go/src/auxents/repl/entry.go | 2 +- go/src/auxents/repl/prompt.go | 6 +++--- go/src/auxents/repl/session.go | 14 +++++++------- go/src/auxents/repl/types.go | 12 ++++++------ go/src/auxents/repl/verbs.go | 8 ++++---- go/src/cli/mlrcli_mlrrc.go | 2 +- go/src/cli/mlrcli_parse.go | 12 ++++++------ go/src/cliutil/option_parse.go | 4 ++-- go/src/cliutil/option_types.go | 2 +- go/src/cliutil/verb_utils.go | 2 +- go/src/dsl/ast_build.go | 4 ++-- go/src/dsl/ast_types.go | 2 +- go/src/dsl/cst/assignments.go | 6 +++--- go/src/dsl/cst/block-exit.go | 6 +++--- go/src/dsl/cst/blocks.go | 6 +++--- go/src/dsl/cst/builtin_function_manager.go | 4 ++-- go/src/dsl/cst/builtin_functions.go | 8 ++++---- go/src/dsl/cst/collections.go | 8 ++++---- go/src/dsl/cst/cond.go | 8 ++++---- go/src/dsl/cst/dump.go | 10 +++++----- go/src/dsl/cst/emit_emitp.go | 10 +++++----- go/src/dsl/cst/emitf.go | 10 +++++----- go/src/dsl/cst/env.go | 8 ++++---- go/src/dsl/cst/evaluable.go | 8 ++++---- go/src/dsl/cst/filter.go | 6 +++--- go/src/dsl/cst/for.go | 8 ++++---- go/src/dsl/cst/functions.go | 4 ++-- go/src/dsl/cst/if.go | 8 ++++---- go/src/dsl/cst/keyword_usage.go | 2 +- go/src/dsl/cst/leaves.go | 8 ++++---- go/src/dsl/cst/lvalues.go | 8 ++++---- go/src/dsl/cst/print.go | 10 +++++----- go/src/dsl/cst/root.go | 10 +++++----- go/src/dsl/cst/signature.go | 2 +- go/src/dsl/cst/statements.go | 2 +- go/src/dsl/cst/subroutines.go | 4 ++-- go/src/dsl/cst/tee.go | 10 +++++----- go/src/dsl/cst/types.go | 8 ++++---- go/src/dsl/cst/udf.go | 8 ++++---- go/src/dsl/cst/uds.go | 8 ++++---- go/src/dsl/cst/validate.go | 4 ++-- go/src/dsl/cst/warn.go | 4 ++-- go/src/dsl/cst/while.go | 6 +++--- go/src/entrypoint/entrypoint.go | 14 +++++++------- go/src/input/record_reader.go | 2 +- go/src/input/record_reader_csv.go | 6 +++--- go/src/input/record_reader_csvlite.go | 6 +++--- go/src/input/record_reader_dkvp.go | 6 +++--- go/src/input/record_reader_factory.go | 2 +- go/src/input/record_reader_json.go | 6 +++--- go/src/input/record_reader_nidx.go | 6 +++--- go/src/input/record_reader_xtab.go | 6 +++--- go/src/lib/halfpipe.go | 2 +- go/src/output/channel_writer.go | 2 +- go/src/output/file-output-handlers.go | 6 +++--- go/src/output/record_writer.go | 2 +- go/src/output/record_writer_csv.go | 6 +++--- go/src/output/record_writer_csvlite.go | 6 +++--- go/src/output/record_writer_dkvp.go | 6 +++--- go/src/output/record_writer_factory.go | 2 +- go/src/output/record_writer_json.go | 4 ++-- go/src/output/record_writer_markdown.go | 6 +++--- go/src/output/record_writer_nidx.go | 6 +++--- go/src/output/record_writer_pprint.go | 6 +++--- go/src/output/record_writer_xtab.go | 6 +++--- go/src/parsing/README.md | 2 +- go/src/parsing/errors.go.template | 2 +- go/src/parsing/errors/errors.go | 2 +- go/src/parsing/lexer/acttab.go | 2 +- go/src/parsing/lexer/lexer.go | 2 +- go/src/parsing/mlr.bnf | 4 ++-- go/src/parsing/parser/parser.go | 4 ++-- go/src/parsing/parser/productionstable.go | 2 +- go/src/runtime/stack.go | 4 ++-- go/src/runtime/state.go | 2 +- go/src/stream/stream.go | 10 +++++----- go/src/transformers/aaa_chain_transformer.go | 2 +- go/src/transformers/aaa_record_transformer.go | 4 ++-- go/src/transformers/aaa_transformer_table.go | 2 +- go/src/transformers/altkv.go | 4 ++-- go/src/transformers/bar.go | 4 ++-- go/src/transformers/bootstrap.go | 6 +++--- go/src/transformers/cat.go | 4 ++-- go/src/transformers/check.go | 4 ++-- go/src/transformers/clean-whitespace.go | 4 ++-- go/src/transformers/count-similar.go | 6 +++--- go/src/transformers/count.go | 6 +++--- go/src/transformers/cut.go | 6 +++--- go/src/transformers/decimate.go | 4 ++-- go/src/transformers/fill-down.go | 4 ++-- go/src/transformers/fill-empty.go | 4 ++-- go/src/transformers/flatten.go | 6 +++--- go/src/transformers/format-values.go | 4 ++-- go/src/transformers/fraction.go | 6 +++--- go/src/transformers/gap.go | 4 ++-- go/src/transformers/grep.go | 4 ++-- go/src/transformers/group-by.go | 6 +++--- go/src/transformers/group-like.go | 6 +++--- go/src/transformers/having-fields.go | 6 +++--- go/src/transformers/head.go | 4 ++-- go/src/transformers/histogram.go | 6 +++--- go/src/transformers/join.go | 10 +++++----- go/src/transformers/json-parse.go | 6 +++--- go/src/transformers/json-stringify.go | 6 +++--- go/src/transformers/label.go | 6 +++--- go/src/transformers/merge-fields.go | 8 ++++---- go/src/transformers/most-or-least-frequent.go | 6 +++--- go/src/transformers/nest.go | 6 +++--- go/src/transformers/nothing.go | 4 ++-- go/src/transformers/put-or-filter.go | 16 ++++++++-------- go/src/transformers/regularize.go | 6 +++--- go/src/transformers/remove-empty-columns.go | 4 ++-- go/src/transformers/rename.go | 6 +++--- go/src/transformers/reorder.go | 6 +++--- go/src/transformers/repeat.go | 4 ++-- go/src/transformers/reshape.go | 6 +++--- go/src/transformers/sample.go | 6 +++--- go/src/transformers/sec2gmt.go | 6 +++--- go/src/transformers/sec2gmtdate.go | 6 +++--- go/src/transformers/seqgen.go | 4 ++-- go/src/transformers/shuffle.go | 6 +++--- go/src/transformers/skip-trivial-records.go | 4 ++-- go/src/transformers/sort-within-records.go | 4 ++-- go/src/transformers/sort.go | 6 +++--- go/src/transformers/stats1.go | 8 ++++---- go/src/transformers/stats2.go | 8 ++++---- go/src/transformers/step.go | 6 +++--- go/src/transformers/tac.go | 4 ++-- go/src/transformers/tail.go | 6 +++--- go/src/transformers/tee.go | 6 +++--- go/src/transformers/template.go | 6 +++--- go/src/transformers/top.go | 8 ++++---- go/src/transformers/unflatten.go | 6 +++--- go/src/transformers/uniq.go | 6 +++--- go/src/transformers/unsparsify.go | 6 +++--- go/src/transformers/utils/join-bucket-keeper.go | 8 ++++---- go/src/transformers/utils/join-bucket.go | 2 +- go/src/transformers/utils/percentile-keeper.go | 2 +- go/src/transformers/utils/stats1-accumulators.go | 4 ++-- go/src/transformers/utils/stats2-accumulators.go | 4 ++-- go/src/transformers/utils/top-keeper.go | 2 +- go/src/types/context.go | 2 +- go/src/types/mlrmap_accessors.go | 2 +- go/src/types/mlrmap_flatten_unflatten.go | 2 +- go/src/types/mlrmap_json.go | 4 ++-- go/src/types/mlrval_accessors.go | 2 +- go/src/types/mlrval_collections.go | 2 +- go/src/types/mlrval_format_test.go | 2 +- go/src/types/mlrval_functions_booleans.go | 2 +- go/src/types/mlrval_functions_collections.go | 2 +- go/src/types/mlrval_functions_mathlib.go | 2 +- go/src/types/mlrval_functions_random.go | 2 +- go/src/types/mlrval_functions_regex.go | 2 +- go/src/types/mlrval_functions_stats.go | 2 +- go/src/types/mlrval_functions_strings.go | 2 +- go/src/types/mlrval_functions_system.go | 4 ++-- go/src/types/mlrval_functions_time.go | 2 +- go/src/types/mlrval_functions_types.go | 2 +- go/src/types/mlrval_json.go | 4 ++-- go/src/types/mlrval_new.go | 2 +- go/u/gg | 2 +- 176 files changed, 446 insertions(+), 444 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index e826935e7..984dd034a 100644 --- a/.github/workflows/go.yml +++ b/.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' diff --git a/go/.vimrc b/go/.vimrc index 070427325..caec30c40 100644 --- a/go/.vimrc +++ b/go/.vimrc @@ -1,2 +1,2 @@ -map \d :w:!clear;echo Building ...; echo; go build mlr.go +map \d :w:!clear;echo Building ...; echo; go build map \f :w:!clear;echo Building ...; echo; build; echo; main diff --git a/go/README.md b/go/README.md index a6b11c437..f0173d027 100644 --- a/go/README.md +++ b/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: diff --git a/go/build b/go/build index 207d50c2b..416421c6d 100755 --- a/go/build +++ b/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 diff --git a/go/build-dsl b/go/build-dsl index d54217fcb..e0684d20f 100755 --- a/go/build-dsl +++ b/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: diff --git a/go/buildw.cmd b/go/buildw.cmd index dc67131e5..56aa52d0a 100644 --- a/go/buildw.cmd +++ b/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 diff --git a/go/go.mod b/go/go.mod index e1bec9180..1af99b7fc 100644 --- a/go/go.mod +++ b/go/go.mod @@ -1,4 +1,4 @@ -module miller +module mlr go 1.15 diff --git a/go/mlr.go b/go/mlr.go index eec35a845..93686c671 100644 --- a/go/mlr.go +++ b/go/mlr.go @@ -7,7 +7,7 @@ import ( "runtime/debug" "runtime/pprof" - "miller/src/entrypoint" + "mlr/src/entrypoint" ) // ---------------------------------------------------------------- diff --git a/go/regression_test.go b/go/regression_test.go index c8280e5f9..0128d2034 100644 --- a/go/regression_test.go +++ b/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) { diff --git a/go/src/auxents/auxents.go b/go/src/auxents/auxents.go index c6be7fc89..fc0bb2c59 100644 --- a/go/src/auxents/auxents.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/auxents/help/entry.go b/go/src/auxents/help/entry.go index 44e4e7aa8..a1d92f69d 100644 --- a/go/src/auxents/help/entry.go +++ b/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) } diff --git a/go/src/auxents/regtest/invoker.go b/go/src/auxents/regtest/invoker.go index 561a52aa9..7cb6aa515 100644 --- a/go/src/auxents/regtest/invoker.go +++ b/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 diff --git a/go/src/auxents/regtest/regtester.go b/go/src/auxents/regtest/regtester.go index f7aa43ae9..c1a749886 100644 --- a/go/src/auxents/regtest/regtester.go +++ b/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" diff --git a/go/src/auxents/repl/ast.go b/go/src/auxents/repl/ast.go index 95dbc75d5..f4cdd97d8 100644 --- a/go/src/auxents/repl/ast.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/auxents/repl/dsl.go b/go/src/auxents/repl/dsl.go index 4147ec1f7..850adaa69 100644 --- a/go/src/auxents/repl/dsl.go +++ b/go/src/auxents/repl/dsl.go @@ -23,7 +23,7 @@ import ( "fmt" "strings" - "miller/src/types" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/auxents/repl/entry.go b/go/src/auxents/repl/entry.go index e67add9e5..47f84161d 100644 --- a/go/src/auxents/repl/entry.go +++ b/go/src/auxents/repl/entry.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "miller/src/cliutil" + "mlr/src/cliutil" ) // ================================================================ diff --git a/go/src/auxents/repl/prompt.go b/go/src/auxents/repl/prompt.go index 00f83e43f..e4155be91 100644 --- a/go/src/auxents/repl/prompt.go +++ b/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" diff --git a/go/src/auxents/repl/session.go b/go/src/auxents/repl/session.go index c81f7736d..7b4c3d159 100644 --- a/go/src/auxents/repl/session.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/auxents/repl/types.go b/go/src/auxents/repl/types.go index 918ad0f8b..7cf5a6608 100644 --- a/go/src/auxents/repl/types.go +++ b/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" ) // ================================================================ diff --git a/go/src/auxents/repl/verbs.go b/go/src/auxents/repl/verbs.go index fe7df4cf3..072c1b817 100644 --- a/go/src/auxents/repl/verbs.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/cli/mlrcli_mlrrc.go b/go/src/cli/mlrcli_mlrrc.go index 2d4269294..e482550d9 100644 --- a/go/src/cli/mlrcli_mlrrc.go +++ b/go/src/cli/mlrcli_mlrrc.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "miller/src/cliutil" + "mlr/src/cliutil" ) // ---------------------------------------------------------------- diff --git a/go/src/cli/mlrcli_parse.go b/go/src/cli/mlrcli_parse.go index e8ce8c502..a42fe43f0 100644 --- a/go/src/cli/mlrcli_parse.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/cliutil/option_parse.go b/go/src/cliutil/option_parse.go index cb2fba943..79c714422 100644 --- a/go/src/cliutil/option_parse.go +++ b/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" diff --git a/go/src/cliutil/option_types.go b/go/src/cliutil/option_types.go index efd498b0d..ddfd67e76 100644 --- a/go/src/cliutil/option_types.go +++ b/go/src/cliutil/option_types.go @@ -7,7 +7,7 @@ package cliutil import ( - "miller/src/lib" + "mlr/src/lib" ) // ---------------------------------------------------------------- diff --git a/go/src/cliutil/verb_utils.go b/go/src/cliutil/verb_utils.go index d96790281..d6d3395d7 100644 --- a/go/src/cliutil/verb_utils.go +++ b/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. diff --git a/go/src/dsl/ast_build.go b/go/src/dsl/ast_build.go index db7e4d64a..f9c69cf68 100644 --- a/go/src/dsl/ast_build.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/ast_types.go b/go/src/dsl/ast_types.go index 93ab33f70..972f96a4b 100644 --- a/go/src/dsl/ast_types.go +++ b/go/src/dsl/ast_types.go @@ -5,7 +5,7 @@ package dsl import ( - "miller/src/parsing/token" + "mlr/src/parsing/token" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/assignments.go b/go/src/dsl/cst/assignments.go index a2411493f..dbc19a68f 100644 --- a/go/src/dsl/cst/assignments.go +++ b/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" ) // ================================================================ diff --git a/go/src/dsl/cst/block-exit.go b/go/src/dsl/cst/block-exit.go index c5a5a6dd6..3652bdb44 100644 --- a/go/src/dsl/cst/block-exit.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/blocks.go b/go/src/dsl/cst/blocks.go index e250c1d47..1236806bb 100644 --- a/go/src/dsl/cst/blocks.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/builtin_function_manager.go b/go/src/dsl/cst/builtin_function_manager.go index df6615f8f..b7b6938f6 100644 --- a/go/src/dsl/cst/builtin_function_manager.go +++ b/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 diff --git a/go/src/dsl/cst/builtin_functions.go b/go/src/dsl/cst/builtin_functions.go index 844594c93..ec398f9ca 100644 --- a/go/src/dsl/cst/builtin_functions.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/collections.go b/go/src/dsl/cst/collections.go index a09b80955..278fb6da3 100644 --- a/go/src/dsl/cst/collections.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/cond.go b/go/src/dsl/cst/cond.go index 2aece3e1f..3b22fbccd 100644 --- a/go/src/dsl/cst/cond.go +++ b/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 { diff --git a/go/src/dsl/cst/dump.go b/go/src/dsl/cst/dump.go index f771ecbd5..6e2f00637 100644 --- a/go/src/dsl/cst/dump.go +++ b/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" ) // ================================================================ diff --git a/go/src/dsl/cst/emit_emitp.go b/go/src/dsl/cst/emit_emitp.go index 0434a498a..dd3f5daef 100644 --- a/go/src/dsl/cst/emit_emitp.go +++ b/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" ) // ================================================================ diff --git a/go/src/dsl/cst/emitf.go b/go/src/dsl/cst/emitf.go index 1b443df47..862395007 100644 --- a/go/src/dsl/cst/emitf.go +++ b/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" ) // ================================================================ diff --git a/go/src/dsl/cst/env.go b/go/src/dsl/cst/env.go index d98fc44e1..c6e0a3722 100644 --- a/go/src/dsl/cst/env.go +++ b/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 { diff --git a/go/src/dsl/cst/evaluable.go b/go/src/dsl/cst/evaluable.go index 979fedab8..823bcfd26 100644 --- a/go/src/dsl/cst/evaluable.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/filter.go b/go/src/dsl/cst/filter.go index d8be38bca..a7c76cc54 100644 --- a/go/src/dsl/cst/filter.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/for.go b/go/src/dsl/cst/for.go index 1a4e6f516..e0aacbfa6 100644 --- a/go/src/dsl/cst/for.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/functions.go b/go/src/dsl/cst/functions.go index 2a8c88e2c..e991dd3d7 100644 --- a/go/src/dsl/cst/functions.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/if.go b/go/src/dsl/cst/if.go index e29bd2578..68e13936b 100644 --- a/go/src/dsl/cst/if.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/keyword_usage.go b/go/src/dsl/cst/keyword_usage.go index 9e4b97344..64aebd0dc 100644 --- a/go/src/dsl/cst/keyword_usage.go +++ b/go/src/dsl/cst/keyword_usage.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "miller/src/lib" + "mlr/src/lib" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/leaves.go b/go/src/dsl/cst/leaves.go index c71f3a25d..efea9046f 100644 --- a/go/src/dsl/cst/leaves.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/lvalues.go b/go/src/dsl/cst/lvalues.go index 67dc535b8..97d711753 100644 --- a/go/src/dsl/cst/lvalues.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/print.go b/go/src/dsl/cst/print.go index 6f1938b0d..666042917 100644 --- a/go/src/dsl/cst/print.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/root.go b/go/src/dsl/cst/root.go index 52e5c632d..d61babf11 100644 --- a/go/src/dsl/cst/root.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/signature.go b/go/src/dsl/cst/signature.go index bd49c01f9..84acb9be3 100644 --- a/go/src/dsl/cst/signature.go +++ b/go/src/dsl/cst/signature.go @@ -6,7 +6,7 @@ package cst import ( - "miller/src/types" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/statements.go b/go/src/dsl/cst/statements.go index ba6b82820..21ba0fca1 100644 --- a/go/src/dsl/cst/statements.go +++ b/go/src/dsl/cst/statements.go @@ -8,7 +8,7 @@ package cst import ( "errors" - "miller/src/dsl" + "mlr/src/dsl" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/subroutines.go b/go/src/dsl/cst/subroutines.go index 8736267b5..20dc0e8e8 100644 --- a/go/src/dsl/cst/subroutines.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/tee.go b/go/src/dsl/cst/tee.go index 82e9faf72..27b334a22 100644 --- a/go/src/dsl/cst/tee.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/types.go b/go/src/dsl/cst/types.go index ff0aac137..3092cab17 100644 --- a/go/src/dsl/cst/types.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/udf.go b/go/src/dsl/cst/udf.go index 8afb7065e..3161b03c2 100644 --- a/go/src/dsl/cst/udf.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/uds.go b/go/src/dsl/cst/uds.go index 301f7441a..e954096a5 100644 --- a/go/src/dsl/cst/uds.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/validate.go b/go/src/dsl/cst/validate.go index 3f2ddde3c..115ad04bb 100644 --- a/go/src/dsl/cst/validate.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/warn.go b/go/src/dsl/cst/warn.go index 3a8655e29..497bad2da 100644 --- a/go/src/dsl/cst/warn.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/dsl/cst/while.go b/go/src/dsl/cst/while.go index 2cfa48c03..00de1545d 100644 --- a/go/src/dsl/cst/while.go +++ b/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" ) // ================================================================ diff --git a/go/src/entrypoint/entrypoint.go b/go/src/entrypoint/entrypoint.go index 48f10a20e..5673e3f5e 100644 --- a/go/src/entrypoint/entrypoint.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/input/record_reader.go b/go/src/input/record_reader.go index 6bbaca244..b46fa26ff 100644 --- a/go/src/input/record_reader.go +++ b/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 diff --git a/go/src/input/record_reader_csv.go b/go/src/input/record_reader_csv.go index 5198d1928..8e3809fdb 100644 --- a/go/src/input/record_reader_csv.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/input/record_reader_csvlite.go b/go/src/input/record_reader_csvlite.go index fc4865191..308d39401 100644 --- a/go/src/input/record_reader_csvlite.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/input/record_reader_dkvp.go b/go/src/input/record_reader_dkvp.go index 83175bb8b..44fdd9786 100644 --- a/go/src/input/record_reader_dkvp.go +++ b/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 { diff --git a/go/src/input/record_reader_factory.go b/go/src/input/record_reader_factory.go index 3a2d173f1..73865220b 100644 --- a/go/src/input/record_reader_factory.go +++ b/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 { diff --git a/go/src/input/record_reader_json.go b/go/src/input/record_reader_json.go index d3eb57d00..bcd120168 100644 --- a/go/src/input/record_reader_json.go +++ b/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 { diff --git a/go/src/input/record_reader_nidx.go b/go/src/input/record_reader_nidx.go index 7a12d00bf..0ebdc4d13 100644 --- a/go/src/input/record_reader_nidx.go +++ b/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 { diff --git a/go/src/input/record_reader_xtab.go b/go/src/input/record_reader_xtab.go index ffc683c39..f1385d97e 100644 --- a/go/src/input/record_reader_xtab.go +++ b/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 { diff --git a/go/src/lib/halfpipe.go b/go/src/lib/halfpipe.go index bb93c6c01..089bb7208 100644 --- a/go/src/lib/halfpipe.go +++ b/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 diff --git a/go/src/output/channel_writer.go b/go/src/output/channel_writer.go index f504224f5..e5dd21bec 100644 --- a/go/src/output/channel_writer.go +++ b/go/src/output/channel_writer.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "miller/src/types" + "mlr/src/types" ) func ChannelWriter( diff --git a/go/src/output/file-output-handlers.go b/go/src/output/file-output-handlers.go index cc69ea21a..a13a43730 100644 --- a/go/src/output/file-output-handlers.go +++ b/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" ) // ================================================================ diff --git a/go/src/output/record_writer.go b/go/src/output/record_writer.go index ac3e455c6..d76793b1f 100644 --- a/go/src/output/record_writer.go +++ b/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 diff --git a/go/src/output/record_writer_csv.go b/go/src/output/record_writer_csv.go index 4ea3f091a..5d332a932 100644 --- a/go/src/output/record_writer_csv.go +++ b/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 { diff --git a/go/src/output/record_writer_csvlite.go b/go/src/output/record_writer_csvlite.go index f32259f48..88f49ca15 100644 --- a/go/src/output/record_writer_csvlite.go +++ b/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 { diff --git a/go/src/output/record_writer_dkvp.go b/go/src/output/record_writer_dkvp.go index 3b940e455..8a826048d 100644 --- a/go/src/output/record_writer_dkvp.go +++ b/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 { diff --git a/go/src/output/record_writer_factory.go b/go/src/output/record_writer_factory.go index 5d76d341d..a21cd1d1e 100644 --- a/go/src/output/record_writer_factory.go +++ b/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 { diff --git a/go/src/output/record_writer_json.go b/go/src/output/record_writer_json.go index 8a41641e1..2846c08fc 100644 --- a/go/src/output/record_writer_json.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/output/record_writer_markdown.go b/go/src/output/record_writer_markdown.go index 9f8b884dc..d91155ed1 100644 --- a/go/src/output/record_writer_markdown.go +++ b/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 { diff --git a/go/src/output/record_writer_nidx.go b/go/src/output/record_writer_nidx.go index dce74143e..a231c95f7 100644 --- a/go/src/output/record_writer_nidx.go +++ b/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 { diff --git a/go/src/output/record_writer_pprint.go b/go/src/output/record_writer_pprint.go index c4994086a..9f0666276 100644 --- a/go/src/output/record_writer_pprint.go +++ b/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 { diff --git a/go/src/output/record_writer_xtab.go b/go/src/output/record_writer_xtab.go index 06fcf5efd..18b842011 100644 --- a/go/src/output/record_writer_xtab.go +++ b/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 { diff --git a/go/src/parsing/README.md b/go/src/parsing/README.md index 5969a2a2e..e79aea7b3 100644 --- a/go/src/parsing/README.md +++ b/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. diff --git a/go/src/parsing/errors.go.template b/go/src/parsing/errors.go.template index 027bfdc27..2a9521a04 100644 --- a/go/src/parsing/errors.go.template +++ b/go/src/parsing/errors.go.template @@ -14,7 +14,7 @@ import ( "fmt" "strings" - "miller/src/parsing/token" + "mlr/src/parsing/token" ) type ErrorSymbol interface { diff --git a/go/src/parsing/errors/errors.go b/go/src/parsing/errors/errors.go index 027bfdc27..2a9521a04 100644 --- a/go/src/parsing/errors/errors.go +++ b/go/src/parsing/errors/errors.go @@ -14,7 +14,7 @@ import ( "fmt" "strings" - "miller/src/parsing/token" + "mlr/src/parsing/token" ) type ErrorSymbol interface { diff --git a/go/src/parsing/lexer/acttab.go b/go/src/parsing/lexer/acttab.go index e2e3e3b32..ae25997d8 100644 --- a/go/src/parsing/lexer/acttab.go +++ b/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 diff --git a/go/src/parsing/lexer/lexer.go b/go/src/parsing/lexer/lexer.go index 24986fb2f..089c8e082 100644 --- a/go/src/parsing/lexer/lexer.go +++ b/go/src/parsing/lexer/lexer.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "unicode/utf8" - "miller/src/parsing/token" + "mlr/src/parsing/token" ) const ( diff --git a/go/src/parsing/mlr.bnf b/go/src/parsing/mlr.bnf index 8b5318ac5..c8580b78c 100644 --- a/go/src/parsing/mlr.bnf +++ b/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 diff --git a/go/src/parsing/parser/parser.go b/go/src/parsing/parser/parser.go index f974c15b7..509e6abad 100644 --- a/go/src/parsing/parser/parser.go +++ b/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 ( diff --git a/go/src/parsing/parser/productionstable.go b/go/src/parsing/parser/productionstable.go index d3ee774b3..e623c8ade 100644 --- a/go/src/parsing/parser/productionstable.go +++ b/go/src/parsing/parser/productionstable.go @@ -2,7 +2,7 @@ package parser -import "miller/src/dsl" +import "mlr/src/dsl" type ( ProdTab [numProductions]ProdTabEntry diff --git a/go/src/runtime/stack.go b/go/src/runtime/stack.go index 1dc85edbd..90854df86 100644 --- a/go/src/runtime/stack.go +++ b/go/src/runtime/stack.go @@ -30,8 +30,8 @@ import ( "errors" "fmt" - "miller/src/lib" - "miller/src/types" + "mlr/src/lib" + "mlr/src/types" ) // ================================================================ diff --git a/go/src/runtime/state.go b/go/src/runtime/state.go index fac669608..b117c0cb3 100644 --- a/go/src/runtime/state.go +++ b/go/src/runtime/state.go @@ -6,7 +6,7 @@ package runtime import ( - "miller/src/types" + "mlr/src/types" ) type State struct { diff --git a/go/src/stream/stream.go b/go/src/stream/stream.go index a0ea9b720..9b35e6c08 100644 --- a/go/src/stream/stream.go +++ b/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 diff --git a/go/src/transformers/aaa_chain_transformer.go b/go/src/transformers/aaa_chain_transformer.go index a97511eba..3fd06e850 100644 --- a/go/src/transformers/aaa_chain_transformer.go +++ b/go/src/transformers/aaa_chain_transformer.go @@ -1,7 +1,7 @@ package transformers import ( - "miller/src/types" + "mlr/src/types" ) func ChainTransformer( diff --git a/go/src/transformers/aaa_record_transformer.go b/go/src/transformers/aaa_record_transformer.go index 96db6eb20..79535baa0 100644 --- a/go/src/transformers/aaa_record_transformer.go +++ b/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 { diff --git a/go/src/transformers/aaa_transformer_table.go b/go/src/transformers/aaa_transformer_table.go index ad69510af..53989bd8a 100644 --- a/go/src/transformers/aaa_transformer_table.go +++ b/go/src/transformers/aaa_transformer_table.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "miller/src/lib" + "mlr/src/lib" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/altkv.go b/go/src/transformers/altkv.go index ccaf14628..10c28b986 100644 --- a/go/src/transformers/altkv.go +++ b/go/src/transformers/altkv.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/bar.go b/go/src/transformers/bar.go index 5608dab2a..7834e0095 100644 --- a/go/src/transformers/bar.go +++ b/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 = "*" diff --git a/go/src/transformers/bootstrap.go b/go/src/transformers/bootstrap.go index f40482160..bcaaba0b9 100644 --- a/go/src/transformers/bootstrap.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/cat.go b/go/src/transformers/cat.go index 43b5c7460..9e6a83619 100644 --- a/go/src/transformers/cat.go +++ b/go/src/transformers/cat.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/check.go b/go/src/transformers/check.go index 760ced628..fddcdf4eb 100644 --- a/go/src/transformers/check.go +++ b/go/src/transformers/check.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/clean-whitespace.go b/go/src/transformers/clean-whitespace.go index a625c6190..dd1b69ba2 100644 --- a/go/src/transformers/clean-whitespace.go +++ b/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" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/count-similar.go b/go/src/transformers/count-similar.go index f9ec60fbd..8314f18be 100644 --- a/go/src/transformers/count-similar.go +++ b/go/src/transformers/count-similar.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" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/count.go b/go/src/transformers/count.go index 085c7ce4c..4f0ebd6dc 100644 --- a/go/src/transformers/count.go +++ b/go/src/transformers/count.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/cut.go b/go/src/transformers/cut.go index cbaf72b62..819fcc764 100644 --- a/go/src/transformers/cut.go +++ b/go/src/transformers/cut.go @@ -6,9 +6,9 @@ import ( "regexp" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/decimate.go b/go/src/transformers/decimate.go index c3d01b936..96134e90d 100644 --- a/go/src/transformers/decimate.go +++ b/go/src/transformers/decimate.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/fill-down.go b/go/src/transformers/fill-down.go index f134600a2..ca55c48d2 100644 --- a/go/src/transformers/fill-down.go +++ b/go/src/transformers/fill-down.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/fill-empty.go b/go/src/transformers/fill-empty.go index 4893362d0..2a35d9a08 100644 --- a/go/src/transformers/fill-empty.go +++ b/go/src/transformers/fill-empty.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/flatten.go b/go/src/transformers/flatten.go index d1a62fb13..41682b843 100644 --- a/go/src/transformers/flatten.go +++ b/go/src/transformers/flatten.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/format-values.go b/go/src/transformers/format-values.go index a402a1e38..a4331e293 100644 --- a/go/src/transformers/format-values.go +++ b/go/src/transformers/format-values.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/fraction.go b/go/src/transformers/fraction.go index 86093a076..4db76a7fd 100644 --- a/go/src/transformers/fraction.go +++ b/go/src/transformers/fraction.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" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/gap.go b/go/src/transformers/gap.go index a3133ec4c..8cd01fe7a 100644 --- a/go/src/transformers/gap.go +++ b/go/src/transformers/gap.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/grep.go b/go/src/transformers/grep.go index c87f9e898..4977c585e 100644 --- a/go/src/transformers/grep.go +++ b/go/src/transformers/grep.go @@ -6,8 +6,8 @@ import ( "regexp" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/group-by.go b/go/src/transformers/group-by.go index a8221a035..277ab0d84 100644 --- a/go/src/transformers/group-by.go +++ b/go/src/transformers/group-by.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" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/group-like.go b/go/src/transformers/group-like.go index e8bf53965..2c2cdc02e 100644 --- a/go/src/transformers/group-like.go +++ b/go/src/transformers/group-like.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" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/having-fields.go b/go/src/transformers/having-fields.go index 33df90d0d..d73d9966c 100644 --- a/go/src/transformers/having-fields.go +++ b/go/src/transformers/having-fields.go @@ -6,9 +6,9 @@ import ( "regexp" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) type tHavingFieldsCriterion int diff --git a/go/src/transformers/head.go b/go/src/transformers/head.go index a92a3bd6a..d90dae42f 100644 --- a/go/src/transformers/head.go +++ b/go/src/transformers/head.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/histogram.go b/go/src/transformers/histogram.go index 24d335f48..349bb579c 100644 --- a/go/src/transformers/histogram.go +++ b/go/src/transformers/histogram.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/join.go b/go/src/transformers/join.go index 484c04706..892e1f555 100644 --- a/go/src/transformers/join.go +++ b/go/src/transformers/join.go @@ -7,11 +7,11 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/input" - "miller/src/lib" - "miller/src/transformers/utils" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/input" + "mlr/src/lib" + "mlr/src/transformers/utils" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/json-parse.go b/go/src/transformers/json-parse.go index 47137d251..466097e71 100644 --- a/go/src/transformers/json-parse.go +++ b/go/src/transformers/json-parse.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/json-stringify.go b/go/src/transformers/json-stringify.go index 386977a80..ce48e0654 100644 --- a/go/src/transformers/json-stringify.go +++ b/go/src/transformers/json-stringify.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/label.go b/go/src/transformers/label.go index 370c9153c..7f8a6f9dd 100644 --- a/go/src/transformers/label.go +++ b/go/src/transformers/label.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" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/merge-fields.go b/go/src/transformers/merge-fields.go index 57be9fc58..8d2c10d12 100644 --- a/go/src/transformers/merge-fields.go +++ b/go/src/transformers/merge-fields.go @@ -7,10 +7,10 @@ import ( "regexp" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/transformers/utils" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/transformers/utils" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/most-or-least-frequent.go b/go/src/transformers/most-or-least-frequent.go index de898c560..1dab8230c 100644 --- a/go/src/transformers/most-or-least-frequent.go +++ b/go/src/transformers/most-or-least-frequent.go @@ -6,9 +6,9 @@ import ( "sort" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/nest.go b/go/src/transformers/nest.go index 98cafa9f2..1aa2ee08a 100644 --- a/go/src/transformers/nest.go +++ b/go/src/transformers/nest.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" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/nothing.go b/go/src/transformers/nothing.go index 7b59eefae..df60143d1 100644 --- a/go/src/transformers/nothing.go +++ b/go/src/transformers/nothing.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/put-or-filter.go b/go/src/transformers/put-or-filter.go index 83faadc02..0605a10de 100644 --- a/go/src/transformers/put-or-filter.go +++ b/go/src/transformers/put-or-filter.go @@ -6,14 +6,14 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/dsl" - "miller/src/dsl/cst" - "miller/src/lib" - "miller/src/parsing/lexer" - "miller/src/parsing/parser" - "miller/src/runtime" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/dsl" + "mlr/src/dsl/cst" + "mlr/src/lib" + "mlr/src/parsing/lexer" + "mlr/src/parsing/parser" + "mlr/src/runtime" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/regularize.go b/go/src/transformers/regularize.go index d3bea2932..ef0257952 100644 --- a/go/src/transformers/regularize.go +++ b/go/src/transformers/regularize.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/remove-empty-columns.go b/go/src/transformers/remove-empty-columns.go index 6c692def2..a67086254 100644 --- a/go/src/transformers/remove-empty-columns.go +++ b/go/src/transformers/remove-empty-columns.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/rename.go b/go/src/transformers/rename.go index 60101bf8d..e335e7201 100644 --- a/go/src/transformers/rename.go +++ b/go/src/transformers/rename.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" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/reorder.go b/go/src/transformers/reorder.go index 13902e937..88460b3bb 100644 --- a/go/src/transformers/reorder.go +++ b/go/src/transformers/reorder.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/repeat.go b/go/src/transformers/repeat.go index e0d53773b..794fa4037 100644 --- a/go/src/transformers/repeat.go +++ b/go/src/transformers/repeat.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) type tRepeatCountSource int diff --git a/go/src/transformers/reshape.go b/go/src/transformers/reshape.go index 7e9d6d80f..8ac784f38 100644 --- a/go/src/transformers/reshape.go +++ b/go/src/transformers/reshape.go @@ -33,9 +33,9 @@ import ( "regexp" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/sample.go b/go/src/transformers/sample.go index a1a34b515..3648b5a5a 100644 --- a/go/src/transformers/sample.go +++ b/go/src/transformers/sample.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/sec2gmt.go b/go/src/transformers/sec2gmt.go index ed5efc434..32cb1a2cd 100644 --- a/go/src/transformers/sec2gmt.go +++ b/go/src/transformers/sec2gmt.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/sec2gmtdate.go b/go/src/transformers/sec2gmtdate.go index 384dba9d4..16c0a81f3 100644 --- a/go/src/transformers/sec2gmtdate.go +++ b/go/src/transformers/sec2gmtdate.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/seqgen.go b/go/src/transformers/seqgen.go index 4eb141f9e..0472446c1 100644 --- a/go/src/transformers/seqgen.go +++ b/go/src/transformers/seqgen.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/shuffle.go b/go/src/transformers/shuffle.go index 5c0b3067e..374162c09 100644 --- a/go/src/transformers/shuffle.go +++ b/go/src/transformers/shuffle.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" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/skip-trivial-records.go b/go/src/transformers/skip-trivial-records.go index b603434e8..946d27902 100644 --- a/go/src/transformers/skip-trivial-records.go +++ b/go/src/transformers/skip-trivial-records.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/sort-within-records.go b/go/src/transformers/sort-within-records.go index 953f46918..1f58be5a0 100644 --- a/go/src/transformers/sort-within-records.go +++ b/go/src/transformers/sort-within-records.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/sort.go b/go/src/transformers/sort.go index 3deb15362..bc116bbe2 100644 --- a/go/src/transformers/sort.go +++ b/go/src/transformers/sort.go @@ -48,9 +48,9 @@ import ( "sort" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/stats1.go b/go/src/transformers/stats1.go index f02528ab7..2a9b1c0da 100644 --- a/go/src/transformers/stats1.go +++ b/go/src/transformers/stats1.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/transformers/utils" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/transformers/utils" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/stats2.go b/go/src/transformers/stats2.go index 6a46921f9..767e23b47 100644 --- a/go/src/transformers/stats2.go +++ b/go/src/transformers/stats2.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/transformers/utils" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/transformers/utils" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/step.go b/go/src/transformers/step.go index 82a882f21..2ac1a1d67 100644 --- a/go/src/transformers/step.go +++ b/go/src/transformers/step.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" ) const DEFAULT_STRING_ALPHA = "0.5" diff --git a/go/src/transformers/tac.go b/go/src/transformers/tac.go index ea035a13c..5c2d54c30 100644 --- a/go/src/transformers/tac.go +++ b/go/src/transformers/tac.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/tail.go b/go/src/transformers/tail.go index d31f0f7c4..064cc2f5c 100644 --- a/go/src/transformers/tail.go +++ b/go/src/transformers/tail.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" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/tee.go b/go/src/transformers/tee.go index 37faee096..aa9e68285 100644 --- a/go/src/transformers/tee.go +++ b/go/src/transformers/tee.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/output" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/output" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/template.go b/go/src/transformers/template.go index 5c4244fc0..c346f0c6f 100644 --- a/go/src/transformers/template.go +++ b/go/src/transformers/template.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/top.go b/go/src/transformers/top.go index 5289b3d7c..5d3fe6270 100644 --- a/go/src/transformers/top.go +++ b/go/src/transformers/top.go @@ -5,10 +5,10 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/transformers/utils" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/transformers/utils" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/unflatten.go b/go/src/transformers/unflatten.go index 272df282d..c293cdb8b 100644 --- a/go/src/transformers/unflatten.go +++ b/go/src/transformers/unflatten.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/uniq.go b/go/src/transformers/uniq.go index 782481430..d2dc706e7 100644 --- a/go/src/transformers/uniq.go +++ b/go/src/transformers/uniq.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/unsparsify.go b/go/src/transformers/unsparsify.go index 08c006c5e..7128c1927 100644 --- a/go/src/transformers/unsparsify.go +++ b/go/src/transformers/unsparsify.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" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/utils/join-bucket-keeper.go b/go/src/transformers/utils/join-bucket-keeper.go index bb4b9f808..3b65f007b 100644 --- a/go/src/transformers/utils/join-bucket-keeper.go +++ b/go/src/transformers/utils/join-bucket-keeper.go @@ -113,10 +113,10 @@ import ( "os" "strings" - "miller/src/cliutil" - "miller/src/input" - "miller/src/lib" - "miller/src/types" + "mlr/src/cliutil" + "mlr/src/input" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/utils/join-bucket.go b/go/src/transformers/utils/join-bucket.go index 0ba24bec3..0743307cb 100644 --- a/go/src/transformers/utils/join-bucket.go +++ b/go/src/transformers/utils/join-bucket.go @@ -7,7 +7,7 @@ package utils import ( "container/list" - "miller/src/types" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/utils/percentile-keeper.go b/go/src/transformers/utils/percentile-keeper.go index 5883a51aa..87fca3b61 100644 --- a/go/src/transformers/utils/percentile-keeper.go +++ b/go/src/transformers/utils/percentile-keeper.go @@ -9,7 +9,7 @@ import ( "math" "sort" - "miller/src/types" + "mlr/src/types" ) type PercentileKeeper struct { diff --git a/go/src/transformers/utils/stats1-accumulators.go b/go/src/transformers/utils/stats1-accumulators.go index ee7a4924e..082be770c 100644 --- a/go/src/transformers/utils/stats1-accumulators.go +++ b/go/src/transformers/utils/stats1-accumulators.go @@ -9,8 +9,8 @@ import ( "os" "strings" - "miller/src/lib" - "miller/src/types" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/utils/stats2-accumulators.go b/go/src/transformers/utils/stats2-accumulators.go index b0adce74c..30edacd90 100644 --- a/go/src/transformers/utils/stats2-accumulators.go +++ b/go/src/transformers/utils/stats2-accumulators.go @@ -9,8 +9,8 @@ import ( "math" "os" - "miller/src/lib" - "miller/src/types" + "mlr/src/lib" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/transformers/utils/top-keeper.go b/go/src/transformers/utils/top-keeper.go index 378340d63..db4df40cc 100644 --- a/go/src/transformers/utils/top-keeper.go +++ b/go/src/transformers/utils/top-keeper.go @@ -5,7 +5,7 @@ package utils import ( - "miller/src/types" + "mlr/src/types" ) // ---------------------------------------------------------------- diff --git a/go/src/types/context.go b/go/src/types/context.go index d3dbe442d..1fdc993d9 100644 --- a/go/src/types/context.go +++ b/go/src/types/context.go @@ -4,7 +4,7 @@ import ( "bytes" "strconv" - "miller/src/cliutil" + "mlr/src/cliutil" ) // Since Go is concurrent, the context struct (AWK-like variables such as diff --git a/go/src/types/mlrmap_accessors.go b/go/src/types/mlrmap_accessors.go index 6a310a009..f107c6134 100644 --- a/go/src/types/mlrmap_accessors.go +++ b/go/src/types/mlrmap_accessors.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" - "miller/src/lib" + "mlr/src/lib" ) // ---------------------------------------------------------------- diff --git a/go/src/types/mlrmap_flatten_unflatten.go b/go/src/types/mlrmap_flatten_unflatten.go index 0d6c3db2e..8e3a85f27 100644 --- a/go/src/types/mlrmap_flatten_unflatten.go +++ b/go/src/types/mlrmap_flatten_unflatten.go @@ -25,7 +25,7 @@ package types import ( "strings" - "miller/src/lib" + "mlr/src/lib" ) // ---------------------------------------------------------------- diff --git a/go/src/types/mlrmap_json.go b/go/src/types/mlrmap_json.go index 3d7f1518b..de8c53829 100644 --- a/go/src/types/mlrmap_json.go +++ b/go/src/types/mlrmap_json.go @@ -7,8 +7,8 @@ package types import ( "bytes" - "miller/src/colorizer" - "miller/src/lib" + "mlr/src/colorizer" + "mlr/src/lib" ) // ---------------------------------------------------------------- diff --git a/go/src/types/mlrval_accessors.go b/go/src/types/mlrval_accessors.go index fdc744631..4ff4812c7 100644 --- a/go/src/types/mlrval_accessors.go +++ b/go/src/types/mlrval_accessors.go @@ -5,7 +5,7 @@ import ( "os" "strconv" - "miller/src/lib" + "mlr/src/lib" ) // ---------------------------------------------------------------- diff --git a/go/src/types/mlrval_collections.go b/go/src/types/mlrval_collections.go index a886756ce..961b77a15 100644 --- a/go/src/types/mlrval_collections.go +++ b/go/src/types/mlrval_collections.go @@ -73,7 +73,7 @@ import ( "fmt" "os" - "miller/src/lib" + "mlr/src/lib" ) // ================================================================ diff --git a/go/src/types/mlrval_format_test.go b/go/src/types/mlrval_format_test.go index 885bfa8e5..549840046 100644 --- a/go/src/types/mlrval_format_test.go +++ b/go/src/types/mlrval_format_test.go @@ -8,7 +8,7 @@ // * go test // Or: // * cd go -// * go test miller/src/types/... +// * go test mlr/src/types/... package types diff --git a/go/src/types/mlrval_functions_booleans.go b/go/src/types/mlrval_functions_booleans.go index 2381ddd30..25a755bb9 100644 --- a/go/src/types/mlrval_functions_booleans.go +++ b/go/src/types/mlrval_functions_booleans.go @@ -5,7 +5,7 @@ package types import ( - "miller/src/lib" + "mlr/src/lib" ) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/go/src/types/mlrval_functions_collections.go b/go/src/types/mlrval_functions_collections.go index adb6f7356..939ee1284 100644 --- a/go/src/types/mlrval_functions_collections.go +++ b/go/src/types/mlrval_functions_collections.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "miller/src/lib" + "mlr/src/lib" ) // ================================================================ diff --git a/go/src/types/mlrval_functions_mathlib.go b/go/src/types/mlrval_functions_mathlib.go index aa068fb8d..87b4ba0fe 100644 --- a/go/src/types/mlrval_functions_mathlib.go +++ b/go/src/types/mlrval_functions_mathlib.go @@ -7,7 +7,7 @@ package types import ( "math" - "miller/src/lib" + "mlr/src/lib" ) // ---------------------------------------------------------------- diff --git a/go/src/types/mlrval_functions_random.go b/go/src/types/mlrval_functions_random.go index 00a7d6cb7..47cc3ce64 100644 --- a/go/src/types/mlrval_functions_random.go +++ b/go/src/types/mlrval_functions_random.go @@ -3,7 +3,7 @@ package types import ( "math" - "miller/src/lib" + "mlr/src/lib" ) func MlrvalUrand() *Mlrval { diff --git a/go/src/types/mlrval_functions_regex.go b/go/src/types/mlrval_functions_regex.go index 48b34dc32..d056b6b2f 100644 --- a/go/src/types/mlrval_functions_regex.go +++ b/go/src/types/mlrval_functions_regex.go @@ -3,7 +3,7 @@ package types import ( "strings" - "miller/src/lib" + "mlr/src/lib" ) // ================================================================ diff --git a/go/src/types/mlrval_functions_stats.go b/go/src/types/mlrval_functions_stats.go index c6ca0f75d..442c211d7 100644 --- a/go/src/types/mlrval_functions_stats.go +++ b/go/src/types/mlrval_functions_stats.go @@ -3,7 +3,7 @@ package types import ( "math" - "miller/src/lib" + "mlr/src/lib" ) // ---------------------------------------------------------------- diff --git a/go/src/types/mlrval_functions_strings.go b/go/src/types/mlrval_functions_strings.go index fce0708cc..e23ab6359 100644 --- a/go/src/types/mlrval_functions_strings.go +++ b/go/src/types/mlrval_functions_strings.go @@ -6,7 +6,7 @@ import ( "strings" "unicode/utf8" - "miller/src/lib" + "mlr/src/lib" ) // ================================================================ diff --git a/go/src/types/mlrval_functions_system.go b/go/src/types/mlrval_functions_system.go index 568f37ade..3c2b54cbe 100644 --- a/go/src/types/mlrval_functions_system.go +++ b/go/src/types/mlrval_functions_system.go @@ -6,8 +6,8 @@ import ( "runtime" "strings" - "miller/src/platform" - "miller/src/version" + "mlr/src/platform" + "mlr/src/version" ) func MlrvalVersion() *Mlrval { diff --git a/go/src/types/mlrval_functions_time.go b/go/src/types/mlrval_functions_time.go index 788bc9648..d811ee2d3 100644 --- a/go/src/types/mlrval_functions_time.go +++ b/go/src/types/mlrval_functions_time.go @@ -10,7 +10,7 @@ import ( "github.com/lestrrat-go/strftime" "github.com/pbnjay/strptime" - "miller/src/lib" + "mlr/src/lib" ) const ISO8601_TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ" diff --git a/go/src/types/mlrval_functions_types.go b/go/src/types/mlrval_functions_types.go index 694139816..2f0b01db4 100644 --- a/go/src/types/mlrval_functions_types.go +++ b/go/src/types/mlrval_functions_types.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "miller/src/lib" + "mlr/src/lib" ) // ================================================================ diff --git a/go/src/types/mlrval_json.go b/go/src/types/mlrval_json.go index 1360c5203..fcce6627f 100644 --- a/go/src/types/mlrval_json.go +++ b/go/src/types/mlrval_json.go @@ -14,8 +14,8 @@ import ( "errors" "io" - "miller/src/colorizer" - "miller/src/lib" + "mlr/src/colorizer" + "mlr/src/lib" ) const MLRVAL_JSON_INDENT_STRING string = " " diff --git a/go/src/types/mlrval_new.go b/go/src/types/mlrval_new.go index c757bd42c..68c70c3d7 100644 --- a/go/src/types/mlrval_new.go +++ b/go/src/types/mlrval_new.go @@ -7,7 +7,7 @@ package types import ( "errors" - "miller/src/lib" + "mlr/src/lib" ) // ---------------------------------------------------------------- diff --git a/go/u/gg b/go/u/gg index f01507595..712aa37ef 100755 --- a/go/u/gg +++ b/go/u/gg @@ -3,7 +3,7 @@ path_to_mlr="./mlr" indir="./regtest/input" -#go build mlr.go +#go build if [ $? -ne 0 ]; then exit 1 fi