diff --git a/docs/src/file-formats.md b/docs/src/file-formats.md index 9b0cb6362..3af248ce5 100644 --- a/docs/src/file-formats.md +++ b/docs/src/file-formats.md @@ -69,7 +69,7 @@ PPRINT: pretty-printed tabular | 4 5 6 | Record 2: "apple":"4", "bat":"5", "cog":"6" +---------------------+ -Markdown tabular (supported for output only): +Markdown tabular: +-----------------------+ | | apple | bat | cog | | | | --- | --- | --- | | @@ -435,7 +435,8 @@ which renders like this when dropped into various web tools (e.g. github comment ![pix/omd.png](pix/omd.png) -As of Miller 4.3.0, markdown format is supported only for output, not input. +As of Miller 4.3.0, markdown format is supported only for output, not input; as of Miller 6.11.0, markdown format +is supported for input as well. ## XTAB: Vertical tabular @@ -635,19 +636,19 @@ While you can do format conversion using `mlr --icsv --ojson cat myfile.csv`, th FORMAT-CONVERSION KEYSTROKE-SAVER FLAGS As keystroke-savers for format-conversion you may use the following. The letters c, t, j, l, d, n, x, p, and m refer to formats CSV, TSV, DKVP, NIDX, -JSON, JSON Lines, XTAB, PPRINT, and markdown, respectively. Note that markdown -format is available for output only. +JSON, JSON Lines, XTAB, PPRINT, and markdown, respectively. -| In\out | CSV | TSV | JSON | JSONL | DKVP | NIDX | XTAB | PPRINT | Markdown | -+--------+-------+-------+--------+--------+--------+--------+--------+----------+ -| CSV | | --c2t | --c2j | --c2l | --c2d | --c2n | --c2x | --c2p | --c2m | -| TSV | --t2c | | --t2j | --t2l | --t2d | --t2n | --t2x | --t2p | --t2m | -| JSON | --j2c | --j2t | | --j2l | --j2d | --j2n | --j2x | --j2p | --j2m | -| JSONL | --l2c | --l2t | | | --l2d | --l2n | --l2x | --l2p | --l2m | -| DKVP | --d2c | --d2t | --d2j | --d2l | | --d2n | --d2x | --d2p | --d2m | -| NIDX | --n2c | --n2t | --n2j | --n2l | --n2d | | --n2x | --n2p | --n2m | -| XTAB | --x2c | --x2t | --x2j | --x2l | --x2d | --x2n | | --x2p | --x2m | -| PPRINT | --p2c | --p2t | --p2j | --p2l | --p2d | --p2n | --p2x | | --p2m | +| In\out | CSV | TSV | JSON | JSONL | DKVP | NIDX | XTAB | PPRINT | Markdown | ++----------+-------+-------+--------+--------+--------+--------+--------+--------+----------| +| CSV | | --c2t | --c2j | --c2l | --c2d | --c2n | --c2x | --c2p | --c2m | +| TSV | --t2c | | --t2j | --t2l | --t2d | --t2n | --t2x | --t2p | --t2m | +| JSON | --j2c | --j2t | | --j2l | --j2d | --j2n | --j2x | --j2p | --j2m | +| JSONL | --l2c | --l2t | | | --l2d | --l2n | --l2x | --l2p | --l2m | +| DKVP | --d2c | --d2t | --d2j | --d2l | | --d2n | --d2x | --d2p | --d2m | +| NIDX | --n2c | --n2t | --n2j | --n2l | --n2d | | --n2x | --n2p | --n2m | +| XTAB | --x2c | --x2t | --x2j | --x2l | --x2d | --x2n | | --x2p | --x2m | +| PPRINT | --p2c | --p2t | --p2j | --p2l | --p2d | --p2n | --p2x | | --p2m | +| Markdown | --m2c | --m2t | --m2j | --m2l | --m2d | --m2n | --m2x | --m2p | | -p Keystroke-saver for `--nidx --fs space --repifs`. -T Keystroke-saver for `--nidx --fs tab`. diff --git a/docs/src/file-formats.md.in b/docs/src/file-formats.md.in index 8da809fad..7e3d50308 100644 --- a/docs/src/file-formats.md.in +++ b/docs/src/file-formats.md.in @@ -177,7 +177,8 @@ which renders like this when dropped into various web tools (e.g. github comment ![pix/omd.png](pix/omd.png) -As of Miller 4.3.0, markdown format is supported only for output, not input. +As of Miller 4.3.0, markdown format is supported only for output, not input; as of Miller 6.11.0, markdown format +is supported for input as well. ## XTAB: Vertical tabular diff --git a/docs/src/manpage.md b/docs/src/manpage.md index 2381322af..e2123e752 100644 --- a/docs/src/manpage.md +++ b/docs/src/manpage.md @@ -101,7 +101,7 @@ This is simply a copy of what you should see on running `man mlr` at a command p | 4 5 6 | Record 2: "apple":"4", "bat":"5", "cog":"6" +---------------------+ - Markdown tabular (supported for output only): + Markdown tabular: +-----------------------+ | | apple | bat | cog | | | | --- | --- | --- | | @@ -381,6 +381,7 @@ This is simply a copy of what you should see on running `man mlr` at a command p seqgen verb, which is more useful/intuitive. --ijson Use JSON format for input data. --ijsonl Use JSON Lines format for input data. + --imd or --imarkdown Use markdown-tabular format for input data. --inidx Use NIDX format for input data. --io {format name} Use format name for input and output data. For example: `--io csv` is the same as `--csv`. @@ -398,7 +399,7 @@ This is simply a copy of what you should see on running `man mlr` at a command p --odkvp Use DKVP format for output data. --ojson Use JSON format for output data. --ojsonl Use JSON Lines format for output data. - --omd Use markdown-tabular format for output data. + --omd or --omarkdown Use markdown-tabular format for output data. --onidx Use NIDX format for output data. --opprint Use PPRINT format for output data. --otsv Use TSV format for output data. @@ -440,19 +441,19 @@ This is simply a copy of what you should see on running `man mlr` at a command p 1mFORMAT-CONVERSION KEYSTROKE-SAVER FLAGS0m As keystroke-savers for format-conversion you may use the following. The letters c, t, j, l, d, n, x, p, and m refer to formats CSV, TSV, DKVP, NIDX, - JSON, JSON Lines, XTAB, PPRINT, and markdown, respectively. Note that markdown - format is available for output only. + JSON, JSON Lines, XTAB, PPRINT, and markdown, respectively. - | In\out | CSV | TSV | JSON | JSONL | DKVP | NIDX | XTAB | PPRINT | Markdown | - +--------+-------+-------+--------+--------+--------+--------+--------+----------+ - | CSV | | --c2t | --c2j | --c2l | --c2d | --c2n | --c2x | --c2p | --c2m | - | TSV | --t2c | | --t2j | --t2l | --t2d | --t2n | --t2x | --t2p | --t2m | - | JSON | --j2c | --j2t | | --j2l | --j2d | --j2n | --j2x | --j2p | --j2m | - | JSONL | --l2c | --l2t | | | --l2d | --l2n | --l2x | --l2p | --l2m | - | DKVP | --d2c | --d2t | --d2j | --d2l | | --d2n | --d2x | --d2p | --d2m | - | NIDX | --n2c | --n2t | --n2j | --n2l | --n2d | | --n2x | --n2p | --n2m | - | XTAB | --x2c | --x2t | --x2j | --x2l | --x2d | --x2n | | --x2p | --x2m | - | PPRINT | --p2c | --p2t | --p2j | --p2l | --p2d | --p2n | --p2x | | --p2m | + | In\out | CSV | TSV | JSON | JSONL | DKVP | NIDX | XTAB | PPRINT | Markdown | + +----------+-------+-------+--------+--------+--------+--------+--------+--------+----------| + | CSV | | --c2t | --c2j | --c2l | --c2d | --c2n | --c2x | --c2p | --c2m | + | TSV | --t2c | | --t2j | --t2l | --t2d | --t2n | --t2x | --t2p | --t2m | + | JSON | --j2c | --j2t | | --j2l | --j2d | --j2n | --j2x | --j2p | --j2m | + | JSONL | --l2c | --l2t | | | --l2d | --l2n | --l2x | --l2p | --l2m | + | DKVP | --d2c | --d2t | --d2j | --d2l | | --d2n | --d2x | --d2p | --d2m | + | NIDX | --n2c | --n2t | --n2j | --n2l | --n2d | | --n2x | --n2p | --n2m | + | XTAB | --x2c | --x2t | --x2j | --x2l | --x2d | --x2n | | --x2p | --x2m | + | PPRINT | --p2c | --p2t | --p2j | --p2l | --p2d | --p2n | --p2x | | --p2m | + | Markdown | --m2c | --m2t | --m2j | --m2l | --m2d | --m2n | --m2x | --m2p | | -p Keystroke-saver for `--nidx --fs space --repifs`. -T Keystroke-saver for `--nidx --fs tab`. diff --git a/docs/src/manpage.txt b/docs/src/manpage.txt index 4edeb4b37..ce0a53994 100644 --- a/docs/src/manpage.txt +++ b/docs/src/manpage.txt @@ -80,7 +80,7 @@ | 4 5 6 | Record 2: "apple":"4", "bat":"5", "cog":"6" +---------------------+ - Markdown tabular (supported for output only): + Markdown tabular: +-----------------------+ | | apple | bat | cog | | | | --- | --- | --- | | @@ -360,6 +360,7 @@ seqgen verb, which is more useful/intuitive. --ijson Use JSON format for input data. --ijsonl Use JSON Lines format for input data. + --imd or --imarkdown Use markdown-tabular format for input data. --inidx Use NIDX format for input data. --io {format name} Use format name for input and output data. For example: `--io csv` is the same as `--csv`. @@ -377,7 +378,7 @@ --odkvp Use DKVP format for output data. --ojson Use JSON format for output data. --ojsonl Use JSON Lines format for output data. - --omd Use markdown-tabular format for output data. + --omd or --omarkdown Use markdown-tabular format for output data. --onidx Use NIDX format for output data. --opprint Use PPRINT format for output data. --otsv Use TSV format for output data. @@ -419,19 +420,19 @@ 1mFORMAT-CONVERSION KEYSTROKE-SAVER FLAGS0m As keystroke-savers for format-conversion you may use the following. The letters c, t, j, l, d, n, x, p, and m refer to formats CSV, TSV, DKVP, NIDX, - JSON, JSON Lines, XTAB, PPRINT, and markdown, respectively. Note that markdown - format is available for output only. + JSON, JSON Lines, XTAB, PPRINT, and markdown, respectively. - | In\out | CSV | TSV | JSON | JSONL | DKVP | NIDX | XTAB | PPRINT | Markdown | - +--------+-------+-------+--------+--------+--------+--------+--------+----------+ - | CSV | | --c2t | --c2j | --c2l | --c2d | --c2n | --c2x | --c2p | --c2m | - | TSV | --t2c | | --t2j | --t2l | --t2d | --t2n | --t2x | --t2p | --t2m | - | JSON | --j2c | --j2t | | --j2l | --j2d | --j2n | --j2x | --j2p | --j2m | - | JSONL | --l2c | --l2t | | | --l2d | --l2n | --l2x | --l2p | --l2m | - | DKVP | --d2c | --d2t | --d2j | --d2l | | --d2n | --d2x | --d2p | --d2m | - | NIDX | --n2c | --n2t | --n2j | --n2l | --n2d | | --n2x | --n2p | --n2m | - | XTAB | --x2c | --x2t | --x2j | --x2l | --x2d | --x2n | | --x2p | --x2m | - | PPRINT | --p2c | --p2t | --p2j | --p2l | --p2d | --p2n | --p2x | | --p2m | + | In\out | CSV | TSV | JSON | JSONL | DKVP | NIDX | XTAB | PPRINT | Markdown | + +----------+-------+-------+--------+--------+--------+--------+--------+--------+----------| + | CSV | | --c2t | --c2j | --c2l | --c2d | --c2n | --c2x | --c2p | --c2m | + | TSV | --t2c | | --t2j | --t2l | --t2d | --t2n | --t2x | --t2p | --t2m | + | JSON | --j2c | --j2t | | --j2l | --j2d | --j2n | --j2x | --j2p | --j2m | + | JSONL | --l2c | --l2t | | | --l2d | --l2n | --l2x | --l2p | --l2m | + | DKVP | --d2c | --d2t | --d2j | --d2l | | --d2n | --d2x | --d2p | --d2m | + | NIDX | --n2c | --n2t | --n2j | --n2l | --n2d | | --n2x | --n2p | --n2m | + | XTAB | --x2c | --x2t | --x2j | --x2l | --x2d | --x2n | | --x2p | --x2m | + | PPRINT | --p2c | --p2t | --p2j | --p2l | --p2d | --p2n | --p2x | | --p2m | + | Markdown | --m2c | --m2t | --m2j | --m2l | --m2d | --m2n | --m2x | --m2p | | -p Keystroke-saver for `--nidx --fs space --repifs`. -T Keystroke-saver for `--nidx --fs tab`. diff --git a/docs/src/reference-main-flag-list.md b/docs/src/reference-main-flag-list.md index 758f10a37..fde4d9496 100644 --- a/docs/src/reference-main-flag-list.md +++ b/docs/src/reference-main-flag-list.md @@ -157,6 +157,7 @@ are overridden in all cases by setting output format to `format2`. * `--igen`: Ignore input files and instead generate sequential numeric input using --gen-field-name, --gen-start, --gen-step, and --gen-stop values. See also the seqgen verb, which is more useful/intuitive. * `--ijson`: Use JSON format for input data. * `--ijsonl`: Use JSON Lines format for input data. +* `--imd or --imarkdown`: Use markdown-tabular format for input data. * `--inidx`: Use NIDX format for input data. * `--io {format name}`: Use format name for input and output data. For example: `--io csv` is the same as `--csv`. * `--ipprint`: Use PPRINT format for input data. @@ -173,7 +174,7 @@ are overridden in all cases by setting output format to `format2`. * `--odkvp`: Use DKVP format for output data. * `--ojson`: Use JSON format for output data. * `--ojsonl`: Use JSON Lines format for output data. -* `--omd`: Use markdown-tabular format for output data. +* `--omd or --omarkdown`: Use markdown-tabular format for output data. * `--onidx`: Use NIDX format for output data. * `--opprint`: Use PPRINT format for output data. * `--otsv`: Use TSV format for output data. diff --git a/man/manpage.txt b/man/manpage.txt index 4edeb4b37..ce0a53994 100644 --- a/man/manpage.txt +++ b/man/manpage.txt @@ -80,7 +80,7 @@ | 4 5 6 | Record 2: "apple":"4", "bat":"5", "cog":"6" +---------------------+ - Markdown tabular (supported for output only): + Markdown tabular: +-----------------------+ | | apple | bat | cog | | | | --- | --- | --- | | @@ -360,6 +360,7 @@ seqgen verb, which is more useful/intuitive. --ijson Use JSON format for input data. --ijsonl Use JSON Lines format for input data. + --imd or --imarkdown Use markdown-tabular format for input data. --inidx Use NIDX format for input data. --io {format name} Use format name for input and output data. For example: `--io csv` is the same as `--csv`. @@ -377,7 +378,7 @@ --odkvp Use DKVP format for output data. --ojson Use JSON format for output data. --ojsonl Use JSON Lines format for output data. - --omd Use markdown-tabular format for output data. + --omd or --omarkdown Use markdown-tabular format for output data. --onidx Use NIDX format for output data. --opprint Use PPRINT format for output data. --otsv Use TSV format for output data. @@ -419,19 +420,19 @@ 1mFORMAT-CONVERSION KEYSTROKE-SAVER FLAGS0m As keystroke-savers for format-conversion you may use the following. The letters c, t, j, l, d, n, x, p, and m refer to formats CSV, TSV, DKVP, NIDX, - JSON, JSON Lines, XTAB, PPRINT, and markdown, respectively. Note that markdown - format is available for output only. + JSON, JSON Lines, XTAB, PPRINT, and markdown, respectively. - | In\out | CSV | TSV | JSON | JSONL | DKVP | NIDX | XTAB | PPRINT | Markdown | - +--------+-------+-------+--------+--------+--------+--------+--------+----------+ - | CSV | | --c2t | --c2j | --c2l | --c2d | --c2n | --c2x | --c2p | --c2m | - | TSV | --t2c | | --t2j | --t2l | --t2d | --t2n | --t2x | --t2p | --t2m | - | JSON | --j2c | --j2t | | --j2l | --j2d | --j2n | --j2x | --j2p | --j2m | - | JSONL | --l2c | --l2t | | | --l2d | --l2n | --l2x | --l2p | --l2m | - | DKVP | --d2c | --d2t | --d2j | --d2l | | --d2n | --d2x | --d2p | --d2m | - | NIDX | --n2c | --n2t | --n2j | --n2l | --n2d | | --n2x | --n2p | --n2m | - | XTAB | --x2c | --x2t | --x2j | --x2l | --x2d | --x2n | | --x2p | --x2m | - | PPRINT | --p2c | --p2t | --p2j | --p2l | --p2d | --p2n | --p2x | | --p2m | + | In\out | CSV | TSV | JSON | JSONL | DKVP | NIDX | XTAB | PPRINT | Markdown | + +----------+-------+-------+--------+--------+--------+--------+--------+--------+----------| + | CSV | | --c2t | --c2j | --c2l | --c2d | --c2n | --c2x | --c2p | --c2m | + | TSV | --t2c | | --t2j | --t2l | --t2d | --t2n | --t2x | --t2p | --t2m | + | JSON | --j2c | --j2t | | --j2l | --j2d | --j2n | --j2x | --j2p | --j2m | + | JSONL | --l2c | --l2t | | | --l2d | --l2n | --l2x | --l2p | --l2m | + | DKVP | --d2c | --d2t | --d2j | --d2l | | --d2n | --d2x | --d2p | --d2m | + | NIDX | --n2c | --n2t | --n2j | --n2l | --n2d | | --n2x | --n2p | --n2m | + | XTAB | --x2c | --x2t | --x2j | --x2l | --x2d | --x2n | | --x2p | --x2m | + | PPRINT | --p2c | --p2t | --p2j | --p2l | --p2d | --p2n | --p2x | | --p2m | + | Markdown | --m2c | --m2t | --m2j | --m2l | --m2d | --m2n | --m2x | --m2p | | -p Keystroke-saver for `--nidx --fs space --repifs`. -T Keystroke-saver for `--nidx --fs tab`. diff --git a/man/mlr.1 b/man/mlr.1 index a9367fead..f7dde70fe 100644 --- a/man/mlr.1 +++ b/man/mlr.1 @@ -111,7 +111,7 @@ PPRINT: pretty-printed tabular | 4 5 6 | Record 2: "apple":"4", "bat":"5", "cog":"6" +---------------------+ -Markdown tabular (supported for output only): +Markdown tabular: +-----------------------+ | | apple | bat | cog | | | | --- | --- | --- | | @@ -441,6 +441,7 @@ are overridden in all cases by setting output format to `format2`. seqgen verb, which is more useful/intuitive. --ijson Use JSON format for input data. --ijsonl Use JSON Lines format for input data. +--imd or --imarkdown Use markdown-tabular format for input data. --inidx Use NIDX format for input data. --io {format name} Use format name for input and output data. For example: `--io csv` is the same as `--csv`. @@ -458,7 +459,7 @@ are overridden in all cases by setting output format to `format2`. --odkvp Use DKVP format for output data. --ojson Use JSON format for output data. --ojsonl Use JSON Lines format for output data. ---omd Use markdown-tabular format for output data. +--omd or --omarkdown Use markdown-tabular format for output data. --onidx Use NIDX format for output data. --opprint Use PPRINT format for output data. --otsv Use TSV format for output data. @@ -516,19 +517,19 @@ See the Flatten/unflatten doc page for more information. .nf As keystroke-savers for format-conversion you may use the following. The letters c, t, j, l, d, n, x, p, and m refer to formats CSV, TSV, DKVP, NIDX, -JSON, JSON Lines, XTAB, PPRINT, and markdown, respectively. Note that markdown -format is available for output only. +JSON, JSON Lines, XTAB, PPRINT, and markdown, respectively. -| In\eout | CSV | TSV | JSON | JSONL | DKVP | NIDX | XTAB | PPRINT | Markdown | -+--------+-------+-------+--------+--------+--------+--------+--------+----------+ -| CSV | | --c2t | --c2j | --c2l | --c2d | --c2n | --c2x | --c2p | --c2m | -| TSV | --t2c | | --t2j | --t2l | --t2d | --t2n | --t2x | --t2p | --t2m | -| JSON | --j2c | --j2t | | --j2l | --j2d | --j2n | --j2x | --j2p | --j2m | -| JSONL | --l2c | --l2t | | | --l2d | --l2n | --l2x | --l2p | --l2m | -| DKVP | --d2c | --d2t | --d2j | --d2l | | --d2n | --d2x | --d2p | --d2m | -| NIDX | --n2c | --n2t | --n2j | --n2l | --n2d | | --n2x | --n2p | --n2m | -| XTAB | --x2c | --x2t | --x2j | --x2l | --x2d | --x2n | | --x2p | --x2m | -| PPRINT | --p2c | --p2t | --p2j | --p2l | --p2d | --p2n | --p2x | | --p2m | +| In\eout | CSV | TSV | JSON | JSONL | DKVP | NIDX | XTAB | PPRINT | Markdown | ++----------+-------+-------+--------+--------+--------+--------+--------+--------+----------| +| CSV | | --c2t | --c2j | --c2l | --c2d | --c2n | --c2x | --c2p | --c2m | +| TSV | --t2c | | --t2j | --t2l | --t2d | --t2n | --t2x | --t2p | --t2m | +| JSON | --j2c | --j2t | | --j2l | --j2d | --j2n | --j2x | --j2p | --j2m | +| JSONL | --l2c | --l2t | | | --l2d | --l2n | --l2x | --l2p | --l2m | +| DKVP | --d2c | --d2t | --d2j | --d2l | | --d2n | --d2x | --d2p | --d2m | +| NIDX | --n2c | --n2t | --n2j | --n2l | --n2d | | --n2x | --n2p | --n2m | +| XTAB | --x2c | --x2t | --x2j | --x2l | --x2d | --x2n | | --x2p | --x2m | +| PPRINT | --p2c | --p2t | --p2j | --p2l | --p2d | --p2n | --p2x | | --p2m | +| Markdown | --m2c | --m2t | --m2j | --m2l | --m2d | --m2n | --m2x | --m2p | | -p Keystroke-saver for `--nidx --fs space --repifs`. -T Keystroke-saver for `--nidx --fs tab`. diff --git a/pkg/cli/option_parse.go b/pkg/cli/option_parse.go index aa01c17ce..3cec34dc6 100644 --- a/pkg/cli/option_parse.go +++ b/pkg/cli/option_parse.go @@ -762,6 +762,9 @@ var FileFormatFlagSection = FlagSection{ parser: func(args []string, argc int, pargi *int, options *TOptions) { CheckArgCount(args, *pargi, argc, 2) options.ReaderOptions.InputFileFormat = args[*pargi+1] + if options.ReaderOptions.InputFileFormat == "md" { + options.ReaderOptions.InputFileFormat = "markdown" // alias + } *pargi += 2 }, }, @@ -823,6 +826,9 @@ var FileFormatFlagSection = FlagSection{ parser: func(args []string, argc int, pargi *int, options *TOptions) { CheckArgCount(args, *pargi, argc, 2) options.WriterOptions.OutputFileFormat = args[*pargi+1] + if options.WriterOptions.OutputFileFormat == "md" { + options.WriterOptions.OutputFileFormat = "markdown" // alias + } *pargi += 2 }, }, @@ -896,8 +902,19 @@ var FileFormatFlagSection = FlagSection{ }, { - name: "--omd", - help: "Use markdown-tabular format for output data.", + name: "--imd", + altNames: []string{"--imarkdown"}, + help: "Use markdown-tabular format for input data.", + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "markdown" + *pargi += 1 + }, + }, + + { + name: "--omd", + altNames: []string{"--omarkdown"}, + help: "Use markdown-tabular format for output data.", parser: func(args []string, argc int, pargi *int, options *TOptions) { options.WriterOptions.OutputFileFormat = "markdown" *pargi += 1 @@ -1151,19 +1168,19 @@ var FileFormatFlagSection = FlagSection{ func FormatConversionKeystrokeSaverPrintInfo() { fmt.Println(`As keystroke-savers for format-conversion you may use the following. The letters c, t, j, l, d, n, x, p, and m refer to formats CSV, TSV, DKVP, NIDX, -JSON, JSON Lines, XTAB, PPRINT, and markdown, respectively. Note that markdown -format is available for output only. +JSON, JSON Lines, XTAB, PPRINT, and markdown, respectively. -| In\out | CSV | TSV | JSON | JSONL | DKVP | NIDX | XTAB | PPRINT | Markdown | -+--------+-------+-------+--------+--------+--------+--------+--------+----------+ -| CSV | | --c2t | --c2j | --c2l | --c2d | --c2n | --c2x | --c2p | --c2m | -| TSV | --t2c | | --t2j | --t2l | --t2d | --t2n | --t2x | --t2p | --t2m | -| JSON | --j2c | --j2t | | --j2l | --j2d | --j2n | --j2x | --j2p | --j2m | -| JSONL | --l2c | --l2t | | | --l2d | --l2n | --l2x | --l2p | --l2m | -| DKVP | --d2c | --d2t | --d2j | --d2l | | --d2n | --d2x | --d2p | --d2m | -| NIDX | --n2c | --n2t | --n2j | --n2l | --n2d | | --n2x | --n2p | --n2m | -| XTAB | --x2c | --x2t | --x2j | --x2l | --x2d | --x2n | | --x2p | --x2m | -| PPRINT | --p2c | --p2t | --p2j | --p2l | --p2d | --p2n | --p2x | | --p2m |`) +| In\out | CSV | TSV | JSON | JSONL | DKVP | NIDX | XTAB | PPRINT | Markdown | ++----------+-------+-------+--------+--------+--------+--------+--------+--------+----------| +| CSV | | --c2t | --c2j | --c2l | --c2d | --c2n | --c2x | --c2p | --c2m | +| TSV | --t2c | | --t2j | --t2l | --t2d | --t2n | --t2x | --t2p | --t2m | +| JSON | --j2c | --j2t | | --j2l | --j2d | --j2n | --j2x | --j2p | --j2m | +| JSONL | --l2c | --l2t | | | --l2d | --l2n | --l2x | --l2p | --l2m | +| DKVP | --d2c | --d2t | --d2j | --d2l | | --d2n | --d2x | --d2p | --d2m | +| NIDX | --n2c | --n2t | --n2j | --n2l | --n2d | | --n2x | --n2p | --n2m | +| XTAB | --x2c | --x2t | --x2j | --x2l | --x2d | --x2n | | --x2p | --x2m | +| PPRINT | --p2c | --p2t | --p2j | --p2l | --p2d | --p2n | --p2x | | --p2m | +| Markdown | --m2c | --m2t | --m2j | --m2l | --m2d | --m2n | --m2x | --m2p | |`) } func init() { FormatConversionKeystrokeSaverFlagSection.Sort() } @@ -1288,6 +1305,18 @@ var FormatConversionKeystrokeSaverFlagSection = FlagSection{ *pargi += 1 }, }, + { + name: "--c2m", + help: "Use CSV for input, markdown-tabular for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "csv" + options.WriterOptions.OutputFileFormat = "markdown" + *pargi += 1 + }, + }, { name: "--c2b", help: "Use CSV for input, PPRINT with `--barred` for output.", @@ -1408,6 +1437,18 @@ var FormatConversionKeystrokeSaverFlagSection = FlagSection{ *pargi += 1 }, }, + { + name: "--t2m", + help: "Use TSV for input, markdown tabular for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "tsv" + options.WriterOptions.OutputFileFormat = "markdown" + *pargi += 1 + }, + }, { name: "--t2b", help: "Use TSV for input, PPRINT with `--barred` for output.", @@ -1527,6 +1568,18 @@ var FormatConversionKeystrokeSaverFlagSection = FlagSection{ *pargi += 1 }, }, + { + name: "--d2m", + help: "Use DKVP for input, markdown tabular for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "dkvp" + options.WriterOptions.OutputFileFormat = "markdown" + *pargi += 1 + }, + }, { name: "--d2b", help: "Use DKVP for input, PPRINT with `--barred` for output.", @@ -1642,6 +1695,18 @@ var FormatConversionKeystrokeSaverFlagSection = FlagSection{ *pargi += 1 }, }, + { + name: "--n2m", + help: "Use NIDX for input, markdown tabular for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "nidx" + options.WriterOptions.OutputFileFormat = "markdown" + *pargi += 1 + }, + }, { name: "--n2b", help: "Use NIDX for input, PPRINT with `--barred` for output.", @@ -1756,6 +1821,18 @@ var FormatConversionKeystrokeSaverFlagSection = FlagSection{ *pargi += 1 }, }, + { + name: "--j2m", + help: "Use JSON for input, markdown-tabular for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "json" + options.WriterOptions.OutputFileFormat = "markdown" + *pargi += 1 + }, + }, { name: "--j2b", help: "Use JSON for input, PPRINT with --barred for output.", @@ -1867,6 +1944,18 @@ var FormatConversionKeystrokeSaverFlagSection = FlagSection{ *pargi += 1 }, }, + { + name: "--l2m", + help: "Use JSON Lines for input, markdown-tabular for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "json" + options.WriterOptions.OutputFileFormat = "markdown" + *pargi += 1 + }, + }, { name: "--l2b", help: "Use JSON Lines for input, PPRINT with --barred for output.", @@ -2023,6 +2112,115 @@ var FormatConversionKeystrokeSaverFlagSection = FlagSection{ }, }, + { + name: "--m2c", + help: "Use markdown-tabular for input, CSV for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "markdown" + options.WriterOptions.OutputFileFormat = "csv" + options.ReaderOptions.ifsWasSpecified = true + options.WriterOptions.orsWasSpecified = true + *pargi += 1 + }, + }, + { + name: "--m2t", + help: "Use markdown-tabular for input, TSV for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "markdown" + options.WriterOptions.OutputFileFormat = "tsv" + options.ReaderOptions.ifsWasSpecified = true + *pargi += 1 + }, + }, + { + name: "--m2d", + help: "Use markdown-tabular for input, DKVP for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "markdown" + options.WriterOptions.OutputFileFormat = "dkvp" + options.ReaderOptions.ifsWasSpecified = true + *pargi += 1 + }, + }, + { + name: "--m2n", + help: "Use markdown-tabular for input, NIDX for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "markdown" + options.WriterOptions.OutputFileFormat = "nidx" + options.ReaderOptions.ifsWasSpecified = true + *pargi += 1 + }, + }, + { + name: "--m2j", + help: "Use markdown-tabular for input, JSON for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "markdown" + options.WriterOptions.OutputFileFormat = "json" + options.WriterOptions.WrapJSONOutputInOuterList = true + options.WriterOptions.JSONOutputMultiline = true + options.ReaderOptions.ifsWasSpecified = true + *pargi += 1 + }, + }, + { + name: "--m2l", + help: "Use markdown-tabular for input, JSON Lines for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "markdown" + options.WriterOptions.OutputFileFormat = "json" + options.WriterOptions.WrapJSONOutputInOuterList = false + options.WriterOptions.JSONOutputMultiline = false + options.ReaderOptions.ifsWasSpecified = true + *pargi += 1 + }, + }, + { + name: "--m2x", + help: "Use markdown-tabular for input, XTAB for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "markdown" + options.WriterOptions.OutputFileFormat = "xtab" + options.ReaderOptions.ifsWasSpecified = true + *pargi += 1 + }, + }, + { + name: "--m2p", + help: "Use markdown-tabular for input, PPRINT for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "markdown" + options.WriterOptions.OutputFileFormat = "pprint" + *pargi += 1 + }, + }, + { name: "--x2c", help: "Use XTAB for input, CSV for output.", @@ -2112,6 +2310,18 @@ var FormatConversionKeystrokeSaverFlagSection = FlagSection{ *pargi += 1 }, }, + { + name: "--x2m", + help: "Use XTAB for input, markdown-tabular for output.", + // For format-conversion keystroke-savers, a matrix is plenty -- we don't + // need to print a tedious 60-line list. + suppressFlagEnumeration: true, + parser: func(args []string, argc int, pargi *int, options *TOptions) { + options.ReaderOptions.InputFileFormat = "xtab" + options.WriterOptions.OutputFileFormat = "markdown" + *pargi += 1 + }, + }, { name: "--x2b", help: "Use XTAB for input, PPRINT with `--barred` for output.", diff --git a/pkg/input/record_reader_factory.go b/pkg/input/record_reader_factory.go index e8328fd51..26d2f81ed 100644 --- a/pkg/input/record_reader_factory.go +++ b/pkg/input/record_reader_factory.go @@ -18,6 +18,10 @@ func Create(readerOptions *cli.TReaderOptions, recordsPerBatch int64) (IRecordRe return NewRecordReaderJSON(readerOptions, recordsPerBatch) case "nidx": return NewRecordReaderNIDX(readerOptions, recordsPerBatch) + case "md": + return NewRecordReaderMarkdown(readerOptions, recordsPerBatch) + case "markdown": + return NewRecordReaderMarkdown(readerOptions, recordsPerBatch) case "pprint": return NewRecordReaderPPRINT(readerOptions, recordsPerBatch) case "tsv": diff --git a/pkg/input/record_reader_markdown.go b/pkg/input/record_reader_markdown.go new file mode 100644 index 000000000..22cc3a078 --- /dev/null +++ b/pkg/input/record_reader_markdown.go @@ -0,0 +1,30 @@ +package input + +import ( + "regexp" + + "github.com/johnkerl/miller/pkg/cli" +) + +func NewRecordReaderMarkdown( + readerOptions *cli.TReaderOptions, + recordsPerBatch int64, +) (IRecordReader, error) { + + readerOptions.IFS = "|" + readerOptions.AllowRepeatIFS = false + + reader := &RecordReaderPprintBarredOrMarkdown{ + readerOptions: readerOptions, + recordsPerBatch: recordsPerBatch, + separatorMatcher: regexp.MustCompile(`^\|[-\| ]+\|$`), + fieldSplitter: newFieldSplitter(readerOptions), + } + if reader.readerOptions.UseImplicitHeader { + reader.recordBatchGetter = getRecordBatchImplicitPprintHeader + } else { + reader.recordBatchGetter = getRecordBatchExplicitPprintHeader + } + return reader, nil + +} diff --git a/pkg/input/record_reader_pprint.go b/pkg/input/record_reader_pprint.go index 8adad8756..7495a8d80 100644 --- a/pkg/input/record_reader_pprint.go +++ b/pkg/input/record_reader_pprint.go @@ -1,23 +1,5 @@ package input -// Multi-file cases: -// -// a,a a,b c d -// -- FILE1: -- FILE1: -- FILE1: -- FILE1: -// a,b,c a,b,c a,b,c a,b,c -// 1,2,3 1,2,3 1,2,3 1,2,3 -// 4,5,6 4,5,6 4,5,6 4,5,6 -// -- FILE2: -- FILE2: -// a,b,c d,e,f,g a,b,c d,e,f -// 7,8,9 3,4,5,6 7,8,9 3,4,5 -// --OUTPUT: --OUTPUT: --OUTPUT: --OUTPUT: -// a,b,c a,b,c a,b,c a,b,c -// 1,2,3 1,2,3 1,2,3 1,2,3 -// 4,5,6 4,5,6 4,5,6 4,5,6 -// 7,8,9 7,8,9 -// d,e,f,g d,e,f -// 3,4,5,6 3,4,5 - import ( "container/list" "fmt" @@ -39,14 +21,13 @@ func NewRecordReaderPPRINT( if readerOptions.BarredPprintInput { // Implemented in this file - // XXX TEMP readerOptions.IFS = "|" readerOptions.AllowRepeatIFS = false - reader := &RecordReaderPprintBarred{ + reader := &RecordReaderPprintBarredOrMarkdown{ readerOptions: readerOptions, recordsPerBatch: recordsPerBatch, - separatorMatcher: regexp.MustCompile(`^\+[-+]*\+`), + separatorMatcher: regexp.MustCompile(`^\+[-+]*\+$`), fieldSplitter: newFieldSplitter(readerOptions), } if reader.readerOptions.UseImplicitHeader { @@ -76,7 +57,7 @@ func NewRecordReaderPPRINT( } } -type RecordReaderPprintBarred struct { +type RecordReaderPprintBarredOrMarkdown struct { readerOptions *cli.TReaderOptions recordsPerBatch int64 // distinct from readerOptions.RecordsPerBatch for join/repl @@ -91,7 +72,7 @@ type RecordReaderPprintBarred struct { // recordBatchGetterPprint points to either an explicit-PPRINT-header or // implicit-PPRINT-header record-batch getter. type recordBatchGetterPprint func( - reader *RecordReaderPprintBarred, + reader *RecordReaderPprintBarredOrMarkdown, linesChannel <-chan *list.List, filename string, context *types.Context, @@ -101,7 +82,7 @@ type recordBatchGetterPprint func( eof bool, ) -func (reader *RecordReaderPprintBarred) Read( +func (reader *RecordReaderPprintBarredOrMarkdown) Read( filenames []string, context types.Context, readerChannel chan<- *list.List, // list of *types.RecordAndContext @@ -154,7 +135,7 @@ func (reader *RecordReaderPprintBarred) Read( readerChannel <- types.NewEndOfStreamMarkerList(&context) } -func (reader *RecordReaderPprintBarred) processHandle( +func (reader *RecordReaderPprintBarredOrMarkdown) processHandle( handle io.Reader, filename string, context *types.Context, @@ -183,7 +164,7 @@ func (reader *RecordReaderPprintBarred) processHandle( } func getRecordBatchExplicitPprintHeader( - reader *RecordReaderPprintBarred, + reader *RecordReaderPprintBarredOrMarkdown, linesChannel <-chan *list.List, filename string, context *types.Context, @@ -242,6 +223,9 @@ func getRecordBatchExplicitPprintHeader( // Skip the leading and trailing pipes paddedFields := reader.fieldSplitter.Split(line) npad := len(paddedFields) + if npad < 2 { + continue + } fields := make([]string, npad-2) for i, _ := range paddedFields { if i == 0 || i == npad-1 { @@ -318,7 +302,7 @@ func getRecordBatchExplicitPprintHeader( } func getRecordBatchImplicitPprintHeader( - reader *RecordReaderPprintBarred, + reader *RecordReaderPprintBarredOrMarkdown, linesChannel <-chan *list.List, filename string, context *types.Context, diff --git a/pkg/output/record_writer_factory.go b/pkg/output/record_writer_factory.go index b706f21bd..ae7941490 100644 --- a/pkg/output/record_writer_factory.go +++ b/pkg/output/record_writer_factory.go @@ -16,6 +16,8 @@ func Create(writerOptions *cli.TWriterOptions) (IRecordWriter, error) { return NewRecordWriterDKVP(writerOptions) case "json": return NewRecordWriterJSON(writerOptions) + case "md": + return NewRecordWriterMarkdown(writerOptions) case "markdown": return NewRecordWriterMarkdown(writerOptions) case "nidx": diff --git a/pkg/terminals/help/entry.go b/pkg/terminals/help/entry.go index a9148c385..4666adfa9 100644 --- a/pkg/terminals/help/entry.go +++ b/pkg/terminals/help/entry.go @@ -408,7 +408,7 @@ PPRINT: pretty-printed tabular | 4 5 6 | Record 2: "apple":"4", "bat":"5", "cog":"6" +---------------------+ -Markdown tabular (supported for output only): +Markdown tabular: +-----------------------+ | | apple | bat | cog | | | | --- | --- | --- | | diff --git a/test/cases/io-format-conversion-keystroke-savers/0049/cmd b/test/cases/io-format-conversion-keystroke-savers/c/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0049/cmd rename to test/cases/io-format-conversion-keystroke-savers/c/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0001/experr b/test/cases/io-format-conversion-keystroke-savers/c/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0001/experr rename to test/cases/io-format-conversion-keystroke-savers/c/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0014/expout b/test/cases/io-format-conversion-keystroke-savers/c/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0014/expout rename to test/cases/io-format-conversion-keystroke-savers/c/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0008/cmd b/test/cases/io-format-conversion-keystroke-savers/c2d/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0008/cmd rename to test/cases/io-format-conversion-keystroke-savers/c2d/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0002/experr b/test/cases/io-format-conversion-keystroke-savers/c2d/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0002/experr rename to test/cases/io-format-conversion-keystroke-savers/c2d/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0008/expout b/test/cases/io-format-conversion-keystroke-savers/c2d/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0008/expout rename to test/cases/io-format-conversion-keystroke-savers/c2d/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0010/cmd b/test/cases/io-format-conversion-keystroke-savers/c2j/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0010/cmd rename to test/cases/io-format-conversion-keystroke-savers/c2j/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0003/experr b/test/cases/io-format-conversion-keystroke-savers/c2j/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0003/experr rename to test/cases/io-format-conversion-keystroke-savers/c2j/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0003/expout b/test/cases/io-format-conversion-keystroke-savers/c2j/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0003/expout rename to test/cases/io-format-conversion-keystroke-savers/c2j/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0011/cmd b/test/cases/io-format-conversion-keystroke-savers/c2m/c2p/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0011/cmd rename to test/cases/io-format-conversion-keystroke-savers/c2m/c2p/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0004/experr b/test/cases/io-format-conversion-keystroke-savers/c2m/c2p/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0004/experr rename to test/cases/io-format-conversion-keystroke-savers/c2m/c2p/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0004/expout b/test/cases/io-format-conversion-keystroke-savers/c2m/c2p/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0004/expout rename to test/cases/io-format-conversion-keystroke-savers/c2m/c2p/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0013/cmd b/test/cases/io-format-conversion-keystroke-savers/c2m/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0013/cmd rename to test/cases/io-format-conversion-keystroke-savers/c2m/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0005/experr b/test/cases/io-format-conversion-keystroke-savers/c2m/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0005/experr rename to test/cases/io-format-conversion-keystroke-savers/c2m/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0006/expout b/test/cases/io-format-conversion-keystroke-savers/c2m/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0006/expout rename to test/cases/io-format-conversion-keystroke-savers/c2m/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0009/cmd b/test/cases/io-format-conversion-keystroke-savers/c2n/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0009/cmd rename to test/cases/io-format-conversion-keystroke-savers/c2n/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0006/experr b/test/cases/io-format-conversion-keystroke-savers/c2n/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0006/experr rename to test/cases/io-format-conversion-keystroke-savers/c2n/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0002/expout b/test/cases/io-format-conversion-keystroke-savers/c2n/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0002/expout rename to test/cases/io-format-conversion-keystroke-savers/c2n/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/c2p/cmd b/test/cases/io-format-conversion-keystroke-savers/c2p/cmd new file mode 100644 index 000000000..8779b448d --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/c2p/cmd @@ -0,0 +1 @@ +mlr --c2p cat test/input/abixy.csv diff --git a/test/cases/io-format-conversion-keystroke-savers/0007/experr b/test/cases/io-format-conversion-keystroke-savers/c2p/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0007/experr rename to test/cases/io-format-conversion-keystroke-savers/c2p/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0011/expout b/test/cases/io-format-conversion-keystroke-savers/c2p/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0011/expout rename to test/cases/io-format-conversion-keystroke-savers/c2p/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0007/cmd b/test/cases/io-format-conversion-keystroke-savers/c2t/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0007/cmd rename to test/cases/io-format-conversion-keystroke-savers/c2t/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0008/experr b/test/cases/io-format-conversion-keystroke-savers/c2t/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0008/experr rename to test/cases/io-format-conversion-keystroke-savers/c2t/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0001/expout b/test/cases/io-format-conversion-keystroke-savers/c2t/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0001/expout rename to test/cases/io-format-conversion-keystroke-savers/c2t/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0012/cmd b/test/cases/io-format-conversion-keystroke-savers/c2x/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0012/cmd rename to test/cases/io-format-conversion-keystroke-savers/c2x/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0009/experr b/test/cases/io-format-conversion-keystroke-savers/c2x/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0009/experr rename to test/cases/io-format-conversion-keystroke-savers/c2x/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0005/expout b/test/cases/io-format-conversion-keystroke-savers/c2x/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0005/expout rename to test/cases/io-format-conversion-keystroke-savers/c2x/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0003/cmd b/test/cases/io-format-conversion-keystroke-savers/d2j/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0003/cmd rename to test/cases/io-format-conversion-keystroke-savers/d2j/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0010/experr b/test/cases/io-format-conversion-keystroke-savers/d2j/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0010/experr rename to test/cases/io-format-conversion-keystroke-savers/d2j/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0010/expout b/test/cases/io-format-conversion-keystroke-savers/d2j/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0010/expout rename to test/cases/io-format-conversion-keystroke-savers/d2j/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0006/cmd b/test/cases/io-format-conversion-keystroke-savers/d2m/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0006/cmd rename to test/cases/io-format-conversion-keystroke-savers/d2m/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0004/cmd b/test/cases/io-format-conversion-keystroke-savers/d2m/d2p/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0004/cmd rename to test/cases/io-format-conversion-keystroke-savers/d2m/d2p/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0011/experr b/test/cases/io-format-conversion-keystroke-savers/d2m/d2p/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0011/experr rename to test/cases/io-format-conversion-keystroke-savers/d2m/d2p/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0018/expout b/test/cases/io-format-conversion-keystroke-savers/d2m/d2p/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0018/expout rename to test/cases/io-format-conversion-keystroke-savers/d2m/d2p/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0012/experr b/test/cases/io-format-conversion-keystroke-savers/d2m/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0012/experr rename to test/cases/io-format-conversion-keystroke-savers/d2m/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0013/expout b/test/cases/io-format-conversion-keystroke-savers/d2m/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0013/expout rename to test/cases/io-format-conversion-keystroke-savers/d2m/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0002/cmd b/test/cases/io-format-conversion-keystroke-savers/d2n/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0002/cmd rename to test/cases/io-format-conversion-keystroke-savers/d2n/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0013/experr b/test/cases/io-format-conversion-keystroke-savers/d2n/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0013/experr rename to test/cases/io-format-conversion-keystroke-savers/d2n/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0009/expout b/test/cases/io-format-conversion-keystroke-savers/d2n/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0009/expout rename to test/cases/io-format-conversion-keystroke-savers/d2n/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/d2p/cmd b/test/cases/io-format-conversion-keystroke-savers/d2p/cmd new file mode 100644 index 000000000..7ee7ebd21 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/d2p/cmd @@ -0,0 +1 @@ +mlr --d2p cat test/input/abixy.dkvp diff --git a/test/cases/io-format-conversion-keystroke-savers/0014/experr b/test/cases/io-format-conversion-keystroke-savers/d2p/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0014/experr rename to test/cases/io-format-conversion-keystroke-savers/d2p/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0032/expout b/test/cases/io-format-conversion-keystroke-savers/d2p/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0032/expout rename to test/cases/io-format-conversion-keystroke-savers/d2p/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0001/cmd b/test/cases/io-format-conversion-keystroke-savers/d2t/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0001/cmd rename to test/cases/io-format-conversion-keystroke-savers/d2t/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0015/experr b/test/cases/io-format-conversion-keystroke-savers/d2t/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0015/experr rename to test/cases/io-format-conversion-keystroke-savers/d2t/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0007/expout b/test/cases/io-format-conversion-keystroke-savers/d2t/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0007/expout rename to test/cases/io-format-conversion-keystroke-savers/d2t/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0005/cmd b/test/cases/io-format-conversion-keystroke-savers/d2x/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0005/cmd rename to test/cases/io-format-conversion-keystroke-savers/d2x/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0016/experr b/test/cases/io-format-conversion-keystroke-savers/d2x/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0016/experr rename to test/cases/io-format-conversion-keystroke-savers/d2x/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0012/expout b/test/cases/io-format-conversion-keystroke-savers/d2x/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0012/expout rename to test/cases/io-format-conversion-keystroke-savers/d2x/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0053/cmd b/test/cases/io-format-conversion-keystroke-savers/itsv-odkvp/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0053/cmd rename to test/cases/io-format-conversion-keystroke-savers/itsv-odkvp/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0017/experr b/test/cases/io-format-conversion-keystroke-savers/itsv-odkvp/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0017/experr rename to test/cases/io-format-conversion-keystroke-savers/itsv-odkvp/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0053/expout b/test/cases/io-format-conversion-keystroke-savers/itsv-odkvp/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0053/expout rename to test/cases/io-format-conversion-keystroke-savers/itsv-odkvp/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0052/input.tsv b/test/cases/io-format-conversion-keystroke-savers/itsv-odkvp/input.tsv similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0052/input.tsv rename to test/cases/io-format-conversion-keystroke-savers/itsv-odkvp/input.tsv diff --git a/test/cases/io-format-conversion-keystroke-savers/0052/cmd b/test/cases/io-format-conversion-keystroke-savers/itsvlite-odkvp/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0052/cmd rename to test/cases/io-format-conversion-keystroke-savers/itsvlite-odkvp/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0018/experr b/test/cases/io-format-conversion-keystroke-savers/itsvlite-odkvp/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0018/experr rename to test/cases/io-format-conversion-keystroke-savers/itsvlite-odkvp/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0052/expout b/test/cases/io-format-conversion-keystroke-savers/itsvlite-odkvp/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0052/expout rename to test/cases/io-format-conversion-keystroke-savers/itsvlite-odkvp/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0053/input.tsv b/test/cases/io-format-conversion-keystroke-savers/itsvlite-odkvp/input.tsv similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0053/input.tsv rename to test/cases/io-format-conversion-keystroke-savers/itsvlite-odkvp/input.tsv diff --git a/test/cases/io-format-conversion-keystroke-savers/0051/cmd b/test/cases/io-format-conversion-keystroke-savers/j/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0051/cmd rename to test/cases/io-format-conversion-keystroke-savers/j/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0019/experr b/test/cases/io-format-conversion-keystroke-savers/j/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0019/experr rename to test/cases/io-format-conversion-keystroke-savers/j/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0017/expout b/test/cases/io-format-conversion-keystroke-savers/j/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0017/expout rename to test/cases/io-format-conversion-keystroke-savers/j/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0028/cmd b/test/cases/io-format-conversion-keystroke-savers/j2c/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0028/cmd rename to test/cases/io-format-conversion-keystroke-savers/j2c/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0020/experr b/test/cases/io-format-conversion-keystroke-savers/j2c/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0020/experr rename to test/cases/io-format-conversion-keystroke-savers/j2c/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0028/expout b/test/cases/io-format-conversion-keystroke-savers/j2c/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0028/expout rename to test/cases/io-format-conversion-keystroke-savers/j2c/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0030/cmd b/test/cases/io-format-conversion-keystroke-savers/j2d/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0030/cmd rename to test/cases/io-format-conversion-keystroke-savers/j2d/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0021/experr b/test/cases/io-format-conversion-keystroke-savers/j2d/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0021/experr rename to test/cases/io-format-conversion-keystroke-savers/j2d/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0015/expout b/test/cases/io-format-conversion-keystroke-savers/j2d/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0015/expout rename to test/cases/io-format-conversion-keystroke-savers/j2d/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0034/cmd b/test/cases/io-format-conversion-keystroke-savers/j2m/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0034/cmd rename to test/cases/io-format-conversion-keystroke-savers/j2m/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0022/experr b/test/cases/io-format-conversion-keystroke-savers/j2m/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0022/experr rename to test/cases/io-format-conversion-keystroke-savers/j2m/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0020/expout b/test/cases/io-format-conversion-keystroke-savers/j2m/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0020/expout rename to test/cases/io-format-conversion-keystroke-savers/j2m/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0032/cmd b/test/cases/io-format-conversion-keystroke-savers/j2m/j2p/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0032/cmd rename to test/cases/io-format-conversion-keystroke-savers/j2m/j2p/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0023/experr b/test/cases/io-format-conversion-keystroke-savers/j2m/j2p/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0023/experr rename to test/cases/io-format-conversion-keystroke-savers/j2m/j2p/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0047/expout b/test/cases/io-format-conversion-keystroke-savers/j2m/j2p/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0047/expout rename to test/cases/io-format-conversion-keystroke-savers/j2m/j2p/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0031/cmd b/test/cases/io-format-conversion-keystroke-savers/j2n/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0031/cmd rename to test/cases/io-format-conversion-keystroke-savers/j2n/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0024/experr b/test/cases/io-format-conversion-keystroke-savers/j2n/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0024/experr rename to test/cases/io-format-conversion-keystroke-savers/j2n/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0016/expout b/test/cases/io-format-conversion-keystroke-savers/j2n/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0016/expout rename to test/cases/io-format-conversion-keystroke-savers/j2n/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/j2p/cmd b/test/cases/io-format-conversion-keystroke-savers/j2p/cmd new file mode 100644 index 000000000..1c11e7e36 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/j2p/cmd @@ -0,0 +1 @@ +mlr --j2p cat test/input/abixy.json diff --git a/test/cases/io-format-conversion-keystroke-savers/0025/experr b/test/cases/io-format-conversion-keystroke-savers/j2p/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0025/experr rename to test/cases/io-format-conversion-keystroke-savers/j2p/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/j2p/expout b/test/cases/io-format-conversion-keystroke-savers/j2p/expout new file mode 100644 index 000000000..b8ac13481 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/j2p/expout @@ -0,0 +1,11 @@ +a b i x y +pan pan 1 0.34679014 0.72680286 +eks pan 2 0.75867996 0.52215111 +wye wye 3 0.20460331 0.33831853 +eks wye 4 0.38139939 0.13418874 +wye pan 5 0.57328892 0.86362447 +zee pan 6 0.52712616 0.49322129 +eks zee 7 0.61178406 0.18788492 +zee wye 8 0.59855401 0.97618139 +hat wye 9 0.03144188 0.74955076 +pan wye 10 0.50262601 0.95261836 diff --git a/test/cases/io-format-conversion-keystroke-savers/0029/cmd b/test/cases/io-format-conversion-keystroke-savers/j2t/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0029/cmd rename to test/cases/io-format-conversion-keystroke-savers/j2t/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0026/experr b/test/cases/io-format-conversion-keystroke-savers/j2t/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0026/experr rename to test/cases/io-format-conversion-keystroke-savers/j2t/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0029/expout b/test/cases/io-format-conversion-keystroke-savers/j2t/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0029/expout rename to test/cases/io-format-conversion-keystroke-savers/j2t/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0033/cmd b/test/cases/io-format-conversion-keystroke-savers/j2x/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0033/cmd rename to test/cases/io-format-conversion-keystroke-savers/j2x/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0027/experr b/test/cases/io-format-conversion-keystroke-savers/j2x/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0027/experr rename to test/cases/io-format-conversion-keystroke-savers/j2x/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0019/expout b/test/cases/io-format-conversion-keystroke-savers/j2x/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0019/expout rename to test/cases/io-format-conversion-keystroke-savers/j2x/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/l2m/cmd b/test/cases/io-format-conversion-keystroke-savers/l2m/cmd new file mode 100644 index 000000000..462e4a9a2 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/l2m/cmd @@ -0,0 +1 @@ +mlr --l2m cat test/input/abixy.json diff --git a/test/cases/io-format-conversion-keystroke-savers/0028/experr b/test/cases/io-format-conversion-keystroke-savers/l2m/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0028/experr rename to test/cases/io-format-conversion-keystroke-savers/l2m/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0034/expout b/test/cases/io-format-conversion-keystroke-savers/l2m/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0034/expout rename to test/cases/io-format-conversion-keystroke-savers/l2m/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/m2c/cmd b/test/cases/io-format-conversion-keystroke-savers/m2c/cmd new file mode 100644 index 000000000..029dc93d3 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/m2c/cmd @@ -0,0 +1 @@ +mlr --m2c cat test/input/abixy.md diff --git a/test/cases/io-format-conversion-keystroke-savers/0029/experr b/test/cases/io-format-conversion-keystroke-savers/m2c/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0029/experr rename to test/cases/io-format-conversion-keystroke-savers/m2c/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0035/expout b/test/cases/io-format-conversion-keystroke-savers/m2c/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0035/expout rename to test/cases/io-format-conversion-keystroke-savers/m2c/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/m2d/cmd b/test/cases/io-format-conversion-keystroke-savers/m2d/cmd new file mode 100644 index 000000000..9619267ee --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/m2d/cmd @@ -0,0 +1 @@ +mlr --m2d cat test/input/abixy.md diff --git a/test/cases/io-format-conversion-keystroke-savers/0030/experr b/test/cases/io-format-conversion-keystroke-savers/m2d/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0030/experr rename to test/cases/io-format-conversion-keystroke-savers/m2d/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0030/expout b/test/cases/io-format-conversion-keystroke-savers/m2d/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0030/expout rename to test/cases/io-format-conversion-keystroke-savers/m2d/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/m2j/cmd b/test/cases/io-format-conversion-keystroke-savers/m2j/cmd new file mode 100644 index 000000000..ae6a63c33 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/m2j/cmd @@ -0,0 +1 @@ +mlr --m2j cat test/input/abixy.md diff --git a/test/cases/io-format-conversion-keystroke-savers/0031/experr b/test/cases/io-format-conversion-keystroke-savers/m2j/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0031/experr rename to test/cases/io-format-conversion-keystroke-savers/m2j/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0039/expout b/test/cases/io-format-conversion-keystroke-savers/m2j/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0039/expout rename to test/cases/io-format-conversion-keystroke-savers/m2j/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/m2l/cmd b/test/cases/io-format-conversion-keystroke-savers/m2l/cmd new file mode 100644 index 000000000..bf8cea46c --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/m2l/cmd @@ -0,0 +1 @@ +mlr --m2l cat test/input/abixy.md diff --git a/test/cases/io-format-conversion-keystroke-savers/0032/experr b/test/cases/io-format-conversion-keystroke-savers/m2l/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0032/experr rename to test/cases/io-format-conversion-keystroke-savers/m2l/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/m2l/expout b/test/cases/io-format-conversion-keystroke-savers/m2l/expout new file mode 100644 index 000000000..5a5818e0f --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/m2l/expout @@ -0,0 +1,10 @@ +{"a": "pan", "b": "pan", "i": 1, "x": 0.34679014, "y": 0.72680286} +{"a": "eks", "b": "pan", "i": 2, "x": 0.75867996, "y": 0.52215111} +{"a": "wye", "b": "wye", "i": 3, "x": 0.20460331, "y": 0.33831853} +{"a": "eks", "b": "wye", "i": 4, "x": 0.38139939, "y": 0.13418874} +{"a": "wye", "b": "pan", "i": 5, "x": 0.57328892, "y": 0.86362447} +{"a": "zee", "b": "pan", "i": 6, "x": 0.52712616, "y": 0.49322129} +{"a": "eks", "b": "zee", "i": 7, "x": 0.61178406, "y": 0.18788492} +{"a": "zee", "b": "wye", "i": 8, "x": 0.59855401, "y": 0.97618139} +{"a": "hat", "b": "wye", "i": 9, "x": 0.03144188, "y": 0.74955076} +{"a": "pan", "b": "wye", "i": 10, "x": 0.50262601, "y": 0.95261836} diff --git a/test/cases/io-format-conversion-keystroke-savers/m2n/cmd b/test/cases/io-format-conversion-keystroke-savers/m2n/cmd new file mode 100644 index 000000000..ba7179b2a --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/m2n/cmd @@ -0,0 +1 @@ +mlr --m2n cat test/input/abixy.md diff --git a/test/cases/io-format-conversion-keystroke-savers/0033/experr b/test/cases/io-format-conversion-keystroke-savers/m2n/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0033/experr rename to test/cases/io-format-conversion-keystroke-savers/m2n/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0031/expout b/test/cases/io-format-conversion-keystroke-savers/m2n/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0031/expout rename to test/cases/io-format-conversion-keystroke-savers/m2n/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/m2p/cmd b/test/cases/io-format-conversion-keystroke-savers/m2p/cmd new file mode 100644 index 000000000..5dfd5e425 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/m2p/cmd @@ -0,0 +1 @@ +mlr --m2p cat test/input/abixy.md diff --git a/test/cases/io-format-conversion-keystroke-savers/0034/experr b/test/cases/io-format-conversion-keystroke-savers/m2p/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0034/experr rename to test/cases/io-format-conversion-keystroke-savers/m2p/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/m2p/expout b/test/cases/io-format-conversion-keystroke-savers/m2p/expout new file mode 100644 index 000000000..b8ac13481 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/m2p/expout @@ -0,0 +1,11 @@ +a b i x y +pan pan 1 0.34679014 0.72680286 +eks pan 2 0.75867996 0.52215111 +wye wye 3 0.20460331 0.33831853 +eks wye 4 0.38139939 0.13418874 +wye pan 5 0.57328892 0.86362447 +zee pan 6 0.52712616 0.49322129 +eks zee 7 0.61178406 0.18788492 +zee wye 8 0.59855401 0.97618139 +hat wye 9 0.03144188 0.74955076 +pan wye 10 0.50262601 0.95261836 diff --git a/test/cases/io-format-conversion-keystroke-savers/m2t/cmd b/test/cases/io-format-conversion-keystroke-savers/m2t/cmd new file mode 100644 index 000000000..b24a15801 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/m2t/cmd @@ -0,0 +1 @@ +mlr --m2t cat test/input/abixy.md diff --git a/test/cases/io-format-conversion-keystroke-savers/0035/experr b/test/cases/io-format-conversion-keystroke-savers/m2t/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0035/experr rename to test/cases/io-format-conversion-keystroke-savers/m2t/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0036/expout b/test/cases/io-format-conversion-keystroke-savers/m2t/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0036/expout rename to test/cases/io-format-conversion-keystroke-savers/m2t/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/m2x/cmd b/test/cases/io-format-conversion-keystroke-savers/m2x/cmd new file mode 100644 index 000000000..dfff2ec6b --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/m2x/cmd @@ -0,0 +1 @@ +mlr --m2x cat test/input/abixy.md diff --git a/test/cases/io-format-conversion-keystroke-savers/0036/experr b/test/cases/io-format-conversion-keystroke-savers/m2x/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0036/experr rename to test/cases/io-format-conversion-keystroke-savers/m2x/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0033/expout b/test/cases/io-format-conversion-keystroke-savers/m2x/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0033/expout rename to test/cases/io-format-conversion-keystroke-savers/m2x/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0021/cmd b/test/cases/io-format-conversion-keystroke-savers/n2c/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0021/cmd rename to test/cases/io-format-conversion-keystroke-savers/n2c/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0037/experr b/test/cases/io-format-conversion-keystroke-savers/n2c/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0037/experr rename to test/cases/io-format-conversion-keystroke-savers/n2c/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0021/expout b/test/cases/io-format-conversion-keystroke-savers/n2c/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0021/expout rename to test/cases/io-format-conversion-keystroke-savers/n2c/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0023/cmd b/test/cases/io-format-conversion-keystroke-savers/n2d/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0023/cmd rename to test/cases/io-format-conversion-keystroke-savers/n2d/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0038/experr b/test/cases/io-format-conversion-keystroke-savers/n2d/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0038/experr rename to test/cases/io-format-conversion-keystroke-savers/n2d/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0023/expout b/test/cases/io-format-conversion-keystroke-savers/n2d/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0023/expout rename to test/cases/io-format-conversion-keystroke-savers/n2d/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0024/cmd b/test/cases/io-format-conversion-keystroke-savers/n2j/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0024/cmd rename to test/cases/io-format-conversion-keystroke-savers/n2j/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0039/experr b/test/cases/io-format-conversion-keystroke-savers/n2j/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0039/experr rename to test/cases/io-format-conversion-keystroke-savers/n2j/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0024/expout b/test/cases/io-format-conversion-keystroke-savers/n2j/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0024/expout rename to test/cases/io-format-conversion-keystroke-savers/n2j/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0027/cmd b/test/cases/io-format-conversion-keystroke-savers/n2m/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0027/cmd rename to test/cases/io-format-conversion-keystroke-savers/n2m/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0040/experr b/test/cases/io-format-conversion-keystroke-savers/n2m/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0040/experr rename to test/cases/io-format-conversion-keystroke-savers/n2m/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0027/expout b/test/cases/io-format-conversion-keystroke-savers/n2m/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0027/expout rename to test/cases/io-format-conversion-keystroke-savers/n2m/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0025/cmd b/test/cases/io-format-conversion-keystroke-savers/n2m/n2p/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0025/cmd rename to test/cases/io-format-conversion-keystroke-savers/n2m/n2p/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0041/experr b/test/cases/io-format-conversion-keystroke-savers/n2m/n2p/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0041/experr rename to test/cases/io-format-conversion-keystroke-savers/n2m/n2p/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0025/expout b/test/cases/io-format-conversion-keystroke-savers/n2m/n2p/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0025/expout rename to test/cases/io-format-conversion-keystroke-savers/n2m/n2p/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/n2p/cmd b/test/cases/io-format-conversion-keystroke-savers/n2p/cmd new file mode 100644 index 000000000..d1e5973fb --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/n2p/cmd @@ -0,0 +1 @@ +mlr --n2p cat test/input/abixy.nidx diff --git a/test/cases/io-format-conversion-keystroke-savers/0042/experr b/test/cases/io-format-conversion-keystroke-savers/n2p/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0042/experr rename to test/cases/io-format-conversion-keystroke-savers/n2p/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/n2p/expout b/test/cases/io-format-conversion-keystroke-savers/n2p/expout new file mode 100644 index 000000000..4deb25a0b --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/n2p/expout @@ -0,0 +1,11 @@ +1 2 3 4 5 +pan pan 1 0.34679014 0.72680286 +eks pan 2 0.75867996 0.52215111 +wye wye 3 0.20460331 0.33831853 +eks wye 4 0.38139939 0.13418874 +wye pan 5 0.57328892 0.86362447 +zee pan 6 0.52712616 0.49322129 +eks zee 7 0.61178406 0.18788492 +zee wye 8 0.59855401 0.97618139 +hat wye 9 0.03144188 0.74955076 +pan wye 10 0.50262601 0.95261836 diff --git a/test/cases/io-format-conversion-keystroke-savers/0022/cmd b/test/cases/io-format-conversion-keystroke-savers/n2t/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0022/cmd rename to test/cases/io-format-conversion-keystroke-savers/n2t/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0043/experr b/test/cases/io-format-conversion-keystroke-savers/n2t/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0043/experr rename to test/cases/io-format-conversion-keystroke-savers/n2t/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0022/expout b/test/cases/io-format-conversion-keystroke-savers/n2t/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0022/expout rename to test/cases/io-format-conversion-keystroke-savers/n2t/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0026/cmd b/test/cases/io-format-conversion-keystroke-savers/n2x/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0026/cmd rename to test/cases/io-format-conversion-keystroke-savers/n2x/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0044/experr b/test/cases/io-format-conversion-keystroke-savers/n2x/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0044/experr rename to test/cases/io-format-conversion-keystroke-savers/n2x/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0026/expout b/test/cases/io-format-conversion-keystroke-savers/n2x/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0026/expout rename to test/cases/io-format-conversion-keystroke-savers/n2x/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0035/cmd b/test/cases/io-format-conversion-keystroke-savers/p2c/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0035/cmd rename to test/cases/io-format-conversion-keystroke-savers/p2c/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0045/experr b/test/cases/io-format-conversion-keystroke-savers/p2c/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0045/experr rename to test/cases/io-format-conversion-keystroke-savers/p2c/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0042/expout b/test/cases/io-format-conversion-keystroke-savers/p2c/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0042/expout rename to test/cases/io-format-conversion-keystroke-savers/p2c/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0037/cmd b/test/cases/io-format-conversion-keystroke-savers/p2d/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0037/cmd rename to test/cases/io-format-conversion-keystroke-savers/p2d/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0046/experr b/test/cases/io-format-conversion-keystroke-savers/p2d/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0046/experr rename to test/cases/io-format-conversion-keystroke-savers/p2d/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0037/expout b/test/cases/io-format-conversion-keystroke-savers/p2d/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0037/expout rename to test/cases/io-format-conversion-keystroke-savers/p2d/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0039/cmd b/test/cases/io-format-conversion-keystroke-savers/p2j/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0039/cmd rename to test/cases/io-format-conversion-keystroke-savers/p2j/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0047/experr b/test/cases/io-format-conversion-keystroke-savers/p2j/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0047/experr rename to test/cases/io-format-conversion-keystroke-savers/p2j/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0046/expout b/test/cases/io-format-conversion-keystroke-savers/p2j/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0046/expout rename to test/cases/io-format-conversion-keystroke-savers/p2j/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0041/cmd b/test/cases/io-format-conversion-keystroke-savers/p2m/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0041/cmd rename to test/cases/io-format-conversion-keystroke-savers/p2m/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0048/experr b/test/cases/io-format-conversion-keystroke-savers/p2m/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0048/experr rename to test/cases/io-format-conversion-keystroke-savers/p2m/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0041/expout b/test/cases/io-format-conversion-keystroke-savers/p2m/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0041/expout rename to test/cases/io-format-conversion-keystroke-savers/p2m/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0047/cmd b/test/cases/io-format-conversion-keystroke-savers/p2m/x2p/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0047/cmd rename to test/cases/io-format-conversion-keystroke-savers/p2m/x2p/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0049/experr b/test/cases/io-format-conversion-keystroke-savers/p2m/x2p/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0049/experr rename to test/cases/io-format-conversion-keystroke-savers/p2m/x2p/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/p2m/x2p/expout b/test/cases/io-format-conversion-keystroke-savers/p2m/x2p/expout new file mode 100644 index 000000000..b8ac13481 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/p2m/x2p/expout @@ -0,0 +1,11 @@ +a b i x y +pan pan 1 0.34679014 0.72680286 +eks pan 2 0.75867996 0.52215111 +wye wye 3 0.20460331 0.33831853 +eks wye 4 0.38139939 0.13418874 +wye pan 5 0.57328892 0.86362447 +zee pan 6 0.52712616 0.49322129 +eks zee 7 0.61178406 0.18788492 +zee wye 8 0.59855401 0.97618139 +hat wye 9 0.03144188 0.74955076 +pan wye 10 0.50262601 0.95261836 diff --git a/test/cases/io-format-conversion-keystroke-savers/0038/cmd b/test/cases/io-format-conversion-keystroke-savers/p2n/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0038/cmd rename to test/cases/io-format-conversion-keystroke-savers/p2n/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0050/experr b/test/cases/io-format-conversion-keystroke-savers/p2n/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0050/experr rename to test/cases/io-format-conversion-keystroke-savers/p2n/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0038/expout b/test/cases/io-format-conversion-keystroke-savers/p2n/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0038/expout rename to test/cases/io-format-conversion-keystroke-savers/p2n/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0036/cmd b/test/cases/io-format-conversion-keystroke-savers/p2t/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0036/cmd rename to test/cases/io-format-conversion-keystroke-savers/p2t/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0051/experr b/test/cases/io-format-conversion-keystroke-savers/p2t/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0051/experr rename to test/cases/io-format-conversion-keystroke-savers/p2t/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0043/expout b/test/cases/io-format-conversion-keystroke-savers/p2t/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0043/expout rename to test/cases/io-format-conversion-keystroke-savers/p2t/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0040/cmd b/test/cases/io-format-conversion-keystroke-savers/p2x/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0040/cmd rename to test/cases/io-format-conversion-keystroke-savers/p2x/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0052/experr b/test/cases/io-format-conversion-keystroke-savers/p2x/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0052/experr rename to test/cases/io-format-conversion-keystroke-savers/p2x/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0040/expout b/test/cases/io-format-conversion-keystroke-savers/p2x/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0040/expout rename to test/cases/io-format-conversion-keystroke-savers/p2x/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0050/cmd b/test/cases/io-format-conversion-keystroke-savers/t/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0050/cmd rename to test/cases/io-format-conversion-keystroke-savers/t/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0053/experr b/test/cases/io-format-conversion-keystroke-savers/t/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0053/experr rename to test/cases/io-format-conversion-keystroke-savers/t/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0050/expout b/test/cases/io-format-conversion-keystroke-savers/t/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0050/expout rename to test/cases/io-format-conversion-keystroke-savers/t/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0014/cmd b/test/cases/io-format-conversion-keystroke-savers/t2c/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0014/cmd rename to test/cases/io-format-conversion-keystroke-savers/t2c/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0054/experr b/test/cases/io-format-conversion-keystroke-savers/t2c/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0054/experr rename to test/cases/io-format-conversion-keystroke-savers/t2c/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0049/expout b/test/cases/io-format-conversion-keystroke-savers/t2c/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0049/expout rename to test/cases/io-format-conversion-keystroke-savers/t2c/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0015/cmd b/test/cases/io-format-conversion-keystroke-savers/t2d/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0015/cmd rename to test/cases/io-format-conversion-keystroke-savers/t2d/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/0055/experr b/test/cases/io-format-conversion-keystroke-savers/t2d/experr similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0055/experr rename to test/cases/io-format-conversion-keystroke-savers/t2d/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0044/expout b/test/cases/io-format-conversion-keystroke-savers/t2d/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0044/expout rename to test/cases/io-format-conversion-keystroke-savers/t2d/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0017/cmd b/test/cases/io-format-conversion-keystroke-savers/t2j/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0017/cmd rename to test/cases/io-format-conversion-keystroke-savers/t2j/cmd diff --git a/test/cases/io-markdown-output/0001/experr b/test/cases/io-format-conversion-keystroke-savers/t2j/experr similarity index 100% rename from test/cases/io-markdown-output/0001/experr rename to test/cases/io-format-conversion-keystroke-savers/t2j/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0051/expout b/test/cases/io-format-conversion-keystroke-savers/t2j/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0051/expout rename to test/cases/io-format-conversion-keystroke-savers/t2j/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0020/cmd b/test/cases/io-format-conversion-keystroke-savers/t2m/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0020/cmd rename to test/cases/io-format-conversion-keystroke-savers/t2m/cmd diff --git a/test/cases/io-markdown-output/0002/experr b/test/cases/io-format-conversion-keystroke-savers/t2m/experr similarity index 100% rename from test/cases/io-markdown-output/0002/experr rename to test/cases/io-format-conversion-keystroke-savers/t2m/experr diff --git a/test/cases/io-format-conversion-keystroke-savers/0048/expout b/test/cases/io-format-conversion-keystroke-savers/t2m/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0048/expout rename to test/cases/io-format-conversion-keystroke-savers/t2m/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0018/cmd b/test/cases/io-format-conversion-keystroke-savers/t2m/t2p/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0018/cmd rename to test/cases/io-format-conversion-keystroke-savers/t2m/t2p/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/t2m/t2p/experr b/test/cases/io-format-conversion-keystroke-savers/t2m/t2p/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-format-conversion-keystroke-savers/t2m/t2p/expout b/test/cases/io-format-conversion-keystroke-savers/t2m/t2p/expout new file mode 100644 index 000000000..b8ac13481 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/t2m/t2p/expout @@ -0,0 +1,11 @@ +a b i x y +pan pan 1 0.34679014 0.72680286 +eks pan 2 0.75867996 0.52215111 +wye wye 3 0.20460331 0.33831853 +eks wye 4 0.38139939 0.13418874 +wye pan 5 0.57328892 0.86362447 +zee pan 6 0.52712616 0.49322129 +eks zee 7 0.61178406 0.18788492 +zee wye 8 0.59855401 0.97618139 +hat wye 9 0.03144188 0.74955076 +pan wye 10 0.50262601 0.95261836 diff --git a/test/cases/io-format-conversion-keystroke-savers/0016/cmd b/test/cases/io-format-conversion-keystroke-savers/t2n/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0016/cmd rename to test/cases/io-format-conversion-keystroke-savers/t2n/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/t2n/experr b/test/cases/io-format-conversion-keystroke-savers/t2n/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-format-conversion-keystroke-savers/0045/expout b/test/cases/io-format-conversion-keystroke-savers/t2n/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0045/expout rename to test/cases/io-format-conversion-keystroke-savers/t2n/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/t2p/cmd b/test/cases/io-format-conversion-keystroke-savers/t2p/cmd new file mode 100644 index 000000000..7963d101b --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/t2p/cmd @@ -0,0 +1 @@ +mlr --t2p cat test/input/abixy.tsv diff --git a/test/cases/io-format-conversion-keystroke-savers/t2p/experr b/test/cases/io-format-conversion-keystroke-savers/t2p/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-format-conversion-keystroke-savers/t2p/expout b/test/cases/io-format-conversion-keystroke-savers/t2p/expout new file mode 100644 index 000000000..b8ac13481 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/t2p/expout @@ -0,0 +1,11 @@ +a b i x y +pan pan 1 0.34679014 0.72680286 +eks pan 2 0.75867996 0.52215111 +wye wye 3 0.20460331 0.33831853 +eks wye 4 0.38139939 0.13418874 +wye pan 5 0.57328892 0.86362447 +zee pan 6 0.52712616 0.49322129 +eks zee 7 0.61178406 0.18788492 +zee wye 8 0.59855401 0.97618139 +hat wye 9 0.03144188 0.74955076 +pan wye 10 0.50262601 0.95261836 diff --git a/test/cases/io-format-conversion-keystroke-savers/0019/cmd b/test/cases/io-format-conversion-keystroke-savers/t2x/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0019/cmd rename to test/cases/io-format-conversion-keystroke-savers/t2x/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/t2x/experr b/test/cases/io-format-conversion-keystroke-savers/t2x/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-format-conversion-keystroke-savers/t2x/expout b/test/cases/io-format-conversion-keystroke-savers/t2x/expout new file mode 100644 index 000000000..9c955fb87 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/t2x/expout @@ -0,0 +1,59 @@ +a pan +b pan +i 1 +x 0.34679014 +y 0.72680286 + +a eks +b pan +i 2 +x 0.75867996 +y 0.52215111 + +a wye +b wye +i 3 +x 0.20460331 +y 0.33831853 + +a eks +b wye +i 4 +x 0.38139939 +y 0.13418874 + +a wye +b pan +i 5 +x 0.57328892 +y 0.86362447 + +a zee +b pan +i 6 +x 0.52712616 +y 0.49322129 + +a eks +b zee +i 7 +x 0.61178406 +y 0.18788492 + +a zee +b wye +i 8 +x 0.59855401 +y 0.97618139 + +a hat +b wye +i 9 +x 0.03144188 +y 0.74955076 + +a pan +b wye +i 10 +x 0.50262601 +y 0.95261836 diff --git a/test/cases/io-format-conversion-keystroke-savers/0055/cmd b/test/cases/io-format-conversion-keystroke-savers/tsv/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0055/cmd rename to test/cases/io-format-conversion-keystroke-savers/tsv/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/tsv/experr b/test/cases/io-format-conversion-keystroke-savers/tsv/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-format-conversion-keystroke-savers/0055/expout b/test/cases/io-format-conversion-keystroke-savers/tsv/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0055/expout rename to test/cases/io-format-conversion-keystroke-savers/tsv/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0054/input.tsv b/test/cases/io-format-conversion-keystroke-savers/tsv/input.tsv similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0054/input.tsv rename to test/cases/io-format-conversion-keystroke-savers/tsv/input.tsv diff --git a/test/cases/io-format-conversion-keystroke-savers/0054/cmd b/test/cases/io-format-conversion-keystroke-savers/tsvlite/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0054/cmd rename to test/cases/io-format-conversion-keystroke-savers/tsvlite/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/tsvlite/experr b/test/cases/io-format-conversion-keystroke-savers/tsvlite/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-format-conversion-keystroke-savers/0054/expout b/test/cases/io-format-conversion-keystroke-savers/tsvlite/expout similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0054/expout rename to test/cases/io-format-conversion-keystroke-savers/tsvlite/expout diff --git a/test/cases/io-format-conversion-keystroke-savers/0055/input.tsv b/test/cases/io-format-conversion-keystroke-savers/tsvlite/input.tsv similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0055/input.tsv rename to test/cases/io-format-conversion-keystroke-savers/tsvlite/input.tsv diff --git a/test/cases/io-format-conversion-keystroke-savers/0042/cmd b/test/cases/io-format-conversion-keystroke-savers/x2c/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0042/cmd rename to test/cases/io-format-conversion-keystroke-savers/x2c/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/x2c/experr b/test/cases/io-format-conversion-keystroke-savers/x2c/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-format-conversion-keystroke-savers/x2c/expout b/test/cases/io-format-conversion-keystroke-savers/x2c/expout new file mode 100644 index 000000000..37eac50e4 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/x2c/expout @@ -0,0 +1,11 @@ +a,b,i,x,y +pan,pan,1,0.34679014,0.72680286 +eks,pan,2,0.75867996,0.52215111 +wye,wye,3,0.20460331,0.33831853 +eks,wye,4,0.38139939,0.13418874 +wye,pan,5,0.57328892,0.86362447 +zee,pan,6,0.52712616,0.49322129 +eks,zee,7,0.61178406,0.18788492 +zee,wye,8,0.59855401,0.97618139 +hat,wye,9,0.03144188,0.74955076 +pan,wye,10,0.50262601,0.95261836 diff --git a/test/cases/io-format-conversion-keystroke-savers/0044/cmd b/test/cases/io-format-conversion-keystroke-savers/x2d/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0044/cmd rename to test/cases/io-format-conversion-keystroke-savers/x2d/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/x2d/experr b/test/cases/io-format-conversion-keystroke-savers/x2d/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-format-conversion-keystroke-savers/x2d/expout b/test/cases/io-format-conversion-keystroke-savers/x2d/expout new file mode 100644 index 000000000..940df3d11 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/x2d/expout @@ -0,0 +1,10 @@ +a=pan,b=pan,i=1,x=0.34679014,y=0.72680286 +a=eks,b=pan,i=2,x=0.75867996,y=0.52215111 +a=wye,b=wye,i=3,x=0.20460331,y=0.33831853 +a=eks,b=wye,i=4,x=0.38139939,y=0.13418874 +a=wye,b=pan,i=5,x=0.57328892,y=0.86362447 +a=zee,b=pan,i=6,x=0.52712616,y=0.49322129 +a=eks,b=zee,i=7,x=0.61178406,y=0.18788492 +a=zee,b=wye,i=8,x=0.59855401,y=0.97618139 +a=hat,b=wye,i=9,x=0.03144188,y=0.74955076 +a=pan,b=wye,i=10,x=0.50262601,y=0.95261836 diff --git a/test/cases/io-format-conversion-keystroke-savers/0046/cmd b/test/cases/io-format-conversion-keystroke-savers/x2j/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0046/cmd rename to test/cases/io-format-conversion-keystroke-savers/x2j/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/x2j/experr b/test/cases/io-format-conversion-keystroke-savers/x2j/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-format-conversion-keystroke-savers/x2j/expout b/test/cases/io-format-conversion-keystroke-savers/x2j/expout new file mode 100644 index 000000000..48da25210 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/x2j/expout @@ -0,0 +1,72 @@ +[ +{ + "a": "pan", + "b": "pan", + "i": 1, + "x": 0.34679014, + "y": 0.72680286 +}, +{ + "a": "eks", + "b": "pan", + "i": 2, + "x": 0.75867996, + "y": 0.52215111 +}, +{ + "a": "wye", + "b": "wye", + "i": 3, + "x": 0.20460331, + "y": 0.33831853 +}, +{ + "a": "eks", + "b": "wye", + "i": 4, + "x": 0.38139939, + "y": 0.13418874 +}, +{ + "a": "wye", + "b": "pan", + "i": 5, + "x": 0.57328892, + "y": 0.86362447 +}, +{ + "a": "zee", + "b": "pan", + "i": 6, + "x": 0.52712616, + "y": 0.49322129 +}, +{ + "a": "eks", + "b": "zee", + "i": 7, + "x": 0.61178406, + "y": 0.18788492 +}, +{ + "a": "zee", + "b": "wye", + "i": 8, + "x": 0.59855401, + "y": 0.97618139 +}, +{ + "a": "hat", + "b": "wye", + "i": 9, + "x": 0.03144188, + "y": 0.74955076 +}, +{ + "a": "pan", + "b": "wye", + "i": 10, + "x": 0.50262601, + "y": 0.95261836 +} +] diff --git a/test/cases/io-format-conversion-keystroke-savers/0048/cmd b/test/cases/io-format-conversion-keystroke-savers/x2m/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0048/cmd rename to test/cases/io-format-conversion-keystroke-savers/x2m/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/x2m/experr b/test/cases/io-format-conversion-keystroke-savers/x2m/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-format-conversion-keystroke-savers/x2m/expout b/test/cases/io-format-conversion-keystroke-savers/x2m/expout new file mode 100644 index 000000000..3d77a0324 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/x2m/expout @@ -0,0 +1,12 @@ +| a | b | i | x | y | +| --- | --- | --- | --- | --- | +| pan | pan | 1 | 0.34679014 | 0.72680286 | +| eks | pan | 2 | 0.75867996 | 0.52215111 | +| wye | wye | 3 | 0.20460331 | 0.33831853 | +| eks | wye | 4 | 0.38139939 | 0.13418874 | +| wye | pan | 5 | 0.57328892 | 0.86362447 | +| zee | pan | 6 | 0.52712616 | 0.49322129 | +| eks | zee | 7 | 0.61178406 | 0.18788492 | +| zee | wye | 8 | 0.59855401 | 0.97618139 | +| hat | wye | 9 | 0.03144188 | 0.74955076 | +| pan | wye | 10 | 0.50262601 | 0.95261836 | diff --git a/test/cases/io-format-conversion-keystroke-savers/x2m/x2p/cmd b/test/cases/io-format-conversion-keystroke-savers/x2m/x2p/cmd new file mode 100644 index 000000000..2dad8a232 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/x2m/x2p/cmd @@ -0,0 +1 @@ +mlr --x2p cat test/input/abixy.xtab diff --git a/test/cases/io-format-conversion-keystroke-savers/x2m/x2p/experr b/test/cases/io-format-conversion-keystroke-savers/x2m/x2p/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-format-conversion-keystroke-savers/x2m/x2p/expout b/test/cases/io-format-conversion-keystroke-savers/x2m/x2p/expout new file mode 100644 index 000000000..b8ac13481 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/x2m/x2p/expout @@ -0,0 +1,11 @@ +a b i x y +pan pan 1 0.34679014 0.72680286 +eks pan 2 0.75867996 0.52215111 +wye wye 3 0.20460331 0.33831853 +eks wye 4 0.38139939 0.13418874 +wye pan 5 0.57328892 0.86362447 +zee pan 6 0.52712616 0.49322129 +eks zee 7 0.61178406 0.18788492 +zee wye 8 0.59855401 0.97618139 +hat wye 9 0.03144188 0.74955076 +pan wye 10 0.50262601 0.95261836 diff --git a/test/cases/io-format-conversion-keystroke-savers/0045/cmd b/test/cases/io-format-conversion-keystroke-savers/x2n/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0045/cmd rename to test/cases/io-format-conversion-keystroke-savers/x2n/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/x2n/experr b/test/cases/io-format-conversion-keystroke-savers/x2n/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-format-conversion-keystroke-savers/x2n/expout b/test/cases/io-format-conversion-keystroke-savers/x2n/expout new file mode 100644 index 000000000..17f7e1ee6 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/x2n/expout @@ -0,0 +1,10 @@ +pan pan 1 0.34679014 0.72680286 +eks pan 2 0.75867996 0.52215111 +wye wye 3 0.20460331 0.33831853 +eks wye 4 0.38139939 0.13418874 +wye pan 5 0.57328892 0.86362447 +zee pan 6 0.52712616 0.49322129 +eks zee 7 0.61178406 0.18788492 +zee wye 8 0.59855401 0.97618139 +hat wye 9 0.03144188 0.74955076 +pan wye 10 0.50262601 0.95261836 diff --git a/test/cases/io-format-conversion-keystroke-savers/x2p/cmd b/test/cases/io-format-conversion-keystroke-savers/x2p/cmd new file mode 100644 index 000000000..2dad8a232 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/x2p/cmd @@ -0,0 +1 @@ +mlr --x2p cat test/input/abixy.xtab diff --git a/test/cases/io-format-conversion-keystroke-savers/x2p/experr b/test/cases/io-format-conversion-keystroke-savers/x2p/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-format-conversion-keystroke-savers/x2p/expout b/test/cases/io-format-conversion-keystroke-savers/x2p/expout new file mode 100644 index 000000000..b8ac13481 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/x2p/expout @@ -0,0 +1,11 @@ +a b i x y +pan pan 1 0.34679014 0.72680286 +eks pan 2 0.75867996 0.52215111 +wye wye 3 0.20460331 0.33831853 +eks wye 4 0.38139939 0.13418874 +wye pan 5 0.57328892 0.86362447 +zee pan 6 0.52712616 0.49322129 +eks zee 7 0.61178406 0.18788492 +zee wye 8 0.59855401 0.97618139 +hat wye 9 0.03144188 0.74955076 +pan wye 10 0.50262601 0.95261836 diff --git a/test/cases/io-format-conversion-keystroke-savers/0043/cmd b/test/cases/io-format-conversion-keystroke-savers/x2t/cmd similarity index 100% rename from test/cases/io-format-conversion-keystroke-savers/0043/cmd rename to test/cases/io-format-conversion-keystroke-savers/x2t/cmd diff --git a/test/cases/io-format-conversion-keystroke-savers/x2t/experr b/test/cases/io-format-conversion-keystroke-savers/x2t/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-format-conversion-keystroke-savers/x2t/expout b/test/cases/io-format-conversion-keystroke-savers/x2t/expout new file mode 100644 index 000000000..03ac8f384 --- /dev/null +++ b/test/cases/io-format-conversion-keystroke-savers/x2t/expout @@ -0,0 +1,11 @@ +a b i x y +pan pan 1 0.34679014 0.72680286 +eks pan 2 0.75867996 0.52215111 +wye wye 3 0.20460331 0.33831853 +eks wye 4 0.38139939 0.13418874 +wye pan 5 0.57328892 0.86362447 +zee pan 6 0.52712616 0.49322129 +eks zee 7 0.61178406 0.18788492 +zee wye 8 0.59855401 0.97618139 +hat wye 9 0.03144188 0.74955076 +pan wye 10 0.50262601 0.95261836 diff --git a/test/cases/io-markdown-output/0001/cmd b/test/cases/io-markdown/0001/cmd similarity index 100% rename from test/cases/io-markdown-output/0001/cmd rename to test/cases/io-markdown/0001/cmd diff --git a/test/cases/io-markdown/0001/experr b/test/cases/io-markdown/0001/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-markdown-output/0001/expout b/test/cases/io-markdown/0001/expout similarity index 100% rename from test/cases/io-markdown-output/0001/expout rename to test/cases/io-markdown/0001/expout diff --git a/test/cases/io-markdown-output/0002/cmd b/test/cases/io-markdown/0002/cmd similarity index 100% rename from test/cases/io-markdown-output/0002/cmd rename to test/cases/io-markdown/0002/cmd diff --git a/test/cases/io-markdown/0002/experr b/test/cases/io-markdown/0002/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-markdown-output/0002/expout b/test/cases/io-markdown/0002/expout similarity index 100% rename from test/cases/io-markdown-output/0002/expout rename to test/cases/io-markdown/0002/expout diff --git a/test/cases/io-markdown-output/0002/input b/test/cases/io-markdown/0002/input similarity index 100% rename from test/cases/io-markdown-output/0002/input rename to test/cases/io-markdown/0002/input diff --git a/test/cases/io-markdown/markdown-input-headerless/cmd b/test/cases/io-markdown/markdown-input-headerless/cmd new file mode 100644 index 000000000..f38836b97 --- /dev/null +++ b/test/cases/io-markdown/markdown-input-headerless/cmd @@ -0,0 +1 @@ +mlr --hi -i markdown -o json cat test/input/abixy.md diff --git a/test/cases/io-markdown/markdown-input-headerless/experr b/test/cases/io-markdown/markdown-input-headerless/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-markdown/markdown-input-headerless/expout b/test/cases/io-markdown/markdown-input-headerless/expout new file mode 100644 index 000000000..e08b56a90 --- /dev/null +++ b/test/cases/io-markdown/markdown-input-headerless/expout @@ -0,0 +1,79 @@ +[ +{ + "1": "a", + "2": "b", + "3": "i", + "4": "x", + "5": "y" +}, +{ + "1": "pan", + "2": "pan", + "3": 1, + "4": 0.34679014, + "5": 0.72680286 +}, +{ + "1": "eks", + "2": "pan", + "3": 2, + "4": 0.75867996, + "5": 0.52215111 +}, +{ + "1": "wye", + "2": "wye", + "3": 3, + "4": 0.20460331, + "5": 0.33831853 +}, +{ + "1": "eks", + "2": "wye", + "3": 4, + "4": 0.38139939, + "5": 0.13418874 +}, +{ + "1": "wye", + "2": "pan", + "3": 5, + "4": 0.57328892, + "5": 0.86362447 +}, +{ + "1": "zee", + "2": "pan", + "3": 6, + "4": 0.52712616, + "5": 0.49322129 +}, +{ + "1": "eks", + "2": "zee", + "3": 7, + "4": 0.61178406, + "5": 0.18788492 +}, +{ + "1": "zee", + "2": "wye", + "3": 8, + "4": 0.59855401, + "5": 0.97618139 +}, +{ + "1": "hat", + "2": "wye", + "3": 9, + "4": 0.03144188, + "5": 0.74955076 +}, +{ + "1": "pan", + "2": "wye", + "3": 10, + "4": 0.50262601, + "5": 0.95261836 +} +] diff --git a/test/cases/io-markdown/markdown-input/cmd b/test/cases/io-markdown/markdown-input/cmd new file mode 100644 index 000000000..5dd4673c5 --- /dev/null +++ b/test/cases/io-markdown/markdown-input/cmd @@ -0,0 +1 @@ +mlr -i markdown -o json cat test/input/abixy.md diff --git a/test/cases/io-markdown/markdown-input/experr b/test/cases/io-markdown/markdown-input/experr new file mode 100644 index 000000000..e69de29bb diff --git a/test/cases/io-markdown/markdown-input/expout b/test/cases/io-markdown/markdown-input/expout new file mode 100644 index 000000000..48da25210 --- /dev/null +++ b/test/cases/io-markdown/markdown-input/expout @@ -0,0 +1,72 @@ +[ +{ + "a": "pan", + "b": "pan", + "i": 1, + "x": 0.34679014, + "y": 0.72680286 +}, +{ + "a": "eks", + "b": "pan", + "i": 2, + "x": 0.75867996, + "y": 0.52215111 +}, +{ + "a": "wye", + "b": "wye", + "i": 3, + "x": 0.20460331, + "y": 0.33831853 +}, +{ + "a": "eks", + "b": "wye", + "i": 4, + "x": 0.38139939, + "y": 0.13418874 +}, +{ + "a": "wye", + "b": "pan", + "i": 5, + "x": 0.57328892, + "y": 0.86362447 +}, +{ + "a": "zee", + "b": "pan", + "i": 6, + "x": 0.52712616, + "y": 0.49322129 +}, +{ + "a": "eks", + "b": "zee", + "i": 7, + "x": 0.61178406, + "y": 0.18788492 +}, +{ + "a": "zee", + "b": "wye", + "i": 8, + "x": 0.59855401, + "y": 0.97618139 +}, +{ + "a": "hat", + "b": "wye", + "i": 9, + "x": 0.03144188, + "y": 0.74955076 +}, +{ + "a": "pan", + "b": "wye", + "i": 10, + "x": 0.50262601, + "y": 0.95261836 +} +]