From bc72cd1857c4fbee6b89d3595d621013fe20fd0e Mon Sep 17 00:00:00 2001 From: John Kerl Date: Fri, 12 Nov 2021 12:49:55 -0500 Subject: [PATCH] More Go-package restructuring (#748) --- .gitignore | 29 +-- .vimrc | 1 + Makefile | 30 ++- README-go-port.md | 57 +++-- mlr.go => cmd/mlr/main.go | 7 +- docs/src/build.md | 6 +- docs/src/build.md.in | 6 +- {go => experiments}/gc-raw-notes.txt | 0 go.mod | 15 +- go/.gitignore | 8 - go/.vimrc | 3 - internal/pkg/auxents/auxents.go | 6 +- internal/pkg/auxents/help/entry.go | 12 +- internal/pkg/auxents/regtest/entry.go | 4 +- internal/pkg/auxents/regtest/invoker.go | 4 +- internal/pkg/auxents/regtest/regtester.go | 16 +- internal/pkg/auxents/repl/dsl.go | 6 +- internal/pkg/auxents/repl/entry.go | 2 +- internal/pkg/auxents/repl/prompt.go | 6 +- internal/pkg/auxents/repl/session.go | 14 +- internal/pkg/auxents/repl/types.go | 12 +- internal/pkg/auxents/repl/verbs.go | 10 +- internal/pkg/cli/flag_types.go | 4 +- internal/pkg/cli/option_parse.go | 6 +- internal/pkg/cli/option_types.go | 2 +- internal/pkg/cli/verb_utils.go | 2 +- internal/pkg/climain/mlrcli_mlrrc.go | 2 +- internal/pkg/climain/mlrcli_parse.go | 12 +- internal/pkg/dsl/ast_build.go | 4 +- internal/pkg/dsl/ast_types.go | 2 +- internal/pkg/dsl/cst/assignments.go | 6 +- internal/pkg/dsl/cst/block-exit.go | 6 +- internal/pkg/dsl/cst/blocks.go | 6 +- .../pkg/dsl/cst/builtin_function_manager.go | 6 +- internal/pkg/dsl/cst/builtin_functions.go | 8 +- internal/pkg/dsl/cst/collections.go | 8 +- internal/pkg/dsl/cst/cond.go | 8 +- internal/pkg/dsl/cst/dump.go | 10 +- internal/pkg/dsl/cst/emit1.go | 8 +- internal/pkg/dsl/cst/emit_emitp.go | 12 +- internal/pkg/dsl/cst/emitf.go | 10 +- internal/pkg/dsl/cst/env.go | 8 +- internal/pkg/dsl/cst/evaluable.go | 8 +- internal/pkg/dsl/cst/filter.go | 6 +- internal/pkg/dsl/cst/for.go | 8 +- internal/pkg/dsl/cst/functions.go | 4 +- internal/pkg/dsl/cst/hofs.go | 8 +- internal/pkg/dsl/cst/if.go | 8 +- internal/pkg/dsl/cst/keyword_usage.go | 4 +- internal/pkg/dsl/cst/leaves.go | 8 +- internal/pkg/dsl/cst/lvalues.go | 8 +- internal/pkg/dsl/cst/print.go | 10 +- internal/pkg/dsl/cst/root.go | 14 +- internal/pkg/dsl/cst/signature.go | 2 +- internal/pkg/dsl/cst/statements.go | 2 +- internal/pkg/dsl/cst/subroutines.go | 4 +- internal/pkg/dsl/cst/tee.go | 10 +- internal/pkg/dsl/cst/types.go | 8 +- internal/pkg/dsl/cst/udf.go | 8 +- internal/pkg/dsl/cst/uds.go | 8 +- internal/pkg/dsl/cst/validate.go | 4 +- internal/pkg/dsl/cst/warn.go | 4 +- internal/pkg/dsl/cst/while.go | 6 +- internal/pkg/entrypoint/entrypoint.go | 14 +- internal/pkg/input/pseudo_reader_gen.go | 4 +- internal/pkg/input/record_reader.go | 2 +- internal/pkg/input/record_reader_csv.go | 6 +- internal/pkg/input/record_reader_csvlite.go | 6 +- internal/pkg/input/record_reader_dkvp.go | 6 +- internal/pkg/input/record_reader_factory.go | 2 +- internal/pkg/input/record_reader_json.go | 6 +- internal/pkg/input/record_reader_nidx.go | 6 +- internal/pkg/input/record_reader_xtab.go | 6 +- internal/pkg/lib/halfpipe.go | 2 +- internal/pkg/output/channel_writer.go | 2 +- internal/pkg/output/file-output-handlers.go | 6 +- internal/pkg/output/record_writer.go | 2 +- internal/pkg/output/record_writer_csv.go | 6 +- internal/pkg/output/record_writer_csvlite.go | 6 +- internal/pkg/output/record_writer_dkvp.go | 6 +- internal/pkg/output/record_writer_factory.go | 2 +- internal/pkg/output/record_writer_json.go | 4 +- internal/pkg/output/record_writer_markdown.go | 6 +- internal/pkg/output/record_writer_nidx.go | 4 +- internal/pkg/output/record_writer_pprint.go | 6 +- internal/pkg/output/record_writer_xtab.go | 6 +- internal/pkg/parsing/errors.go.template | 7 +- internal/pkg/parsing/errors/errors.go | 7 +- internal/pkg/parsing/lexer/acttab.go | 2 +- internal/pkg/parsing/lexer/lexer.go | 2 +- internal/pkg/parsing/mlr.bnf | 4 +- internal/pkg/parsing/parser/parser.go | 4 +- .../pkg/parsing/parser/productionstable.go | 2 +- internal/pkg/runtime/stack.go | 4 +- internal/pkg/runtime/state.go | 4 +- internal/pkg/stream/stream.go | 10 +- .../pkg/transformers/aaa_chain_transformer.go | 4 +- .../transformers/aaa_record_transformer.go | 4 +- .../pkg/transformers/aaa_transformer_table.go | 4 +- internal/pkg/transformers/altkv.go | 4 +- internal/pkg/transformers/bar.go | 4 +- internal/pkg/transformers/bootstrap.go | 6 +- internal/pkg/transformers/cat.go | 4 +- internal/pkg/transformers/check.go | 4 +- internal/pkg/transformers/clean-whitespace.go | 4 +- internal/pkg/transformers/count-similar.go | 6 +- internal/pkg/transformers/count.go | 6 +- internal/pkg/transformers/cut.go | 6 +- internal/pkg/transformers/decimate.go | 4 +- internal/pkg/transformers/fill-down.go | 4 +- internal/pkg/transformers/fill-empty.go | 4 +- internal/pkg/transformers/flatten.go | 6 +- internal/pkg/transformers/format-values.go | 4 +- internal/pkg/transformers/fraction.go | 6 +- internal/pkg/transformers/gap.go | 4 +- internal/pkg/transformers/grep.go | 4 +- internal/pkg/transformers/group-by.go | 6 +- internal/pkg/transformers/group-like.go | 6 +- internal/pkg/transformers/having-fields.go | 6 +- internal/pkg/transformers/head.go | 4 +- internal/pkg/transformers/histogram.go | 6 +- internal/pkg/transformers/join.go | 10 +- internal/pkg/transformers/json-parse.go | 6 +- internal/pkg/transformers/json-stringify.go | 6 +- internal/pkg/transformers/label.go | 6 +- internal/pkg/transformers/merge-fields.go | 8 +- .../transformers/most-or-least-frequent.go | 6 +- internal/pkg/transformers/nest.go | 6 +- internal/pkg/transformers/nothing.go | 4 +- internal/pkg/transformers/put-or-filter.go | 16 +- internal/pkg/transformers/regularize.go | 6 +- .../pkg/transformers/remove-empty-columns.go | 4 +- internal/pkg/transformers/rename.go | 6 +- internal/pkg/transformers/reorder.go | 6 +- internal/pkg/transformers/repeat.go | 4 +- internal/pkg/transformers/reshape.go | 6 +- internal/pkg/transformers/sample.go | 6 +- internal/pkg/transformers/sec2gmt.go | 6 +- internal/pkg/transformers/sec2gmtdate.go | 6 +- internal/pkg/transformers/seqgen.go | 4 +- internal/pkg/transformers/shuffle.go | 6 +- .../pkg/transformers/skip-trivial-records.go | 4 +- .../pkg/transformers/sort-within-records.go | 4 +- internal/pkg/transformers/sort.go | 6 +- internal/pkg/transformers/stats1.go | 8 +- internal/pkg/transformers/stats2.go | 8 +- internal/pkg/transformers/step.go | 6 +- internal/pkg/transformers/tac.go | 4 +- internal/pkg/transformers/tail.go | 6 +- internal/pkg/transformers/tee.go | 6 +- internal/pkg/transformers/template.go | 6 +- internal/pkg/transformers/top.go | 8 +- internal/pkg/transformers/unflatten.go | 6 +- internal/pkg/transformers/uniq.go | 6 +- internal/pkg/transformers/unsparsify.go | 6 +- .../transformers/utils/join-bucket-keeper.go | 8 +- .../pkg/transformers/utils/join-bucket.go | 2 +- .../transformers/utils/percentile-keeper.go | 2 +- .../transformers/utils/stats1-accumulators.go | 4 +- .../transformers/utils/stats2-accumulators.go | 4 +- internal/pkg/transformers/utils/top-keeper.go | 2 +- internal/pkg/types/mlrmap_accessors.go | 2 +- .../pkg/types/mlrmap_flatten_unflatten.go | 2 +- internal/pkg/types/mlrmap_json.go | 4 +- internal/pkg/types/mlrval.go | 2 +- internal/pkg/types/mlrval_accessors.go | 2 +- internal/pkg/types/mlrval_collections.go | 2 +- internal/pkg/types/mlrval_format_test.go | 2 +- .../pkg/types/mlrval_functions_booleans.go | 2 +- .../pkg/types/mlrval_functions_collections.go | 2 +- .../pkg/types/mlrval_functions_datetime.go | 4 +- .../pkg/types/mlrval_functions_mathlib.go | 2 +- internal/pkg/types/mlrval_functions_random.go | 2 +- internal/pkg/types/mlrval_functions_regex.go | 2 +- internal/pkg/types/mlrval_functions_stats.go | 2 +- .../pkg/types/mlrval_functions_strings.go | 2 +- internal/pkg/types/mlrval_functions_system.go | 4 +- internal/pkg/types/mlrval_functions_types.go | 2 +- internal/pkg/types/mlrval_infer.go | 2 +- internal/pkg/types/mlrval_json.go | 4 +- internal/pkg/types/mlrval_new.go | 4 +- man/Makefile | 2 + regression_test.go | 12 +- scripts/mcountlines | 8 +- todo.txt | 213 +----------------- tools/build-dsl | 3 +- vim/syntax/mlr.vim | 3 +- 187 files changed, 551 insertions(+), 782 deletions(-) create mode 100644 .vimrc rename mlr.go => cmd/mlr/main.go (91%) rename {go => experiments}/gc-raw-notes.txt (100%) delete mode 100644 go/.gitignore delete mode 100644 go/.vimrc diff --git a/.gitignore b/.gitignore index e811a1837..77834081a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,41 +1,14 @@ -go/mlr -go/mlr.exe -mlr -mlr.exe -a.out -*.dSYM -catc -catc0 -catm -gmon.out -*.o -*.pyc .sw? .*.sw? tags *~ -mlr-[0-9.]*.tar.* push2 data/.gitignore -docs/_build -docs6/_build - man/man1 -miller-*.src.rpm -mlr.exe -mlr.linux.x86_64 -mlr.macosx - data/big.* data/nmc?.* -experiments/dsl-parser/one/src -experiments/dsl-parser/one/main -experiments/dsl-parser/two/src -experiments/dsl-parser/two/main -experiments/cli-parser/cliparse -experiments/cli-parser/cliparse.exe - +docs/src/polyglot-dkvp-io/__pycache__ docs/site/ diff --git a/.vimrc b/.vimrc new file mode 100644 index 000000000..3bb1e3df8 --- /dev/null +++ b/.vimrc @@ -0,0 +1 @@ +map \d :w:!clear;echo Building ...; echo; make build diff --git a/Makefile b/Makefile index 170282190..b374ffbe5 100644 --- a/Makefile +++ b/Makefile @@ -2,19 +2,25 @@ PREFIX=/usr/local INSTALLDIR=$(PREFIX)/bin build: - go build + go build github.com/johnkerl/miller/cmd/mlr -check: - # Unit tests (small number) - go test -v mlr/internal/pkg/... - # Regression tests (large number) - # - # See ./regression_test.go for information on how to get more details - # for debugging. TL;DR is for CI jobs, we have 'go test -v'; for - # interactive use, instead of 'go test -v' simply use 'mlr regtest - # -vvv' or 'mlr regtest -s 20'. See also src/auxents/regtest. - go test -v +check: unit_test regression_test +# Unit tests (small number) +unit_test: + go test github.com/johnkerl/miller/internal/pkg/... + +# Regression tests (large number) +# +# See ./regression_test.go for information on how to get more details +# for debugging. TL;DR is for CI jobs, we have 'go test -v'; for +# interactive use, instead of 'go test -v' simply use 'mlr regtest +# -vvv' or 'mlr regtest -s 20'. See also internal/pkg/auxents/regtest. +regression_test: + go test -v regression_test.go + +# DESTDIR is for package installs; nominally blank when this is run interactively. +# See also https://www.gnu.org/prep/standards/html_node/DESTDIR.html install: build cp mlr $(DESTDIR)/$(INSTALLDIR) make -C man install @@ -51,4 +57,4 @@ release_tarball: build check ./create-release-tarball # Go does its own dependency management, outside of make. -.PHONY: build check fmt dev +.PHONY: build check unit_test regression_test fmt dev diff --git a/README-go-port.md b/README-go-port.md index fb8df8c85..d10e6cae8 100644 --- a/README-go-port.md +++ b/README-go-port.md @@ -1,9 +1,6 @@ # Quickstart for developers -* `go build` -- produces the `mlr` executable -* Miller has tens of unit tests and thousands of regression tests: - * `go test mlr/src/...` runs the unit tests. - * `go test` or `mlr regtest` runs the regression tests in `test/cases/`. Using `mlr regtest -h` you can see more options available than are exposed by `go test`. +See `makefile` in the repo base directory. # Continuous integration @@ -57,10 +54,10 @@ During the coding of Miller, I've been guided by the following: * Names of files, variables, functions, etc. should be fully spelled out (e.g. `NewEvaluableLeafNode`), except for a small number of most-used names where a longer name would cause unnecessary line-wraps (e.g. `Mlrval` instead of `MillerValue` since this appears very very often). * Code should not be too clever. This includes some reasonable amounts of code duplication from time to time, to keep things inline, rather than lasagna code. * Things should be transparent. For example, `mlr -n put -v '$y = 3 + 0.1 * $x'` shows you the abstract syntax tree derived from the DSL expression. - * Comments should be robust with respect to reasonably anticipated changes. For example, one package should cross-link to another in its comments, but I try to avoid mentioning specific filenames too much in the comments and README files since these may change over time. I make an exception for stable points such as [mlr.go](./mlr.go), [mlr.bnf](./src/parsing/mlr.bnf), [stream.go](./src/stream/stream.go), etc. + * Comments should be robust with respect to reasonably anticipated changes. For example, one package should cross-link to another in its comments, but I try to avoid mentioning specific filenames too much in the comments and README files since these may change over time. I make an exception for stable points such as [mlr.go](./mlr.go), [mlr.bnf](./internal/pkg/parsing/mlr.bnf), [stream.go](./internal/pkg/stream/stream.go), etc. * *Miller should be pleasant to write.* * It should be quick to answer the question *Did I just break anything?* -- hence the `build` and `reg_test/run` regression scripts. - * It should be quick to find out what to do next as you iteratively develop -- see for example [cst/README.md](https://github.com/johnkerl/miller/blob/master/go/src/dsl/cst/README.md). + * It should be quick to find out what to do next as you iteratively develop -- see for example [cst/README.md](./internal/pkg/dsl/cst/README.md). * *The language should be an asset, not a liability.* * One of the reasons I chose Go is that (personally anyway) I find it to be reasonably efficient, well-supported with standard libraries, straightforward, and fun. I hope you enjoy it as much as I have. @@ -79,10 +76,10 @@ sequence of key-value pairs. The basic **stream** operation is: So, in broad overview, the key packages are: -* [src/stream](./src/stream) -- connect input -> transforms -> output via Go channels -* [src/input](./src/input) -- read input records -* [src/transforming](./src/transforming) -- transform input records to output records -* [src/output](./src/output) -- write output records +* [internal/pkg/stream](./internal/pkg/stream) -- connect input -> transforms -> output via Go channels +* [internal/pkg/input](./internal/pkg/input) -- read input records +* [internal/pkg/transforming](./internal/pkg/transforming) -- transform input records to output records +* [internal/pkg/output](./internal/pkg/output) -- write output records * The rest are details to support this. ## Directory-structure details @@ -94,7 +91,7 @@ So, in broad overview, the key packages are: * This package defines the grammar for Miller's domain-specific language (DSL) for the Miller `put` and `filter` verbs. And, GOCC is a joy to use. :) * It is used on the terms of its open-source license. * [golang.org/x/term](https://pkg.go.dev/golang.org/x/term): - * Just a one-line Miller callsite for is-a-terminal checking for the [Miller REPL](https://github.com/johnkerl/miller/blob/go-mod/go/src/auxents/repl/README.md). + * Just a one-line Miller callsite for is-a-terminal checking for the [Miller REPL](./internal/pkg/auxents/repl/README.md). * It is used on the terms of its open-source license. * See also [./go.mod](go.mod). Setup: * `go get github.com/goccmack/gocc` @@ -102,23 +99,23 @@ So, in broad overview, the key packages are: ### Miller per se -* The main entry point is [mlr.go](./mlr.go); everything else in [src](./src). -* [src/entrypoint](./src/entrypoint): All the usual contents of `main()` are here, for ease of testing. -* [src/platform](./src/platform): Platform-dependent code, which as of early 2021 is the command-line parser. Handling single quotes and double quotes is different on Windows unless particular care is taken, which is what this package does. -* [src/lib](./src/lib): - * Implementation of the [`Mlrval`](./src/types/mlrval.go) datatype which includes string/int/float/boolean/void/absent/error types. These are used for record values, as well as expression/variable values in the Miller `put`/`filter` DSL. See also below for more details. - * [`Mlrmap`](./src/types/mlrmap.go) is the sequence of key-value pairs which represents a Miller record. The key-lookup mechanism is optimized for Miller read/write usage patterns -- please see [mlrmap.go](./src/types/mlrmap.go) for more details. - * [`context`](./src/types/context.go) supports AWK-like variables such as `FILENAME`, `NF`, `NR`, and so on. -* [src/cli](./src/cli) is the flag-parsing logic for supporting Miller's command-line interface. When you type something like `mlr --icsv --ojson put '$sum = $a + $b' then filter '$sum > 1000' myfile.csv`, it's the CLI parser which makes it possible for Miller to construct a CSV record-reader, a transformer-chain of `put` then `filter`, and a JSON record-writer. -* [src/cliutil](./src/cliutil) contains datatypes for the CLI-parser, which was split out to avoid a Go package-import cycle. -* [src/stream](./src/stream) is as above -- it uses Go channels to pipe together file-reads, to record-reading/parsing, to a chain of record-transformers, to record-writing/formatting, to terminal standard output. -* [src/input](./src/input) is as above -- one record-reader type per supported input file format, and a factory method. -* [src/output](./src/output) is as above -- one record-writer type per supported output file format, and a factory method. -* [src/transforming](./src/transforming) contains the abstract record-transformer interface datatype, as well as the Go-channel chaining mechanism for piping one transformer into the next. -* [src/transformers](./src/transformers) is all the concrete record-transformers such as `cat`, `tac`, `sort`, `put`, and so on. I put it here, not in `transforming`, so all files in `transformers` would be of the same type. -* [src/parsing](./src/parsing) contains a single source file, `mlr.bnf`, which is the lexical/semantic grammar file for the Miller `put`/`filter` DSL using the GOCC framework. All subdirectories of `src/parsing/` are autogen code created by GOCC's processing of `mlr.bnf`. If you need to edit `mlr.bnf`, please use [tools/build-dsl](./tools/build-dsl) to autogenerate Go code from it (using the GOCC tool). (This takes several minutes to run.) -* [src/dsl](./src/dsl) contains [`ast_types.go`](src/dsl/ast_types.go) which is the abstract syntax tree datatype shared between GOCC and Miller. I didn't use a `src/dsl/ast` naming convention, although that would have been nice, in order to avoid a Go package-dependency cycle. -* [src/dsl/cst](./src/dsl/cst) is the concrete syntax tree, constructed from an AST produced by GOCC. The CST is what is actually executed on every input record when you do things like `$z = $x * 0.3 * $y`. Please see the [src/dsl/cst/README.md](./src/dsl/cst/README.md) for more information. +* The main entry point is [mlr.go](./mlr.go); everything else in [internal/pkg](./internal/pkg). +* [internal/pkg/entrypoint](./internal/pkg/entrypoint): All the usual contents of `main()` are here, for ease of testing. +* [internal/pkg/platform](./internal/pkg/platform): Platform-dependent code, which as of early 2021 is the command-line parser. Handling single quotes and double quotes is different on Windows unless particular care is taken, which is what this package does. +* [internal/pkg/lib](./internal/pkg/lib): + * Implementation of the [`Mlrval`](./internal/pkg/types/mlrval.go) datatype which includes string/int/float/boolean/void/absent/error types. These are used for record values, as well as expression/variable values in the Miller `put`/`filter` DSL. See also below for more details. + * [`Mlrmap`](./internal/pkg/types/mlrmap.go) is the sequence of key-value pairs which represents a Miller record. The key-lookup mechanism is optimized for Miller read/write usage patterns -- please see [mlrmap.go](./internal/pkg/types/mlrmap.go) for more details. + * [`context`](./internal/pkg/types/context.go) supports AWK-like variables such as `FILENAME`, `NF`, `NR`, and so on. +* [internal/pkg/cli](./internal/pkg/cli) is the flag-parsing logic for supporting Miller's command-line interface. When you type something like `mlr --icsv --ojson put '$sum = $a + $b' then filter '$sum > 1000' myfile.csv`, it's the CLI parser which makes it possible for Miller to construct a CSV record-reader, a transformer-chain of `put` then `filter`, and a JSON record-writer. +* [internal/pkg/cliutil](./internal/pkg/cliutil) contains datatypes for the CLI-parser, which was split out to avoid a Go package-import cycle. +* [internal/pkg/stream](./internal/pkg/stream) is as above -- it uses Go channels to pipe together file-reads, to record-reading/parsing, to a chain of record-transformers, to record-writing/formatting, to terminal standard output. +* [internal/pkg/input](./internal/pkg/input) is as above -- one record-reader type per supported input file format, and a factory method. +* [internal/pkg/output](./internal/pkg/output) is as above -- one record-writer type per supported output file format, and a factory method. +* [internal/pkg/transforming](./internal/pkg/transforming) contains the abstract record-transformer interface datatype, as well as the Go-channel chaining mechanism for piping one transformer into the next. +* [internal/pkg/transformers](./internal/pkg/transformers) is all the concrete record-transformers such as `cat`, `tac`, `sort`, `put`, and so on. I put it here, not in `transforming`, so all files in `transformers` would be of the same type. +* [internal/pkg/parsing](./internal/pkg/parsing) contains a single source file, `mlr.bnf`, which is the lexical/semantic grammar file for the Miller `put`/`filter` DSL using the GOCC framework. All subdirectories of `internal/pkg/parsing/` are autogen code created by GOCC's processing of `mlr.bnf`. If you need to edit `mlr.bnf`, please use [tools/build-dsl](./tools/build-dsl) to autogenerate Go code from it (using the GOCC tool). (This takes several minutes to run.) +* [internal/pkg/dsl](./internal/pkg/dsl) contains [`ast_types.go`](internal/pkg/dsl/ast_types.go) which is the abstract syntax tree datatype shared between GOCC and Miller. I didn't use a `internal/pkg/dsl/ast` naming convention, although that would have been nice, in order to avoid a Go package-dependency cycle. +* [internal/pkg/dsl/cst](./internal/pkg/dsl/cst) is the concrete syntax tree, constructed from an AST produced by GOCC. The CST is what is actually executed on every input record when you do things like `$z = $x * 0.3 * $y`. Please see the [internal/pkg/dsl/cst/README.md](./internal/pkg/dsl/cst/README.md) for more information. ## Nil-record conventions @@ -150,7 +147,7 @@ nil through the reader/transformer/writer sequence. ## More about mlrvals -[`Mlrval`](./src/types/mlrval.go) is the datatype of record values, as well as expression/variable values in the Miller `put`/`filter` DSL. It includes string/int/float/boolean/void/absent/error types, not unlike PHP's `zval`. +[`Mlrval`](./internal/pkg/types/mlrval.go) is the datatype of record values, as well as expression/variable values in the Miller `put`/`filter` DSL. It includes string/int/float/boolean/void/absent/error types, not unlike PHP's `zval`. * Miller's `absent` type is like Javascript's `undefined` -- it's for times when there is no such key, as in a DSL expression `$out = $foo` when the input record is `$x=3,y=4` -- there is no `$foo` so `$foo` has `absent` type. Nothing is written to the `$out` field in this case. See also [here](http://johnkerl.org/miller/doc/reference.html#Null_data:_empty_and_absent) for more information. * Miller's `void` type is like Javascript's `null` -- it's for times when there is a key with no value, as in `$out = $x` when the input record is `$x=,$y=4`. This is an overlap with `string` type, since a void value looks like an empty string. I've gone back and forth on this (including when I was writing the C implementation) -- whether to retain `void` as a distinct type from empty-string, or not. I ended up keeping it as it made the `Mlrval` logic easier to understand. @@ -158,7 +155,7 @@ nil through the reader/transformer/writer sequence. * Miller's number handling makes auto-overflow from int to float transparent, while preserving the possibility of 64-bit bitwise arithmetic. * This is different from JavaScript, which has only double-precision floats and thus no support for 64-bit numbers (note however that there is now [`BigInt`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/BigInt)). * This is also different from C and Go, wherein casts are necessary -- without which int arithmetic overflows. - * See also [here](http://johnkerl.org/miller/doc/reference.html#Arithmetic) for the semantics of Miller arithmetic, which the [`Mlrval`](./src/types/mlrval.go) class implements. + * See also [here](http://johnkerl.org/miller/doc/reference.html#Arithmetic) for the semantics of Miller arithmetic, which the [`Mlrval`](./internal/pkg/types/mlrval.go) class implements. ## Software-testing methodology diff --git a/mlr.go b/cmd/mlr/main.go similarity index 91% rename from mlr.go rename to cmd/mlr/main.go index c86d9980e..71f0de682 100644 --- a/mlr.go +++ b/cmd/mlr/main.go @@ -1,4 +1,4 @@ -// Package main is the entry point for Miller. +// This is the entry point for the mlr executable. package main import ( @@ -9,10 +9,9 @@ import ( "runtime/pprof" "strconv" - "mlr/internal/pkg/entrypoint" + "github.com/johnkerl/miller/internal/pkg/entrypoint" ) -// main is the entry point for Miller. func main() { // Respect env $GOMAXPROCS, if provided, else set default. @@ -36,7 +35,7 @@ func main() { // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // CPU profiling // - // We do this here not in the command-line parser since + // We do this here, not in the command-line parser, since // pprof.StopCPUProfile() needs to be called at the very end of everything. // Putting this pprof logic into a go func running in parallel with main, // and properly stopping the profile only when main ends via chan-sync, diff --git a/docs/src/build.md b/docs/src/build.md index 95081aa00..a884859df 100644 --- a/docs/src/build.md +++ b/docs/src/build.md @@ -68,7 +68,7 @@ In this example I am using version 6.1.0 to 6.2.0; of course that will change fo * Update version found in `mlr --version` and `man mlr`: - * Edit `go/src/version/version.go` from `6.1.0-dev` to `6.2.0`. + * Edit `internal/pkpg/version/version.go` from `6.1.0-dev` to `6.2.0`. * Edit version in `docs/mkdocs.yml` from `6.1.0` to `6.2.0`. * Run `make dev` in the Miller repo base directory * The ordering in this makefile rule is important: the first build creates `mlr`; the second runs `mlr` to create `manpage.txt`; the third includes `manpage.txt` into one of its outputs. @@ -79,7 +79,7 @@ In this example I am using version 6.1.0 to 6.2.0; of course that will change fo * `make release_tarball` * This creates `miller-6.2.0-dev.tar.gz` which we'll upload to GitHub, the URL of which will be in our `miller.spec` * Get `mlr.{arch}` binaries from latest successful build from [https://github.com/johnkerl/miller/actions](https://github.com/johnkerl/miller/actions), or, build them on buildboxes. - * Prepare the source RPM following [./README-RPM.md](README-RPM.md). + * Prepare the source RPM following `README-RPM.md`. * Create the Github release tag: @@ -119,7 +119,7 @@ git push -u origin miller-6.1.0 * Afterwork: - * Edit `go/src/version/version.go` to change version from `6.2.0` to `6.2.0-dev`. + * Edit `internal/pkg/version/version.go` to change version from `6.2.0` to `6.2.0-dev`. * `cd go` * `./build` * Commit and push. diff --git a/docs/src/build.md.in b/docs/src/build.md.in index 02ccf8cfa..195cc0ee7 100644 --- a/docs/src/build.md.in +++ b/docs/src/build.md.in @@ -52,7 +52,7 @@ In this example I am using version 6.1.0 to 6.2.0; of course that will change fo * Update version found in `mlr --version` and `man mlr`: - * Edit `go/src/version/version.go` from `6.1.0-dev` to `6.2.0`. + * Edit `internal/pkpg/version/version.go` from `6.1.0-dev` to `6.2.0`. * Edit version in `docs/mkdocs.yml` from `6.1.0` to `6.2.0`. * Run `make dev` in the Miller repo base directory * The ordering in this makefile rule is important: the first build creates `mlr`; the second runs `mlr` to create `manpage.txt`; the third includes `manpage.txt` into one of its outputs. @@ -63,7 +63,7 @@ In this example I am using version 6.1.0 to 6.2.0; of course that will change fo * `make release_tarball` * This creates `miller-6.2.0-dev.tar.gz` which we'll upload to GitHub, the URL of which will be in our `miller.spec` * Get `mlr.{arch}` binaries from latest successful build from [https://github.com/johnkerl/miller/actions](https://github.com/johnkerl/miller/actions), or, build them on buildboxes. - * Prepare the source RPM following [./README-RPM.md](README-RPM.md). + * Prepare the source RPM following `README-RPM.md`. * Create the Github release tag: @@ -103,7 +103,7 @@ GENMD-EOF * Afterwork: - * Edit `go/src/version/version.go` to change version from `6.2.0` to `6.2.0-dev`. + * Edit `internal/pkg/version/version.go` to change version from `6.2.0` to `6.2.0-dev`. * `cd go` * `./build` * Commit and push. diff --git a/go/gc-raw-notes.txt b/experiments/gc-raw-notes.txt similarity index 100% rename from go/gc-raw-notes.txt rename to experiments/gc-raw-notes.txt diff --git a/go.mod b/go.mod index 5860364d8..cd4683f9a 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,13 @@ -module mlr -// 'module github.com/johnkerl/miller' would be more standard, but it has the -// fatal flaw that 'go build' would produce a file named 'miller', not 'mlr' -- -// and this naming goes back many years for Miller with executable named 'mlr', -// predating the Go port, across many platforms. +module github.com/johnkerl/miller +// The repo is 'miller' and the executable is 'mlr', going back many years and +// predating the Go port. +// +// If we had ./mlr.go then 'go build github.com/johnkerl/miller' then the +// executable would be 'miller' not 'mlr'. +// +// So we have cmd/mlr/main.go: +// * go build github.com/johnkerl/miller/cmd/mlr +// * go install github.com/johnkerl/miller/cmd/mlr go 1.15 diff --git a/go/.gitignore b/go/.gitignore deleted file mode 100644 index 3295623f5..000000000 --- a/go/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -big -big.json -bin/ -pkg/ -*.ast -r -s -mlrgo diff --git a/go/.vimrc b/go/.vimrc deleted file mode 100644 index 66a7c1c86..000000000 --- a/go/.vimrc +++ /dev/null @@ -1,3 +0,0 @@ -map \d :w:!clear;echo Building ...; echo; go build -map \f :w:!clear;echo Building ...; echo; build -map \T :w:!clear;go test mlr/src/lib/... diff --git a/internal/pkg/auxents/auxents.go b/internal/pkg/auxents/auxents.go index 501a8f47d..231a16899 100644 --- a/internal/pkg/auxents/auxents.go +++ b/internal/pkg/auxents/auxents.go @@ -9,9 +9,9 @@ import ( "fmt" "os" - "mlr/internal/pkg/auxents/help" - "mlr/internal/pkg/auxents/regtest" - "mlr/internal/pkg/auxents/repl" + "github.com/johnkerl/miller/internal/pkg/auxents/help" + "github.com/johnkerl/miller/internal/pkg/auxents/regtest" + "github.com/johnkerl/miller/internal/pkg/auxents/repl" ) // tAuxMain is a function-pointer type for the entrypoint handler for a given auxent, diff --git a/internal/pkg/auxents/help/entry.go b/internal/pkg/auxents/help/entry.go index c3e0d8323..93f8ea9db 100644 --- a/internal/pkg/auxents/help/entry.go +++ b/internal/pkg/auxents/help/entry.go @@ -10,11 +10,11 @@ import ( "github.com/mattn/go-isatty" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/dsl/cst" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/transformers" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/dsl/cst" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/transformers" + "github.com/johnkerl/miller/internal/pkg/types" ) // ================================================================ @@ -311,7 +311,7 @@ func helpAuxents() { They do not participate in any other parts of Miller. Please "mlr aux-list" for more information. `) - // imports mlr/internal/pkg/auxents: import cycle not allowed + // imports github.com/johnkerl/miller/internal/pkg/auxents: import cycle not allowed // auxents.ShowAuxEntries(o) } diff --git a/internal/pkg/auxents/regtest/entry.go b/internal/pkg/auxents/regtest/entry.go index 96099eae9..4c34abc82 100644 --- a/internal/pkg/auxents/regtest/entry.go +++ b/internal/pkg/auxents/regtest/entry.go @@ -99,7 +99,7 @@ func RegTestMain(args []string) int { regTestUsage(verbName, os.Stderr, 1) } } - paths := args[argi:] + casePaths := args[argi:] regtester := NewRegTester( exeName, @@ -109,7 +109,7 @@ func RegTestMain(args []string) int { firstNFailsToShow, ) - ok := regtester.Execute(paths) + ok := regtester.Execute(casePaths) if !ok { return 1 diff --git a/internal/pkg/auxents/regtest/invoker.go b/internal/pkg/auxents/regtest/invoker.go index 41e3ec985..3067cb1b0 100644 --- a/internal/pkg/auxents/regtest/invoker.go +++ b/internal/pkg/auxents/regtest/invoker.go @@ -6,8 +6,8 @@ import ( "os/exec" "strings" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/platform" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/platform" ) // RunMillerCommand runs a string like 'mlr cat foo.dat', with specified mlr diff --git a/internal/pkg/auxents/regtest/regtester.go b/internal/pkg/auxents/regtest/regtester.go index b7751aa30..f2c1fc27c 100644 --- a/internal/pkg/auxents/regtest/regtester.go +++ b/internal/pkg/auxents/regtest/regtester.go @@ -65,11 +65,11 @@ import ( "runtime" "strings" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/lib" ) -const DefaultPath = "./test/cases" +const DefaultPath = "./cases" const CmdName = "cmd" const MlrName = "mlr" const EnvName = "env" @@ -153,7 +153,7 @@ func (regtester *RegTester) resetCounts() { // for semantics. func (regtester *RegTester) Execute( - paths []string, + casePaths []string, ) bool { // Don't let the current user's settings affect expected results @@ -163,20 +163,20 @@ func (regtester *RegTester) Execute( regtester.resetCounts() - if len(paths) == 0 { - paths = []string{DefaultPath} + if len(casePaths) == 0 { + casePaths = []string{DefaultPath} } if !regtester.plainMode { fmt.Println("REGRESSION TEST:") - for _, path := range paths { + for _, path := range casePaths { fmt.Printf(" %s\n", path) } fmt.Printf("Using executable: %s\n", regtester.exeName) fmt.Println() } - for _, path := range paths { + for _, path := range casePaths { regtester.executeSinglePath(path) } diff --git a/internal/pkg/auxents/repl/dsl.go b/internal/pkg/auxents/repl/dsl.go index 8cb0449cf..ae98538d8 100644 --- a/internal/pkg/auxents/repl/dsl.go +++ b/internal/pkg/auxents/repl/dsl.go @@ -23,9 +23,9 @@ import ( "fmt" "strings" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/dsl/cst" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/dsl/cst" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/auxents/repl/entry.go b/internal/pkg/auxents/repl/entry.go index 4c73d9096..e8867af4b 100644 --- a/internal/pkg/auxents/repl/entry.go +++ b/internal/pkg/auxents/repl/entry.go @@ -27,7 +27,7 @@ import ( "path" "strings" - "mlr/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/cli" ) // ================================================================ diff --git a/internal/pkg/auxents/repl/prompt.go b/internal/pkg/auxents/repl/prompt.go index 440d4297e..350bf849f 100644 --- a/internal/pkg/auxents/repl/prompt.go +++ b/internal/pkg/auxents/repl/prompt.go @@ -11,9 +11,9 @@ import ( "golang.org/x/term" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/version" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/version" ) const ENV_PRIMARY_PROMPT = "MLR_REPL_PS1" diff --git a/internal/pkg/auxents/repl/session.go b/internal/pkg/auxents/repl/session.go index d1e5d4e0a..0bee002e1 100644 --- a/internal/pkg/auxents/repl/session.go +++ b/internal/pkg/auxents/repl/session.go @@ -25,13 +25,13 @@ import ( "strings" "syscall" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/dsl/cst" - "mlr/internal/pkg/input" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/output" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/dsl/cst" + "github.com/johnkerl/miller/internal/pkg/input" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/output" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/auxents/repl/types.go b/internal/pkg/auxents/repl/types.go index b33aa78e8..538d9bb2b 100644 --- a/internal/pkg/auxents/repl/types.go +++ b/internal/pkg/auxents/repl/types.go @@ -7,12 +7,12 @@ package repl import ( "os" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/dsl/cst" - "mlr/internal/pkg/input" - "mlr/internal/pkg/output" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/dsl/cst" + "github.com/johnkerl/miller/internal/pkg/input" + "github.com/johnkerl/miller/internal/pkg/output" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ================================================================ diff --git a/internal/pkg/auxents/repl/verbs.go b/internal/pkg/auxents/repl/verbs.go index c5ab9df8c..a941846f3 100644 --- a/internal/pkg/auxents/repl/verbs.go +++ b/internal/pkg/auxents/repl/verbs.go @@ -9,11 +9,11 @@ import ( "os" "strings" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/dsl/cst" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/dsl/cst" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/cli/flag_types.go b/internal/pkg/cli/flag_types.go index 2317c57a7..caeea95c6 100644 --- a/internal/pkg/cli/flag_types.go +++ b/internal/pkg/cli/flag_types.go @@ -42,8 +42,8 @@ import ( "sort" "strings" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/cli/option_parse.go b/internal/pkg/cli/option_parse.go index 7af3e7d19..7759ad6af 100644 --- a/internal/pkg/cli/option_parse.go +++ b/internal/pkg/cli/option_parse.go @@ -11,9 +11,9 @@ import ( "os" "strings" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // FinalizeReaderOptions does a few things. diff --git a/internal/pkg/cli/option_types.go b/internal/pkg/cli/option_types.go index 59e108159..1cd1e98cd 100644 --- a/internal/pkg/cli/option_types.go +++ b/internal/pkg/cli/option_types.go @@ -9,7 +9,7 @@ package cli import ( "regexp" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) type TCommentHandling int diff --git a/internal/pkg/cli/verb_utils.go b/internal/pkg/cli/verb_utils.go index 329e95c91..f86f227cd 100644 --- a/internal/pkg/cli/verb_utils.go +++ b/internal/pkg/cli/verb_utils.go @@ -9,7 +9,7 @@ import ( "os" "strconv" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/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/internal/pkg/climain/mlrcli_mlrrc.go b/internal/pkg/climain/mlrcli_mlrrc.go index 550916268..beb4aa45c 100644 --- a/internal/pkg/climain/mlrcli_mlrrc.go +++ b/internal/pkg/climain/mlrcli_mlrrc.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "mlr/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/cli" ) // loadMlrrcOrDie rule: If $MLRRC is set, use it and only it. Otherwise try diff --git a/internal/pkg/climain/mlrcli_parse.go b/internal/pkg/climain/mlrcli_parse.go index d1292bcfc..dd2f725ef 100644 --- a/internal/pkg/climain/mlrcli_parse.go +++ b/internal/pkg/climain/mlrcli_parse.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - "mlr/internal/pkg/auxents/help" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/transformers" - "mlr/internal/pkg/types" - "mlr/internal/pkg/version" + "github.com/johnkerl/miller/internal/pkg/auxents/help" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/transformers" + "github.com/johnkerl/miller/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/version" ) // ParseCommandLine is the entrypoint for handling the Miller command line: diff --git a/internal/pkg/dsl/ast_build.go b/internal/pkg/dsl/ast_build.go index d350506b4..3a1a14edc 100644 --- a/internal/pkg/dsl/ast_build.go +++ b/internal/pkg/dsl/ast_build.go @@ -9,8 +9,8 @@ import ( "errors" "fmt" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/parsing/token" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/parsing/token" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/ast_types.go b/internal/pkg/dsl/ast_types.go index 42842f284..9be481019 100644 --- a/internal/pkg/dsl/ast_types.go +++ b/internal/pkg/dsl/ast_types.go @@ -5,7 +5,7 @@ package dsl import ( - "mlr/internal/pkg/parsing/token" + "github.com/johnkerl/miller/internal/pkg/parsing/token" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/assignments.go b/internal/pkg/dsl/cst/assignments.go index c869c6d49..41540ed20 100644 --- a/internal/pkg/dsl/cst/assignments.go +++ b/internal/pkg/dsl/cst/assignments.go @@ -5,9 +5,9 @@ package cst import ( - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" ) // ================================================================ diff --git a/internal/pkg/dsl/cst/block-exit.go b/internal/pkg/dsl/cst/block-exit.go index b0fcd4587..d255cd9a8 100644 --- a/internal/pkg/dsl/cst/block-exit.go +++ b/internal/pkg/dsl/cst/block-exit.go @@ -8,9 +8,9 @@ package cst import ( "errors" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/blocks.go b/internal/pkg/dsl/cst/blocks.go index 0319a639b..6eb805b11 100644 --- a/internal/pkg/dsl/cst/blocks.go +++ b/internal/pkg/dsl/cst/blocks.go @@ -6,9 +6,9 @@ package cst import ( - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/builtin_function_manager.go b/internal/pkg/dsl/cst/builtin_function_manager.go index 08de00254..cf42a7e84 100644 --- a/internal/pkg/dsl/cst/builtin_function_manager.go +++ b/internal/pkg/dsl/cst/builtin_function_manager.go @@ -19,9 +19,9 @@ import ( "sort" "strings" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) type TFunctionClass string diff --git a/internal/pkg/dsl/cst/builtin_functions.go b/internal/pkg/dsl/cst/builtin_functions.go index c1528e500..0a36f70ed 100644 --- a/internal/pkg/dsl/cst/builtin_functions.go +++ b/internal/pkg/dsl/cst/builtin_functions.go @@ -8,10 +8,10 @@ import ( "errors" "fmt" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/collections.go b/internal/pkg/dsl/cst/collections.go index 5a5e15435..6dd0c32a1 100644 --- a/internal/pkg/dsl/cst/collections.go +++ b/internal/pkg/dsl/cst/collections.go @@ -6,10 +6,10 @@ package cst import ( - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/cond.go b/internal/pkg/dsl/cst/cond.go index 9686909d0..ba7f251f9 100644 --- a/internal/pkg/dsl/cst/cond.go +++ b/internal/pkg/dsl/cst/cond.go @@ -8,10 +8,10 @@ package cst import ( "errors" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) type CondBlockNode struct { diff --git a/internal/pkg/dsl/cst/dump.go b/internal/pkg/dsl/cst/dump.go index 8fed8c253..a3f563ecd 100644 --- a/internal/pkg/dsl/cst/dump.go +++ b/internal/pkg/dsl/cst/dump.go @@ -22,11 +22,11 @@ import ( "os" "strings" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/output" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/output" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ================================================================ diff --git a/internal/pkg/dsl/cst/emit1.go b/internal/pkg/dsl/cst/emit1.go index 93067eee3..593e893ab 100644 --- a/internal/pkg/dsl/cst/emit1.go +++ b/internal/pkg/dsl/cst/emit1.go @@ -22,10 +22,10 @@ package cst import ( "fmt" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) type Emit1StatementNode struct { diff --git a/internal/pkg/dsl/cst/emit_emitp.go b/internal/pkg/dsl/cst/emit_emitp.go index 616da7d46..86470aaff 100644 --- a/internal/pkg/dsl/cst/emit_emitp.go +++ b/internal/pkg/dsl/cst/emit_emitp.go @@ -42,12 +42,12 @@ import ( "errors" "fmt" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/output" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/output" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ================================================================ diff --git a/internal/pkg/dsl/cst/emitf.go b/internal/pkg/dsl/cst/emitf.go index 9d3c48356..6b25ccf4e 100644 --- a/internal/pkg/dsl/cst/emitf.go +++ b/internal/pkg/dsl/cst/emitf.go @@ -9,11 +9,11 @@ import ( "errors" "fmt" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/output" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/output" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ================================================================ diff --git a/internal/pkg/dsl/cst/env.go b/internal/pkg/dsl/cst/env.go index c4455be62..371467235 100644 --- a/internal/pkg/dsl/cst/env.go +++ b/internal/pkg/dsl/cst/env.go @@ -10,10 +10,10 @@ package cst import ( "os" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) type EnvironmentVariableNode struct { diff --git a/internal/pkg/dsl/cst/evaluable.go b/internal/pkg/dsl/cst/evaluable.go index 82abbffb4..03722d4d2 100644 --- a/internal/pkg/dsl/cst/evaluable.go +++ b/internal/pkg/dsl/cst/evaluable.go @@ -11,10 +11,10 @@ import ( "fmt" "os" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/filter.go b/internal/pkg/dsl/cst/filter.go index 048430954..dfab5ceee 100644 --- a/internal/pkg/dsl/cst/filter.go +++ b/internal/pkg/dsl/cst/filter.go @@ -19,9 +19,9 @@ package cst import ( - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/for.go b/internal/pkg/dsl/cst/for.go index f61944064..f312e092a 100644 --- a/internal/pkg/dsl/cst/for.go +++ b/internal/pkg/dsl/cst/for.go @@ -7,10 +7,10 @@ package cst import ( "errors" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/functions.go b/internal/pkg/dsl/cst/functions.go index f497f2c19..d601a0644 100644 --- a/internal/pkg/dsl/cst/functions.go +++ b/internal/pkg/dsl/cst/functions.go @@ -9,8 +9,8 @@ package cst import ( - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/hofs.go b/internal/pkg/dsl/cst/hofs.go index 55f11cc38..4e067685a 100644 --- a/internal/pkg/dsl/cst/hofs.go +++ b/internal/pkg/dsl/cst/hofs.go @@ -12,12 +12,12 @@ import ( "strconv" "strings" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) -// Most function types are in the mlr/internal/pkg/types package. These types, though, +// Most function types are in the github.com/johnkerl/miller/internal/pkg/types package. These types, though, // include functions which need to access CST state in order to call back to // user-defined functions. To avoid a package-cycle dependency, they are // defined here. diff --git a/internal/pkg/dsl/cst/if.go b/internal/pkg/dsl/cst/if.go index 6952cd646..6b2fa223e 100644 --- a/internal/pkg/dsl/cst/if.go +++ b/internal/pkg/dsl/cst/if.go @@ -7,10 +7,10 @@ package cst import ( "errors" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/keyword_usage.go b/internal/pkg/dsl/cst/keyword_usage.go index 1d0512a0d..807c8527d 100644 --- a/internal/pkg/dsl/cst/keyword_usage.go +++ b/internal/pkg/dsl/cst/keyword_usage.go @@ -3,8 +3,8 @@ package cst import ( "fmt" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/leaves.go b/internal/pkg/dsl/cst/leaves.go index 46d6d6f02..8e5011005 100644 --- a/internal/pkg/dsl/cst/leaves.go +++ b/internal/pkg/dsl/cst/leaves.go @@ -8,10 +8,10 @@ import ( "errors" "math" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/lvalues.go b/internal/pkg/dsl/cst/lvalues.go index 08202588d..0e3572c54 100644 --- a/internal/pkg/dsl/cst/lvalues.go +++ b/internal/pkg/dsl/cst/lvalues.go @@ -10,10 +10,10 @@ import ( "fmt" "os" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/print.go b/internal/pkg/dsl/cst/print.go index 8fdda096d..1fee1a9ae 100644 --- a/internal/pkg/dsl/cst/print.go +++ b/internal/pkg/dsl/cst/print.go @@ -10,11 +10,11 @@ import ( "fmt" "os" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/output" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/output" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/root.go b/internal/pkg/dsl/cst/root.go index 21dd685bd..350efd720 100644 --- a/internal/pkg/dsl/cst/root.go +++ b/internal/pkg/dsl/cst/root.go @@ -12,13 +12,13 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/output" - "mlr/internal/pkg/parsing/lexer" - "mlr/internal/pkg/parsing/parser" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/output" + "github.com/johnkerl/miller/internal/pkg/parsing/lexer" + "github.com/johnkerl/miller/internal/pkg/parsing/parser" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // NewEmptyRoot sets up an empty CST, before ingesting any DSL strings. For diff --git a/internal/pkg/dsl/cst/signature.go b/internal/pkg/dsl/cst/signature.go index 87f3d7c03..aeac8e80a 100644 --- a/internal/pkg/dsl/cst/signature.go +++ b/internal/pkg/dsl/cst/signature.go @@ -6,7 +6,7 @@ package cst import ( - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/statements.go b/internal/pkg/dsl/cst/statements.go index c43b902a6..e5577e071 100644 --- a/internal/pkg/dsl/cst/statements.go +++ b/internal/pkg/dsl/cst/statements.go @@ -8,7 +8,7 @@ package cst import ( "errors" - "mlr/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/dsl" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/subroutines.go b/internal/pkg/dsl/cst/subroutines.go index a0e80836a..b91326a81 100644 --- a/internal/pkg/dsl/cst/subroutines.go +++ b/internal/pkg/dsl/cst/subroutines.go @@ -9,8 +9,8 @@ package cst import ( - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/tee.go b/internal/pkg/dsl/cst/tee.go index d0f770ed3..2f2fdfdbf 100644 --- a/internal/pkg/dsl/cst/tee.go +++ b/internal/pkg/dsl/cst/tee.go @@ -8,11 +8,11 @@ import ( "errors" "fmt" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/output" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/output" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/types.go b/internal/pkg/dsl/cst/types.go index 2acd9eca4..f5ad98530 100644 --- a/internal/pkg/dsl/cst/types.go +++ b/internal/pkg/dsl/cst/types.go @@ -7,10 +7,10 @@ package cst import ( "container/list" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/udf.go b/internal/pkg/dsl/cst/udf.go index 9fe79117d..b7f069665 100644 --- a/internal/pkg/dsl/cst/udf.go +++ b/internal/pkg/dsl/cst/udf.go @@ -9,10 +9,10 @@ import ( "fmt" "os" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/uds.go b/internal/pkg/dsl/cst/uds.go index 5ac3a8111..394c3fd88 100644 --- a/internal/pkg/dsl/cst/uds.go +++ b/internal/pkg/dsl/cst/uds.go @@ -8,10 +8,10 @@ import ( "errors" "fmt" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/validate.go b/internal/pkg/dsl/cst/validate.go index 87d63c162..9ed13adf0 100644 --- a/internal/pkg/dsl/cst/validate.go +++ b/internal/pkg/dsl/cst/validate.go @@ -10,8 +10,8 @@ import ( "errors" "fmt" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/warn.go b/internal/pkg/dsl/cst/warn.go index a54f2eec2..a74a7478b 100644 --- a/internal/pkg/dsl/cst/warn.go +++ b/internal/pkg/dsl/cst/warn.go @@ -11,8 +11,8 @@ import ( "fmt" "os" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/dsl/cst/while.go b/internal/pkg/dsl/cst/while.go index 434f877af..e3d0d2eda 100644 --- a/internal/pkg/dsl/cst/while.go +++ b/internal/pkg/dsl/cst/while.go @@ -7,9 +7,9 @@ package cst import ( "errors" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/runtime" ) // ================================================================ diff --git a/internal/pkg/entrypoint/entrypoint.go b/internal/pkg/entrypoint/entrypoint.go index 53f6f9a96..ce0b56ce7 100644 --- a/internal/pkg/entrypoint/entrypoint.go +++ b/internal/pkg/entrypoint/entrypoint.go @@ -11,13 +11,13 @@ import ( "os" "path" - "mlr/internal/pkg/auxents" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/climain" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/platform" - "mlr/internal/pkg/stream" - "mlr/internal/pkg/transformers" + "github.com/johnkerl/miller/internal/pkg/auxents" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/climain" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/platform" + "github.com/johnkerl/miller/internal/pkg/stream" + "github.com/johnkerl/miller/internal/pkg/transformers" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/input/pseudo_reader_gen.go b/internal/pkg/input/pseudo_reader_gen.go index e113807b8..2534dacac 100644 --- a/internal/pkg/input/pseudo_reader_gen.go +++ b/internal/pkg/input/pseudo_reader_gen.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) type PseudoReaderGen struct { diff --git a/internal/pkg/input/record_reader.go b/internal/pkg/input/record_reader.go index 81bceef01..4d4a50ac8 100644 --- a/internal/pkg/input/record_reader.go +++ b/internal/pkg/input/record_reader.go @@ -4,7 +4,7 @@ import ( "bufio" "io" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/types" ) const CSV_BOM = "\xef\xbb\xbf" diff --git a/internal/pkg/input/record_reader_csv.go b/internal/pkg/input/record_reader_csv.go index d82abff29..d963c8c74 100644 --- a/internal/pkg/input/record_reader_csv.go +++ b/internal/pkg/input/record_reader_csv.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/input/record_reader_csvlite.go b/internal/pkg/input/record_reader_csvlite.go index 0d1516716..4ceafec19 100644 --- a/internal/pkg/input/record_reader_csvlite.go +++ b/internal/pkg/input/record_reader_csvlite.go @@ -25,9 +25,9 @@ import ( "strconv" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/input/record_reader_dkvp.go b/internal/pkg/input/record_reader_dkvp.go index 34af64398..91cb5d1d0 100644 --- a/internal/pkg/input/record_reader_dkvp.go +++ b/internal/pkg/input/record_reader_dkvp.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) type RecordReaderDKVP struct { diff --git a/internal/pkg/input/record_reader_factory.go b/internal/pkg/input/record_reader_factory.go index 35b1e220a..9c54ce175 100644 --- a/internal/pkg/input/record_reader_factory.go +++ b/internal/pkg/input/record_reader_factory.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "mlr/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/cli" ) func Create(readerOptions *cli.TReaderOptions) (IRecordReader, error) { diff --git a/internal/pkg/input/record_reader_json.go b/internal/pkg/input/record_reader_json.go index 91e94c344..294dd0d95 100644 --- a/internal/pkg/input/record_reader_json.go +++ b/internal/pkg/input/record_reader_json.go @@ -9,9 +9,9 @@ import ( "encoding/json" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) type RecordReaderJSON struct { diff --git a/internal/pkg/input/record_reader_nidx.go b/internal/pkg/input/record_reader_nidx.go index 0e40939e9..3db7d3cb3 100644 --- a/internal/pkg/input/record_reader_nidx.go +++ b/internal/pkg/input/record_reader_nidx.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) type RecordReaderNIDX struct { diff --git a/internal/pkg/input/record_reader_xtab.go b/internal/pkg/input/record_reader_xtab.go index 6756ada24..e64599ae7 100644 --- a/internal/pkg/input/record_reader_xtab.go +++ b/internal/pkg/input/record_reader_xtab.go @@ -6,9 +6,9 @@ import ( "io" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) type RecordReaderXTAB struct { diff --git a/internal/pkg/lib/halfpipe.go b/internal/pkg/lib/halfpipe.go index b80082d86..57cbcd21e 100644 --- a/internal/pkg/lib/halfpipe.go +++ b/internal/pkg/lib/halfpipe.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "mlr/internal/pkg/platform" + "github.com/johnkerl/miller/internal/pkg/platform" ) // OpenOutboundHalfPipe returns a handle to a process. Writing to that handle diff --git a/internal/pkg/output/channel_writer.go b/internal/pkg/output/channel_writer.go index 1fde0ab4b..2d0af7399 100644 --- a/internal/pkg/output/channel_writer.go +++ b/internal/pkg/output/channel_writer.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/types" ) func ChannelWriter( diff --git a/internal/pkg/output/file-output-handlers.go b/internal/pkg/output/file-output-handlers.go index b2fd85ff5..8189efee3 100644 --- a/internal/pkg/output/file-output-handlers.go +++ b/internal/pkg/output/file-output-handlers.go @@ -18,9 +18,9 @@ import ( "io" "os" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ================================================================ diff --git a/internal/pkg/output/record_writer.go b/internal/pkg/output/record_writer.go index 02964d930..3be63b423 100644 --- a/internal/pkg/output/record_writer.go +++ b/internal/pkg/output/record_writer.go @@ -3,7 +3,7 @@ package output import ( "io" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/types" ) // IRecordWriter is the abstract interface for all record-writers. They are diff --git a/internal/pkg/output/record_writer_csv.go b/internal/pkg/output/record_writer_csv.go index 9d6eadd93..9d2c1ab5c 100644 --- a/internal/pkg/output/record_writer_csv.go +++ b/internal/pkg/output/record_writer_csv.go @@ -6,9 +6,9 @@ import ( "io" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/types" ) type RecordWriterCSV struct { diff --git a/internal/pkg/output/record_writer_csvlite.go b/internal/pkg/output/record_writer_csvlite.go index ea00807b3..3f648539b 100644 --- a/internal/pkg/output/record_writer_csvlite.go +++ b/internal/pkg/output/record_writer_csvlite.go @@ -5,9 +5,9 @@ import ( "io" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/types" ) type RecordWriterCSVLite struct { diff --git a/internal/pkg/output/record_writer_dkvp.go b/internal/pkg/output/record_writer_dkvp.go index 00f423d08..134374704 100644 --- a/internal/pkg/output/record_writer_dkvp.go +++ b/internal/pkg/output/record_writer_dkvp.go @@ -4,9 +4,9 @@ import ( "bytes" "io" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/types" ) type RecordWriterDKVP struct { diff --git a/internal/pkg/output/record_writer_factory.go b/internal/pkg/output/record_writer_factory.go index 33398fcd0..b95324716 100644 --- a/internal/pkg/output/record_writer_factory.go +++ b/internal/pkg/output/record_writer_factory.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "mlr/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/cli" ) func Create(writerOptions *cli.TWriterOptions) (IRecordWriter, error) { diff --git a/internal/pkg/output/record_writer_json.go b/internal/pkg/output/record_writer_json.go index 2bbef40a6..a3e0855fd 100644 --- a/internal/pkg/output/record_writer_json.go +++ b/internal/pkg/output/record_writer_json.go @@ -6,8 +6,8 @@ import ( "io" "os" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/output/record_writer_markdown.go b/internal/pkg/output/record_writer_markdown.go index c957b97a1..1772d00d9 100644 --- a/internal/pkg/output/record_writer_markdown.go +++ b/internal/pkg/output/record_writer_markdown.go @@ -6,9 +6,9 @@ import ( "io" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/types" ) type RecordWriterMarkdown struct { diff --git a/internal/pkg/output/record_writer_nidx.go b/internal/pkg/output/record_writer_nidx.go index 5e2e25ef0..f7e62774b 100644 --- a/internal/pkg/output/record_writer_nidx.go +++ b/internal/pkg/output/record_writer_nidx.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) type RecordWriterNIDX struct { diff --git a/internal/pkg/output/record_writer_pprint.go b/internal/pkg/output/record_writer_pprint.go index 80912c340..062304d30 100644 --- a/internal/pkg/output/record_writer_pprint.go +++ b/internal/pkg/output/record_writer_pprint.go @@ -8,9 +8,9 @@ import ( "strings" "unicode/utf8" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/types" ) type RecordWriterPPRINT struct { diff --git a/internal/pkg/output/record_writer_xtab.go b/internal/pkg/output/record_writer_xtab.go index 1e461ff85..5d6ae51fe 100644 --- a/internal/pkg/output/record_writer_xtab.go +++ b/internal/pkg/output/record_writer_xtab.go @@ -6,9 +6,9 @@ import ( "io" "unicode/utf8" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/parsing/errors.go.template b/internal/pkg/parsing/errors.go.template index 2a9521a04..79b994d0b 100644 --- a/internal/pkg/parsing/errors.go.template +++ b/internal/pkg/parsing/errors.go.template @@ -3,9 +3,8 @@ // over the top of GOCC codegen so that we can customize handling of error // messages. // -// Source: src/parsing/errors.go.template -// Destination: -// src/parsing/errors/errors.go +// Source: internal/pkg/parsing/errors.go.template +// Destination: internal/pkg/parsing/errors/errors.go // ================================================================ package errors @@ -14,7 +13,7 @@ import ( "fmt" "strings" - "mlr/src/parsing/token" + "github.com/johnkerl/miller/internal/pkg/parsing/token" ) type ErrorSymbol interface { diff --git a/internal/pkg/parsing/errors/errors.go b/internal/pkg/parsing/errors/errors.go index 179aebec1..79b994d0b 100644 --- a/internal/pkg/parsing/errors/errors.go +++ b/internal/pkg/parsing/errors/errors.go @@ -3,9 +3,8 @@ // over the top of GOCC codegen so that we can customize handling of error // messages. // -// Source: src/parsing/errors.go.template -// Destination: -// src/parsing/errors/errors.go +// Source: internal/pkg/parsing/errors.go.template +// Destination: internal/pkg/parsing/errors/errors.go // ================================================================ package errors @@ -14,7 +13,7 @@ import ( "fmt" "strings" - "mlr/internal/pkg/parsing/token" + "github.com/johnkerl/miller/internal/pkg/parsing/token" ) type ErrorSymbol interface { diff --git a/internal/pkg/parsing/lexer/acttab.go b/internal/pkg/parsing/lexer/acttab.go index 0998abc9a..bab2376ff 100644 --- a/internal/pkg/parsing/lexer/acttab.go +++ b/internal/pkg/parsing/lexer/acttab.go @@ -5,7 +5,7 @@ package lexer import ( "fmt" - "mlr/internal/pkg/parsing/token" + "github.com/johnkerl/miller/internal/pkg/parsing/token" ) type ActionTable [NumStates]ActionRow diff --git a/internal/pkg/parsing/lexer/lexer.go b/internal/pkg/parsing/lexer/lexer.go index 1db291451..bb8ac42f6 100644 --- a/internal/pkg/parsing/lexer/lexer.go +++ b/internal/pkg/parsing/lexer/lexer.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "unicode/utf8" - "mlr/internal/pkg/parsing/token" + "github.com/johnkerl/miller/internal/pkg/parsing/token" ) const ( diff --git a/internal/pkg/parsing/mlr.bnf b/internal/pkg/parsing/mlr.bnf index c1ac58361..48cb38581 100644 --- a/internal/pkg/parsing/mlr.bnf +++ b/internal/pkg/parsing/mlr.bnf @@ -42,7 +42,7 @@ // interface{}/error since they are meant for nesting as arguments here // within this file. // -// * Please see src/dsl/ast*.go for more about what the <<...>> +// * Please see internal/pkg/dsl/ast*.go for more about what the <<...>> // code here is calling. // ================================================================ @@ -326,7 +326,7 @@ panic : '%' '%' '%' 'p' 'a' 'n' 'i' 'c' '%' '%' '%' ; // ================================================================ // Import the AST/ASTNode types and functions -<< import "mlr/internal/pkg/dsl" >> +<< import "github.com/johnkerl/miller/internal/pkg/dsl" >> // ================================================================ // TOP-LEVEL PRODUCTION RULE FOR THE MILLER DSL diff --git a/internal/pkg/parsing/parser/parser.go b/internal/pkg/parsing/parser/parser.go index ccb9262bc..9e053ad8b 100644 --- a/internal/pkg/parsing/parser/parser.go +++ b/internal/pkg/parsing/parser/parser.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - parseError "mlr/internal/pkg/parsing/errors" - "mlr/internal/pkg/parsing/token" + parseError "github.com/johnkerl/miller/internal/pkg/parsing/errors" + "github.com/johnkerl/miller/internal/pkg/parsing/token" ) const ( diff --git a/internal/pkg/parsing/parser/productionstable.go b/internal/pkg/parsing/parser/productionstable.go index 247067ce5..41211c7d1 100644 --- a/internal/pkg/parsing/parser/productionstable.go +++ b/internal/pkg/parsing/parser/productionstable.go @@ -2,7 +2,7 @@ package parser -import "mlr/internal/pkg/dsl" +import "github.com/johnkerl/miller/internal/pkg/dsl" type ( ProdTab [numProductions]ProdTabEntry diff --git a/internal/pkg/runtime/stack.go b/internal/pkg/runtime/stack.go index 612d9d3af..6ad9347be 100644 --- a/internal/pkg/runtime/stack.go +++ b/internal/pkg/runtime/stack.go @@ -30,8 +30,8 @@ import ( "errors" "fmt" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ================================================================ diff --git a/internal/pkg/runtime/state.go b/internal/pkg/runtime/state.go index b370a134a..248822502 100644 --- a/internal/pkg/runtime/state.go +++ b/internal/pkg/runtime/state.go @@ -7,8 +7,8 @@ package runtime import ( - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) type State struct { diff --git a/internal/pkg/stream/stream.go b/internal/pkg/stream/stream.go index c319daade..a96f8940c 100644 --- a/internal/pkg/stream/stream.go +++ b/internal/pkg/stream/stream.go @@ -5,11 +5,11 @@ import ( "io" "os" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/input" - "mlr/internal/pkg/output" - "mlr/internal/pkg/transformers" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/input" + "github.com/johnkerl/miller/internal/pkg/output" + "github.com/johnkerl/miller/internal/pkg/transformers" + "github.com/johnkerl/miller/internal/pkg/types" ) // Since Go is concurrent, the context struct (AWK-like variables such as diff --git a/internal/pkg/transformers/aaa_chain_transformer.go b/internal/pkg/transformers/aaa_chain_transformer.go index cb5b255b2..943874ef5 100644 --- a/internal/pkg/transformers/aaa_chain_transformer.go +++ b/internal/pkg/transformers/aaa_chain_transformer.go @@ -2,8 +2,8 @@ package transformers import ( "fmt" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" "os" ) diff --git a/internal/pkg/transformers/aaa_record_transformer.go b/internal/pkg/transformers/aaa_record_transformer.go index ca24f7196..0a8d8cc84 100644 --- a/internal/pkg/transformers/aaa_record_transformer.go +++ b/internal/pkg/transformers/aaa_record_transformer.go @@ -3,8 +3,8 @@ package transformers import ( "os" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // IRecordTransformer is the interface satisfied by all transformers, i.e., diff --git a/internal/pkg/transformers/aaa_transformer_table.go b/internal/pkg/transformers/aaa_transformer_table.go index f148a1256..3c2a0acaf 100644 --- a/internal/pkg/transformers/aaa_transformer_table.go +++ b/internal/pkg/transformers/aaa_transformer_table.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/altkv.go b/internal/pkg/transformers/altkv.go index 34ad7152f..e6ffbf63b 100644 --- a/internal/pkg/transformers/altkv.go +++ b/internal/pkg/transformers/altkv.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/bar.go b/internal/pkg/transformers/bar.go index 086bdd92d..9c140aaac 100644 --- a/internal/pkg/transformers/bar.go +++ b/internal/pkg/transformers/bar.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) const barDefaultFillString = "*" diff --git a/internal/pkg/transformers/bootstrap.go b/internal/pkg/transformers/bootstrap.go index 884dc9252..975b9b772 100644 --- a/internal/pkg/transformers/bootstrap.go +++ b/internal/pkg/transformers/bootstrap.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/cat.go b/internal/pkg/transformers/cat.go index d28fcfe49..21930207d 100644 --- a/internal/pkg/transformers/cat.go +++ b/internal/pkg/transformers/cat.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/check.go b/internal/pkg/transformers/check.go index 0fa575054..983619f99 100644 --- a/internal/pkg/transformers/check.go +++ b/internal/pkg/transformers/check.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/clean-whitespace.go b/internal/pkg/transformers/clean-whitespace.go index 50acb8c2d..fb182adca 100644 --- a/internal/pkg/transformers/clean-whitespace.go +++ b/internal/pkg/transformers/clean-whitespace.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/count-similar.go b/internal/pkg/transformers/count-similar.go index d838284ff..a78d5e8d5 100644 --- a/internal/pkg/transformers/count-similar.go +++ b/internal/pkg/transformers/count-similar.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/count.go b/internal/pkg/transformers/count.go index 604d38aab..85d373e43 100644 --- a/internal/pkg/transformers/count.go +++ b/internal/pkg/transformers/count.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/cut.go b/internal/pkg/transformers/cut.go index e4d0011d0..2c2ecc810 100644 --- a/internal/pkg/transformers/cut.go +++ b/internal/pkg/transformers/cut.go @@ -6,9 +6,9 @@ import ( "regexp" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/decimate.go b/internal/pkg/transformers/decimate.go index 9801ca8fc..fdd228ae2 100644 --- a/internal/pkg/transformers/decimate.go +++ b/internal/pkg/transformers/decimate.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/fill-down.go b/internal/pkg/transformers/fill-down.go index df11468f1..77b91b13a 100644 --- a/internal/pkg/transformers/fill-down.go +++ b/internal/pkg/transformers/fill-down.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/fill-empty.go b/internal/pkg/transformers/fill-empty.go index b8a53e92c..a2f79817d 100644 --- a/internal/pkg/transformers/fill-empty.go +++ b/internal/pkg/transformers/fill-empty.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/flatten.go b/internal/pkg/transformers/flatten.go index 964562308..0d9ef3693 100644 --- a/internal/pkg/transformers/flatten.go +++ b/internal/pkg/transformers/flatten.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/format-values.go b/internal/pkg/transformers/format-values.go index acf40ff8b..1630ae691 100644 --- a/internal/pkg/transformers/format-values.go +++ b/internal/pkg/transformers/format-values.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/fraction.go b/internal/pkg/transformers/fraction.go index 91faded79..3a9c54a31 100644 --- a/internal/pkg/transformers/fraction.go +++ b/internal/pkg/transformers/fraction.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/gap.go b/internal/pkg/transformers/gap.go index 203a67370..98e40e619 100644 --- a/internal/pkg/transformers/gap.go +++ b/internal/pkg/transformers/gap.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/grep.go b/internal/pkg/transformers/grep.go index 0b0d064d2..8455e403a 100644 --- a/internal/pkg/transformers/grep.go +++ b/internal/pkg/transformers/grep.go @@ -6,8 +6,8 @@ import ( "regexp" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/group-by.go b/internal/pkg/transformers/group-by.go index 7fdca7204..c1dddf685 100644 --- a/internal/pkg/transformers/group-by.go +++ b/internal/pkg/transformers/group-by.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/group-like.go b/internal/pkg/transformers/group-like.go index d1b516898..3b03c078f 100644 --- a/internal/pkg/transformers/group-like.go +++ b/internal/pkg/transformers/group-like.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/having-fields.go b/internal/pkg/transformers/having-fields.go index 28c1d8fc9..26d28a8ce 100644 --- a/internal/pkg/transformers/having-fields.go +++ b/internal/pkg/transformers/having-fields.go @@ -6,9 +6,9 @@ import ( "regexp" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) type tHavingFieldsCriterion int diff --git a/internal/pkg/transformers/head.go b/internal/pkg/transformers/head.go index 4c13630a1..25c953bcd 100644 --- a/internal/pkg/transformers/head.go +++ b/internal/pkg/transformers/head.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/histogram.go b/internal/pkg/transformers/histogram.go index f731c0eef..7bd6a1e0b 100644 --- a/internal/pkg/transformers/histogram.go +++ b/internal/pkg/transformers/histogram.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/join.go b/internal/pkg/transformers/join.go index 7d8aab95e..4a067dc8c 100644 --- a/internal/pkg/transformers/join.go +++ b/internal/pkg/transformers/join.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/input" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/transformers/utils" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/input" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/transformers/utils" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/json-parse.go b/internal/pkg/transformers/json-parse.go index 74221b197..4b3e81b85 100644 --- a/internal/pkg/transformers/json-parse.go +++ b/internal/pkg/transformers/json-parse.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/json-stringify.go b/internal/pkg/transformers/json-stringify.go index cad95c10a..17e80247e 100644 --- a/internal/pkg/transformers/json-stringify.go +++ b/internal/pkg/transformers/json-stringify.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/label.go b/internal/pkg/transformers/label.go index 2f798614c..5348fc864 100644 --- a/internal/pkg/transformers/label.go +++ b/internal/pkg/transformers/label.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/merge-fields.go b/internal/pkg/transformers/merge-fields.go index 354aae4df..7cc09ae02 100644 --- a/internal/pkg/transformers/merge-fields.go +++ b/internal/pkg/transformers/merge-fields.go @@ -7,10 +7,10 @@ import ( "regexp" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/transformers/utils" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/transformers/utils" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/most-or-least-frequent.go b/internal/pkg/transformers/most-or-least-frequent.go index 98109c6af..dd35a847f 100644 --- a/internal/pkg/transformers/most-or-least-frequent.go +++ b/internal/pkg/transformers/most-or-least-frequent.go @@ -6,9 +6,9 @@ import ( "sort" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/nest.go b/internal/pkg/transformers/nest.go index 1411364cf..72e0d2864 100644 --- a/internal/pkg/transformers/nest.go +++ b/internal/pkg/transformers/nest.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/nothing.go b/internal/pkg/transformers/nothing.go index c5cffaef6..547eee0a9 100644 --- a/internal/pkg/transformers/nothing.go +++ b/internal/pkg/transformers/nothing.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/put-or-filter.go b/internal/pkg/transformers/put-or-filter.go index 705ef12e2..4ffd14f36 100644 --- a/internal/pkg/transformers/put-or-filter.go +++ b/internal/pkg/transformers/put-or-filter.go @@ -6,14 +6,14 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/dsl" - "mlr/internal/pkg/dsl/cst" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/parsing/lexer" - "mlr/internal/pkg/parsing/parser" - "mlr/internal/pkg/runtime" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/dsl" + "github.com/johnkerl/miller/internal/pkg/dsl/cst" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/parsing/lexer" + "github.com/johnkerl/miller/internal/pkg/parsing/parser" + "github.com/johnkerl/miller/internal/pkg/runtime" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/regularize.go b/internal/pkg/transformers/regularize.go index 37505cbae..9e120d687 100644 --- a/internal/pkg/transformers/regularize.go +++ b/internal/pkg/transformers/regularize.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/remove-empty-columns.go b/internal/pkg/transformers/remove-empty-columns.go index e8f73197c..2b33125e7 100644 --- a/internal/pkg/transformers/remove-empty-columns.go +++ b/internal/pkg/transformers/remove-empty-columns.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/rename.go b/internal/pkg/transformers/rename.go index e2db13924..c2e90019b 100644 --- a/internal/pkg/transformers/rename.go +++ b/internal/pkg/transformers/rename.go @@ -8,9 +8,9 @@ import ( "regexp" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/reorder.go b/internal/pkg/transformers/reorder.go index 001f404d4..91add0190 100644 --- a/internal/pkg/transformers/reorder.go +++ b/internal/pkg/transformers/reorder.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/repeat.go b/internal/pkg/transformers/repeat.go index 4dc46aba1..4f51df0a1 100644 --- a/internal/pkg/transformers/repeat.go +++ b/internal/pkg/transformers/repeat.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) type tRepeatCountSource int diff --git a/internal/pkg/transformers/reshape.go b/internal/pkg/transformers/reshape.go index 1ae132efb..a403b4ba2 100644 --- a/internal/pkg/transformers/reshape.go +++ b/internal/pkg/transformers/reshape.go @@ -33,9 +33,9 @@ import ( "regexp" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/sample.go b/internal/pkg/transformers/sample.go index 26652bb5d..85e7b73ad 100644 --- a/internal/pkg/transformers/sample.go +++ b/internal/pkg/transformers/sample.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/sec2gmt.go b/internal/pkg/transformers/sec2gmt.go index 02c2cac71..9f02b5953 100644 --- a/internal/pkg/transformers/sec2gmt.go +++ b/internal/pkg/transformers/sec2gmt.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/sec2gmtdate.go b/internal/pkg/transformers/sec2gmtdate.go index 8d208935e..74be2d944 100644 --- a/internal/pkg/transformers/sec2gmtdate.go +++ b/internal/pkg/transformers/sec2gmtdate.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/seqgen.go b/internal/pkg/transformers/seqgen.go index add25ced7..aa3a89820 100644 --- a/internal/pkg/transformers/seqgen.go +++ b/internal/pkg/transformers/seqgen.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/shuffle.go b/internal/pkg/transformers/shuffle.go index cbb7a40c4..44f93fc96 100644 --- a/internal/pkg/transformers/shuffle.go +++ b/internal/pkg/transformers/shuffle.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/skip-trivial-records.go b/internal/pkg/transformers/skip-trivial-records.go index 806d9e0a0..8f5ab8360 100644 --- a/internal/pkg/transformers/skip-trivial-records.go +++ b/internal/pkg/transformers/skip-trivial-records.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/sort-within-records.go b/internal/pkg/transformers/sort-within-records.go index e15d7fd9e..14787cd0c 100644 --- a/internal/pkg/transformers/sort-within-records.go +++ b/internal/pkg/transformers/sort-within-records.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/sort.go b/internal/pkg/transformers/sort.go index 50771d51b..ac39ed29a 100644 --- a/internal/pkg/transformers/sort.go +++ b/internal/pkg/transformers/sort.go @@ -48,9 +48,9 @@ import ( "sort" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/stats1.go b/internal/pkg/transformers/stats1.go index 004855fab..4c137813d 100644 --- a/internal/pkg/transformers/stats1.go +++ b/internal/pkg/transformers/stats1.go @@ -8,10 +8,10 @@ import ( "regexp" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/transformers/utils" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/transformers/utils" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/stats2.go b/internal/pkg/transformers/stats2.go index 6b16d7c89..b56ef5eee 100644 --- a/internal/pkg/transformers/stats2.go +++ b/internal/pkg/transformers/stats2.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/transformers/utils" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/transformers/utils" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/step.go b/internal/pkg/transformers/step.go index 3ff277097..d1ce5fcc6 100644 --- a/internal/pkg/transformers/step.go +++ b/internal/pkg/transformers/step.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) const DEFAULT_STRING_ALPHA = "0.5" diff --git a/internal/pkg/transformers/tac.go b/internal/pkg/transformers/tac.go index c6507765a..21861f6a9 100644 --- a/internal/pkg/transformers/tac.go +++ b/internal/pkg/transformers/tac.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/tail.go b/internal/pkg/transformers/tail.go index 2108e96bf..4ede585c1 100644 --- a/internal/pkg/transformers/tail.go +++ b/internal/pkg/transformers/tail.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/tee.go b/internal/pkg/transformers/tee.go index c009b38dc..0ee822bd4 100644 --- a/internal/pkg/transformers/tee.go +++ b/internal/pkg/transformers/tee.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/output" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/output" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/template.go b/internal/pkg/transformers/template.go index 6840f7ab9..78d69d986 100644 --- a/internal/pkg/transformers/template.go +++ b/internal/pkg/transformers/template.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/top.go b/internal/pkg/transformers/top.go index 33a79411b..679b9ad0a 100644 --- a/internal/pkg/transformers/top.go +++ b/internal/pkg/transformers/top.go @@ -5,10 +5,10 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/transformers/utils" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/transformers/utils" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/unflatten.go b/internal/pkg/transformers/unflatten.go index dadbfb36d..7de69552b 100644 --- a/internal/pkg/transformers/unflatten.go +++ b/internal/pkg/transformers/unflatten.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/uniq.go b/internal/pkg/transformers/uniq.go index 7c7519c6a..433552c6a 100644 --- a/internal/pkg/transformers/uniq.go +++ b/internal/pkg/transformers/uniq.go @@ -5,9 +5,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/unsparsify.go b/internal/pkg/transformers/unsparsify.go index f5ed29c5e..aee99b425 100644 --- a/internal/pkg/transformers/unsparsify.go +++ b/internal/pkg/transformers/unsparsify.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/utils/join-bucket-keeper.go b/internal/pkg/transformers/utils/join-bucket-keeper.go index dc069be85..378d32e79 100644 --- a/internal/pkg/transformers/utils/join-bucket-keeper.go +++ b/internal/pkg/transformers/utils/join-bucket-keeper.go @@ -113,10 +113,10 @@ import ( "os" "strings" - "mlr/internal/pkg/cli" - "mlr/internal/pkg/input" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/cli" + "github.com/johnkerl/miller/internal/pkg/input" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/utils/join-bucket.go b/internal/pkg/transformers/utils/join-bucket.go index 9393d5f02..ef9336cfb 100644 --- a/internal/pkg/transformers/utils/join-bucket.go +++ b/internal/pkg/transformers/utils/join-bucket.go @@ -7,7 +7,7 @@ package utils import ( "container/list" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/utils/percentile-keeper.go b/internal/pkg/transformers/utils/percentile-keeper.go index 344d2f081..30e20cbd2 100644 --- a/internal/pkg/transformers/utils/percentile-keeper.go +++ b/internal/pkg/transformers/utils/percentile-keeper.go @@ -9,7 +9,7 @@ import ( "math" "sort" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/types" ) type PercentileKeeper struct { diff --git a/internal/pkg/transformers/utils/stats1-accumulators.go b/internal/pkg/transformers/utils/stats1-accumulators.go index cc6969d6d..4bd3bb565 100644 --- a/internal/pkg/transformers/utils/stats1-accumulators.go +++ b/internal/pkg/transformers/utils/stats1-accumulators.go @@ -9,8 +9,8 @@ import ( "os" "strings" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/utils/stats2-accumulators.go b/internal/pkg/transformers/utils/stats2-accumulators.go index c7383bb4c..13d86949a 100644 --- a/internal/pkg/transformers/utils/stats2-accumulators.go +++ b/internal/pkg/transformers/utils/stats2-accumulators.go @@ -9,8 +9,8 @@ import ( "math" "os" - "mlr/internal/pkg/lib" - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/transformers/utils/top-keeper.go b/internal/pkg/transformers/utils/top-keeper.go index 7b13be16b..d36700ad1 100644 --- a/internal/pkg/transformers/utils/top-keeper.go +++ b/internal/pkg/transformers/utils/top-keeper.go @@ -5,7 +5,7 @@ package utils import ( - "mlr/internal/pkg/types" + "github.com/johnkerl/miller/internal/pkg/types" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/types/mlrmap_accessors.go b/internal/pkg/types/mlrmap_accessors.go index 12d7ffb55..b425c07f1 100644 --- a/internal/pkg/types/mlrmap_accessors.go +++ b/internal/pkg/types/mlrmap_accessors.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) // IsEmpty determines if an map is empty. diff --git a/internal/pkg/types/mlrmap_flatten_unflatten.go b/internal/pkg/types/mlrmap_flatten_unflatten.go index f4366c0bd..bfea723a7 100644 --- a/internal/pkg/types/mlrmap_flatten_unflatten.go +++ b/internal/pkg/types/mlrmap_flatten_unflatten.go @@ -25,7 +25,7 @@ package types import ( "strings" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/types/mlrmap_json.go b/internal/pkg/types/mlrmap_json.go index bf2195fd4..1a75edec7 100644 --- a/internal/pkg/types/mlrmap_json.go +++ b/internal/pkg/types/mlrmap_json.go @@ -7,8 +7,8 @@ package types import ( "bytes" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/types/mlrval.go b/internal/pkg/types/mlrval.go index 500a38e8f..9075637ab 100644 --- a/internal/pkg/types/mlrval.go +++ b/internal/pkg/types/mlrval.go @@ -46,7 +46,7 @@ type Mlrval struct { mapval *Mlrmap // These are first-class-function literals. Stored here as interface{} to // avoid what would otherwise be a package-dependency cycle with the - // mlr/internal/pkg/dsl/cst package. + // github.com/johnkerl/miller/internal/pkg/dsl/cst package. funcval interface{} } diff --git a/internal/pkg/types/mlrval_accessors.go b/internal/pkg/types/mlrval_accessors.go index 615940099..09ec40a08 100644 --- a/internal/pkg/types/mlrval_accessors.go +++ b/internal/pkg/types/mlrval_accessors.go @@ -5,7 +5,7 @@ import ( "os" "strconv" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/types/mlrval_collections.go b/internal/pkg/types/mlrval_collections.go index 104a41e62..75a36741e 100644 --- a/internal/pkg/types/mlrval_collections.go +++ b/internal/pkg/types/mlrval_collections.go @@ -73,7 +73,7 @@ import ( "fmt" "os" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ================================================================ diff --git a/internal/pkg/types/mlrval_format_test.go b/internal/pkg/types/mlrval_format_test.go index 6f0292ad5..330732917 100644 --- a/internal/pkg/types/mlrval_format_test.go +++ b/internal/pkg/types/mlrval_format_test.go @@ -8,7 +8,7 @@ // * go test // Or: // * cd go -// * go test mlr/internal/pkg/types/... +// * go test github.com/johnkerl/miller/internal/pkg/types/... package types diff --git a/internal/pkg/types/mlrval_functions_booleans.go b/internal/pkg/types/mlrval_functions_booleans.go index 35521056f..3d00230ea 100644 --- a/internal/pkg/types/mlrval_functions_booleans.go +++ b/internal/pkg/types/mlrval_functions_booleans.go @@ -5,7 +5,7 @@ package types import ( - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/internal/pkg/types/mlrval_functions_collections.go b/internal/pkg/types/mlrval_functions_collections.go index a7eb3b605..1fe9fd0fb 100644 --- a/internal/pkg/types/mlrval_functions_collections.go +++ b/internal/pkg/types/mlrval_functions_collections.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ================================================================ diff --git a/internal/pkg/types/mlrval_functions_datetime.go b/internal/pkg/types/mlrval_functions_datetime.go index 7e2d399b4..9ae6e244c 100644 --- a/internal/pkg/types/mlrval_functions_datetime.go +++ b/internal/pkg/types/mlrval_functions_datetime.go @@ -5,10 +5,10 @@ import ( "regexp" "time" + strptime "github.com/johnkerl/miller/internal/pkg/pbnjay-strptime" "github.com/lestrrat-go/strftime" - strptime "mlr/internal/pkg/pbnjay-strptime" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) const ISO8601_TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ" diff --git a/internal/pkg/types/mlrval_functions_mathlib.go b/internal/pkg/types/mlrval_functions_mathlib.go index ce729bfdb..527528200 100644 --- a/internal/pkg/types/mlrval_functions_mathlib.go +++ b/internal/pkg/types/mlrval_functions_mathlib.go @@ -7,7 +7,7 @@ package types import ( "math" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/types/mlrval_functions_random.go b/internal/pkg/types/mlrval_functions_random.go index d642811f3..6e5a4b9e3 100644 --- a/internal/pkg/types/mlrval_functions_random.go +++ b/internal/pkg/types/mlrval_functions_random.go @@ -3,7 +3,7 @@ package types import ( "math" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) func BIF_urand() *Mlrval { diff --git a/internal/pkg/types/mlrval_functions_regex.go b/internal/pkg/types/mlrval_functions_regex.go index afc3e6c3b..72c9af669 100644 --- a/internal/pkg/types/mlrval_functions_regex.go +++ b/internal/pkg/types/mlrval_functions_regex.go @@ -3,7 +3,7 @@ package types import ( "strings" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) // BIF_ssub implements the ssub function -- no-frills string-replace, no diff --git a/internal/pkg/types/mlrval_functions_stats.go b/internal/pkg/types/mlrval_functions_stats.go index 6e1a501d1..3ef436c53 100644 --- a/internal/pkg/types/mlrval_functions_stats.go +++ b/internal/pkg/types/mlrval_functions_stats.go @@ -3,7 +3,7 @@ package types import ( "math" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/types/mlrval_functions_strings.go b/internal/pkg/types/mlrval_functions_strings.go index 5777d5b8a..81dd4e548 100644 --- a/internal/pkg/types/mlrval_functions_strings.go +++ b/internal/pkg/types/mlrval_functions_strings.go @@ -6,7 +6,7 @@ import ( "strings" "unicode/utf8" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ================================================================ diff --git a/internal/pkg/types/mlrval_functions_system.go b/internal/pkg/types/mlrval_functions_system.go index a45a1fd6a..26a857ddb 100644 --- a/internal/pkg/types/mlrval_functions_system.go +++ b/internal/pkg/types/mlrval_functions_system.go @@ -6,8 +6,8 @@ import ( "runtime" "strings" - "mlr/internal/pkg/platform" - "mlr/internal/pkg/version" + "github.com/johnkerl/miller/internal/pkg/platform" + "github.com/johnkerl/miller/internal/pkg/version" ) func BIF_version() *Mlrval { diff --git a/internal/pkg/types/mlrval_functions_types.go b/internal/pkg/types/mlrval_functions_types.go index 202db8c18..c06d06d44 100644 --- a/internal/pkg/types/mlrval_functions_types.go +++ b/internal/pkg/types/mlrval_functions_types.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ================================================================ diff --git a/internal/pkg/types/mlrval_infer.go b/internal/pkg/types/mlrval_infer.go index d77ea9c2d..169751e8f 100644 --- a/internal/pkg/types/mlrval_infer.go +++ b/internal/pkg/types/mlrval_infer.go @@ -7,7 +7,7 @@ package types import ( "strings" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) // ---------------------------------------------------------------- diff --git a/internal/pkg/types/mlrval_json.go b/internal/pkg/types/mlrval_json.go index 097cded92..be2e95cbc 100644 --- a/internal/pkg/types/mlrval_json.go +++ b/internal/pkg/types/mlrval_json.go @@ -14,8 +14,8 @@ import ( "errors" "io" - "mlr/internal/pkg/colorizer" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/colorizer" + "github.com/johnkerl/miller/internal/pkg/lib" ) const MLRVAL_JSON_INDENT_STRING string = " " diff --git a/internal/pkg/types/mlrval_new.go b/internal/pkg/types/mlrval_new.go index ba76e7a93..0ae2dc7ae 100644 --- a/internal/pkg/types/mlrval_new.go +++ b/internal/pkg/types/mlrval_new.go @@ -7,7 +7,7 @@ package types import ( "errors" - "mlr/internal/pkg/lib" + "github.com/johnkerl/miller/internal/pkg/lib" ) func MlrvalFromString(input string) *Mlrval { @@ -58,7 +58,7 @@ func MlrvalFromBoolString(input string) *Mlrval { // The user-defined function is of type 'interface{}' here to avoid what would // otherwise be a package-dependency cycle between this package and -// mlr/internal/pkg/dsl/cst. +// github.com/johnkerl/miller/internal/pkg/dsl/cst. // // Nominally the name argument is the user-specified name if `func f(a, b) { // ... }`, or some autogenerated UUID like `fl0052` if `func (a, b) { ... }`. diff --git a/man/Makefile b/man/Makefile index bfa8270c4..331c2ca7d 100644 --- a/man/Makefile +++ b/man/Makefile @@ -19,6 +19,8 @@ build: mkdir -p ./man1 cp mlr.1 ./man1 +# DESTDIR is for package installs; nominally blank when this is run interactively. +# See also https://www.gnu.org/prep/standards/html_node/DESTDIR.html install: mkdir -p $(DESTDIR)/$(INSTALLDIR) cp mlr.1 $(DESTDIR)/$(INSTALLDIR)/mlr.1 diff --git a/regression_test.go b/regression_test.go index 93bedff2f..6d3af8ade 100644 --- a/regression_test.go +++ b/regression_test.go @@ -5,13 +5,13 @@ import ( "os" "testing" - "mlr/internal/pkg/auxents/regtest" + "github.com/johnkerl/miller/internal/pkg/auxents/regtest" ) // TestRegression is a familiar entry point for regression testing. Miller // regression tests are more flexibly invoked via 'mlr regtest'. However here // is a standard location so people can get at them via 'go test'. Please see -// (as of this writing) src/auxents/regtest for the Miller regtest package. +// (as of this writing) internal/pkg/auxents/regtest for the Miller regtest package. func TestRegression(t *testing.T) { // How much detail to show? There are thousands of cases, organized into a // few hundred top-level directories under ./test/cases. @@ -53,6 +53,10 @@ func TestRegression(t *testing.T) { path := os.Getenv("PATH") os.Setenv("PATH", cwd+":"+path) + // With 'go test' invoked from the repo base directory, the cwd for this code will + // be the tests/ subdirectory. + casePaths := []string{"./test/cases"} // use default + regtester := regtest.NewRegTester( "mlr", // exeName false, // doPopulate @@ -61,9 +65,7 @@ func TestRegression(t *testing.T) { firstNFailsToShow, ) - paths := []string{} // use default - - ok := regtester.Execute(paths) + ok := regtester.Execute(casePaths) if !ok { t.Fatal() } diff --git a/scripts/mcountlines b/scripts/mcountlines index 87ffd1b6a..3c16c481f 100755 --- a/scripts/mcountlines +++ b/scripts/mcountlines @@ -1,14 +1,14 @@ #!/bin/bash wc -l \ - $(find src -name \*.go | grep -v src/parsing) \ - src/parsing/mlr.bnf \ + $(find internal -name \*.go | grep -v internal/pkg/parsing) \ + internal/pkg/parsing/mlr.bnf \ | sort -n echo wc -c \ - $(find src -name \*.go | grep -v src/parsing) \ - src/parsing/mlr.bnf \ + $(find internal -name \*.go | grep -v internal/pkg/parsing) \ + internal/pkg/parsing/mlr.bnf \ | sort -n \ | tail -n 5 diff --git a/todo.txt b/todo.txt index 389eee4f3..2a44e7f5c 100644 --- a/todo.txt +++ b/todo.txt @@ -109,6 +109,10 @@ PUNCHDOWN LIST ================================================================ NON-BLOCKERS +* single UT, hard to invoke w/ new full go.mod path + go test $(ls internal/pkg/lib/*.go|grep -v test) internal/pkg/lib/unbackslash_test.go + etc + * file-formats: NIDX link to headerless CSV * fmtnum(98, "%3d%%") -- ? workaround: fmtnum(98, "%3d") . "%" @@ -216,8 +220,8 @@ t* ranspose ... mlr --icsv --implicit-csv-header --ifs space --oxtab --from elb-log put -q 'print $27' * PR-template etc checklists -* clean up TODO/xxx in src/platform -* mlr regtest doc -- focus on either go/regtest or go/src/auxents/regtest, one linking to the other +* clean up TODO/xxx in internal/pkg/platform +* mlr regtest doc -- focus on either go/regtest or internal/pkg/auxents/regtest, one linking to the other * also: write up how git status after test should show any missed extra-outs @@ -576,208 +580,3 @@ DOC6: ok command-line-arguments 0.083s $ go test src/lib/unbackslash_test.go src/lib/unbackslash.go ok command-line-arguments 0.081s - -================================================================ -godoc checklist: - -12 ./src/platform/shellrun_notwindows.go -17 ./src/platform/getargs_notwindows.go -20 ./src/input/record_reader.go -26 ./src/input/record_reader_factory.go -28 ./src/output/record_writer_factory.go -41 ./src/output/record_writer_nidx.go -42 ./src/lib/rand.go -42 ./src/lib/time.go -43 ./src/lib/unbackslash_test.go -48 ./src/output/record_writer_dkvp.go -49 ./src/runtime/state.go -51 ./src/output/channel_writer.go -51 ./src/platform/shellrun_windows.go -54 ./src/auxents/repl/ast.go -59 ./src/auxents/repl/types.go -64 ./src/cli/mlrcli_util.go -65 ./src/output/record_writer_xtab.go -66 ./src/climain/mlrcli.go -69 ./src/auxents/repl/prompt.go -71 ./src/lib/paragraph.go -72 ./src/cli/verb_utils.go -79 ./src/cli/flatten_unflatten.go -79 ./src/output/record_writer_markdown.go -86 ./src/stream/stream.go -88 ./src/output/record_writer_csv.go -88 ./src/output/record_writer_csvlite.go -89 ./src/lib/readfiles.go -91 ./src/auxents/lecat.go -95 ./src/auxents/auxents.go -95 ./src/auxents/unhex.go -95 ./src/lib/logger.go -96 ./src/lib/halfpipe.go -98 ./src/auxents/repl/dsl.go -104 ./src/auxents/regtest/invoker.go -108 ./src/output/record_writer_json.go -119 ./src/auxents/regtest/entry.go -127 ./src/climain/mlrcli_mlrrc.go -128 ./src/dsl/ast_types.go -128 ./src/input/record_reader_nidx.go -134 ./src/input/record_reader_dkvp.go -139 ./src/input/record_reader_json.go -140 ./src/platform/getargs_windows.go -148 ./src/entrypoint/entrypoint.go -149 ./src/auxents/termcvt.go -153 ./src/lib/ordered-map.go -157 ./src/auxents/hex.go -158 ./src/lib/unbackslash.go -161 ./src/lib/util.go -174 ./src/input/record_reader_xtab.go -176 ./src/auxents/repl/entry.go -190 ./src/lib/regex_test.go -202 ./src/cli/option_types.go -208 ./src/climain/mlrcli_parse.go -223 ./src/lib/file-readers.go -243 ./src/auxents/repl/session.go -256 ./src/input/record_reader_csv.go -278 ./src/lib/stats.go -280 ./src/dsl/ast_build.go -320 ./src/dsl/ast_print.go -331 ./src/output/record_writer_pprint.go -356 ./src/input/record_reader_csvlite.go -393 ./src/output/file-output-handlers.go -430 ./src/lib/mlrmath.go -493 ./src/cli/flag_types.go -509 ./src/runtime/stack.go -571 ./src/colorizer/colorizer.go -610 ./src/auxents/help/entry.go -820 ./src/auxents/regtest/regtester.go -1006 ./src/auxents/repl/verbs.go -2583 ./src/cli/option_parse.go - -21 ./src/types/mlrval_functions_math.go -45 ./src/types/mlrval_functions_system.go -58 ./src/types/mlrmap_print.go -61 ./src/types/mlrval_function_hashing.go -72 ./src/types/mlrval_functions_random.go -100 ./src/types/mlrval_output.go -105 ./src/types/mlrval_typing.go -132 ./src/types/mlrmap.go -134 ./src/types/mlrval_functions_test.go -150 ./src/types/mlrval_functions_stats.go -157 ./src/types/mlrval.go -161 ./src/types/mlrval_functions_regex.go -170 ./src/types/mlrmap_json.go -178 ./src/types/context.go -179 ./src/types/mlrval_format.go -184 ./src/types/mlrval_functions_sort.go -187 ./src/types/mlrval_functions_base.go -201 ./src/types/mlrval_functions_mathlib.go -217 ./src/types/mlrval_functions_bits.go -240 ./src/types/mlrmap_flatten_unflatten.go -283 ./src/types/mlrval_functions_types.go -289 ./src/types/mlrval_accessors.go -299 ./src/types/mlrval_format_test.go -347 ./src/types/mlrval_functions_strings.go -464 ./src/types/mlrval_functions_booleans.go -515 ./src/types/mlrval_new.go -517 ./src/types/mlrval_functions_time.go -531 ./src/types/mlrval_json.go -656 ./src/types/mlrval_collections.go -857 ./src/types/mlrval_functions_collections.go -883 ./src/types/mlrmap_accessors.go -912 ./src/types/mlrval_functions_arithmetic.go - -28 ./src/transformers/utils/join-bucket.go -40 ./src/transformers/aaa_record_transformer.go -79 ./src/transformers/aaa_chain_transformer.go -90 ./src/transformers/check.go -90 ./src/transformers/nothing.go -94 ./src/transformers/utils/top-keeper.go -98 ./src/transformers/tac.go -105 ./src/transformers/skip-trivial-records.go -111 ./src/transformers/fill-empty.go -112 ./src/transformers/regularize.go -116 ./src/transformers/sec2gmtdate.go -117 ./src/transformers/aaa_transformer_table.go -117 ./src/transformers/group-like.go -118 ./src/transformers/altkv.go -124 ./src/transformers/remove-empty-columns.go -128 ./src/transformers/label.go -130 ./src/transformers/sort-within-records.go -137 ./src/transformers/group-by.go -146 ./src/transformers/shuffle.go -148 ./src/transformers/template.go -151 ./src/transformers/tail.go -155 ./src/transformers/json-parse.go -156 ./src/transformers/count-similar.go -160 ./src/transformers/grep.go -165 ./src/transformers/decimate.go -165 ./src/transformers/unflatten.go -166 ./src/transformers/flatten.go -166 ./src/transformers/sec2gmt.go -171 ./src/transformers/bootstrap.go -174 ./src/transformers/json-stringify.go -179 ./src/transformers/head.go -181 ./src/transformers/gap.go -186 ./src/transformers/sample.go -189 ./src/transformers/clean-whitespace.go -190 ./src/transformers/tee.go -193 ./src/transformers/format-values.go -199 ./src/transformers/cat.go -199 ./src/transformers/unsparsify.go -201 ./src/transformers/repeat.go -212 ./src/transformers/seqgen.go -220 ./src/transformers/fill-down.go -234 ./src/transformers/count.go -243 ./src/transformers/rename.go -270 ./src/transformers/cut.go -279 ./src/transformers/most-or-least-frequent.go -280 ./src/transformers/fraction.go -281 ./src/transformers/top.go -305 ./src/transformers/utils/percentile-keeper.go -312 ./src/transformers/reorder.go -331 ./src/transformers/having-fields.go -338 ./src/transformers/bar.go -368 ./src/transformers/histogram.go -384 ./src/transformers/sort.go -395 ./src/transformers/stats1.go -432 ./src/transformers/reshape.go -469 ./src/transformers/stats2.go -511 ./src/transformers/put-or-filter.go -537 ./src/transformers/merge-fields.go -570 ./src/transformers/uniq.go -574 ./src/transformers/nest.go -603 ./src/transformers/step.go -604 ./src/transformers/join.go -667 ./src/transformers/utils/join-bucket-keeper.go -682 ./src/transformers/utils/stats1-accumulators.go -688 ./src/transformers/utils/stats2-accumulators.go - -32 ./src/dsl/cst/signature.go -48 ./src/dsl/cst/env.go -73 ./src/dsl/cst/cond.go -78 ./src/dsl/cst/subroutines.go -89 ./src/dsl/cst/filter.go -90 ./src/dsl/cst/block-exit.go -112 ./src/dsl/cst/assignments.go -118 ./src/dsl/cst/statements.go -123 ./src/dsl/cst/types.go -135 ./src/dsl/cst/blocks.go -146 ./src/dsl/cst/if.go -154 ./src/dsl/cst/while.go -169 ./src/dsl/cst/evaluable.go -177 ./src/dsl/cst/tee.go -213 ./src/dsl/cst/emitf.go -222 ./src/dsl/cst/warn.go -230 ./src/dsl/cst/dump.go -276 ./src/dsl/cst/functions.go -300 ./src/dsl/cst/uds.go -353 ./src/dsl/cst/validate.go -376 ./src/dsl/cst/print.go -382 ./src/dsl/cst/udf.go -425 ./src/dsl/cst/root.go -552 ./src/dsl/cst/collections.go -578 ./src/dsl/cst/keyword_usage.go -684 ./src/dsl/cst/leaves.go -826 ./src/dsl/cst/builtin_functions.go -942 ./src/dsl/cst/for.go -1006 ./src/dsl/cst/emit_emitp.go -1141 ./src/dsl/cst/lvalues.go -1846 ./src/dsl/cst/builtin_function_manager.go diff --git a/tools/build-dsl b/tools/build-dsl index 6bab69f2c..eacbffc68 100755 --- a/tools/build-dsl +++ b/tools/build-dsl @@ -28,8 +28,7 @@ if [ $# -eq 1 ]; then fi # Build the bin/gocc executable: -go get github.com/goccmack/gocc -#go get github.com/johnkerl/gocc +go install github.com/goccmack/gocc bingocc="$HOME/go/bin/gocc" if [ ! -x "$bingocc" ]; then exit 1 diff --git a/vim/syntax/mlr.vim b/vim/syntax/mlr.vim index 39743f7e5..d90d97b33 100644 --- a/vim/syntax/mlr.vim +++ b/vim/syntax/mlr.vim @@ -10,8 +10,7 @@ endif syn case match " ---------------------------------------------------------------- -" Goal: map the lexical elements of the Miller DSL grammar -" https://github.com/johnkerl/miller/blob/main/go/src/parsing/mlr.bnf +" Goal: map the lexical elements of the Miller DSL grammar in mlr.bnf " to Vim syntax options " http://vimdoc.sourceforge.net/htmldoc/syntax.html " ----------------------------------------------------------------