mirror of
https://github.com/johnkerl/miller.git
synced 2026-01-23 02:14:13 +00:00
path-neatens
This commit is contained in:
John Kerl
parent
443dcf52ca
commit
49fada0aa5
7 changed files with 420 additions and 418 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -33,6 +33,7 @@ test_parse_trie
|
|||
test_peek_file_reader
|
||||
test_string_builder
|
||||
output-regtest
|
||||
output-reg-test
|
||||
termcvt
|
||||
a.out
|
||||
*.dSYM
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
for arg; do
|
||||
src=output-regtest/$arg.out
|
||||
src=output-reg-test/$arg.out
|
||||
if [ ! -f $src ]; then
|
||||
echo "Cannot find source $src" 1>&2
|
||||
exit 1
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/abixy.temp1
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/abixy.temp1
|
||||
a=pan,b=pan,i=1,x=0.3467901443380824,y=0.7268028627434533
|
||||
a=eks,b=pan,i=2,x=0.7586799647899636,y=0.5221511083334797
|
||||
a=wye,b=wye,i=3,x=0.20460330576630303,y=0.33831852551664776
|
||||
|
|
@ -11,7 +11,7 @@ a=zee,b=wye,i=8,x=0.5985540091064224,y=0.976181385699006
|
|||
a=hat,b=wye,i=9,x=0.03144187646093577,y=0.7495507603507059
|
||||
a=pan,b=wye,i=10,x=0.5026260055412137,y=0.9526183602969864
|
||||
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/abixy.temp2
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/abixy.temp2
|
||||
a=pan,b=pan,i=1,x=0.3467901443380824,y=0.7268028627434533
|
||||
a=eks,b=pan,i=2,x=0.7586799647899636,y=0.5221511083334797
|
||||
a=wye,b=wye,i=3,x=0.20460330576630303,y=0.33831852551664776
|
||||
|
|
@ -23,14 +23,14 @@ a=zee,b=wye,i=8,x=0.5985540091064224,y=0.976181385699006
|
|||
a=hat,b=wye,i=9,x=0.03144187646093577,y=0.7495507603507059
|
||||
a=pan,b=wye,i=10,x=0.5026260055412137,y=0.9526183602969864
|
||||
|
||||
mlr -I --opprint head -n 2 /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/abixy.temp1 /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/abixy.temp2
|
||||
mlr -I --opprint head -n 2 /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/abixy.temp1 /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/abixy.temp2
|
||||
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/abixy.temp1
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/abixy.temp1
|
||||
a b i x y
|
||||
pan pan 1 0.3467901443380824 0.7268028627434533
|
||||
eks pan 2 0.7586799647899636 0.5221511083334797
|
||||
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/abixy.temp2
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/abixy.temp2
|
||||
a b i x y
|
||||
pan pan 1 0.3467901443380824 0.7268028627434533
|
||||
eks pan 2 0.7586799647899636 0.5221511083334797
|
||||
|
|
@ -38,10 +38,10 @@ eks pan 2 0.7586799647899636 0.5221511083334797
|
|||
mlr -I --opprint head -n 2
|
||||
mlr: -I option (in-place operation) requires input files.
|
||||
|
||||
mlr -I --opprint -n head -n 2 /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/abixy.temp1
|
||||
mlr -I --opprint -n head -n 2 /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/abixy.temp1
|
||||
mlr: -I option (in-place operation) requires input files.
|
||||
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/abixy.temp1
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/abixy.temp1
|
||||
a=pan,b=pan,i=1,x=0.3467901443380824,y=0.7268028627434533
|
||||
a=eks,b=pan,i=2,x=0.7586799647899636,y=0.5221511083334797
|
||||
a=wye,b=wye,i=3,x=0.20460330576630303,y=0.33831852551664776
|
||||
|
|
@ -53,7 +53,7 @@ a=zee,b=wye,i=8,x=0.5985540091064224,y=0.976181385699006
|
|||
a=hat,b=wye,i=9,x=0.03144187646093577,y=0.7495507603507059
|
||||
a=pan,b=wye,i=10,x=0.5026260055412137,y=0.9526183602969864
|
||||
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/abixy.temp2
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/abixy.temp2
|
||||
a=pan,b=pan,i=1,x=0.3467901443380824,y=0.7268028627434533
|
||||
a=eks,b=pan,i=2,x=0.7586799647899636,y=0.5221511083334797
|
||||
a=wye,b=wye,i=3,x=0.20460330576630303,y=0.33831852551664776
|
||||
|
|
@ -65,9 +65,9 @@ a=zee,b=wye,i=8,x=0.5985540091064224,y=0.976181385699006
|
|||
a=hat,b=wye,i=9,x=0.03144187646093577,y=0.7495507603507059
|
||||
a=pan,b=wye,i=10,x=0.5026260055412137,y=0.9526183602969864
|
||||
|
||||
mlr -I --opprint rename a,AYE,b,BEE /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/abixy.temp1 /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/abixy.temp2
|
||||
mlr -I --opprint rename a,AYE,b,BEE /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/abixy.temp1 /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/abixy.temp2
|
||||
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/abixy.temp1
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/abixy.temp1
|
||||
AYE BEE i x y
|
||||
pan pan 1 0.3467901443380824 0.7268028627434533
|
||||
eks pan 2 0.7586799647899636 0.5221511083334797
|
||||
|
|
@ -80,7 +80,7 @@ zee wye 8 0.5985540091064224 0.976181385699006
|
|||
hat wye 9 0.03144187646093577 0.7495507603507059
|
||||
pan wye 10 0.5026260055412137 0.9526183602969864
|
||||
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/abixy.temp2
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/abixy.temp2
|
||||
AYE BEE i x y
|
||||
pan pan 1 0.3467901443380824 0.7268028627434533
|
||||
eks pan 2 0.7586799647899636 0.5221511083334797
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ mlr termcvt --lf2crlf
|
|||
|
||||
|
||||
---------------------------------------------------------------- input comments1-crlf.dkvp
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.dkvp
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.dkvp
|
||||
# hello world 1
|
||||
a=1,b=2,c=3
|
||||
a=4,b=5,c=6
|
||||
|
|
@ -170,7 +170,7 @@ a 4
|
|||
b 5
|
||||
c 6
|
||||
|
||||
mlr --skip-comments --idkvp --oxtab cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.dkvp
|
||||
mlr --skip-comments --idkvp --oxtab cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.dkvp
|
||||
a 1
|
||||
b 2
|
||||
c 3
|
||||
|
|
@ -191,7 +191,7 @@ a 4
|
|||
b 5
|
||||
c 6
|
||||
|
||||
mlr --pass-comments --idkvp --oxtab cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.dkvp
|
||||
mlr --pass-comments --idkvp --oxtab cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.dkvp
|
||||
# hello world 1
|
||||
a 1
|
||||
b 2
|
||||
|
|
@ -507,7 +507,7 @@ mlr termcvt --lf2crlf
|
|||
|
||||
|
||||
---------------------------------------------------------------- input comments1-crlf.nidx
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.nidx
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.nidx
|
||||
# hello world 1
|
||||
aX1 bX2 cX3
|
||||
aX4 bX5 cX6
|
||||
|
|
@ -523,7 +523,7 @@ mlr --skip-comments --inidx --oxtab cat
|
|||
2 bX5
|
||||
3 cX6
|
||||
|
||||
mlr --skip-comments --inidx --oxtab cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.nidx
|
||||
mlr --skip-comments --inidx --oxtab cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.nidx
|
||||
1 aX1
|
||||
2 bX2
|
||||
3 cX3
|
||||
|
|
@ -544,7 +544,7 @@ mlr --pass-comments --inidx --oxtab cat
|
|||
2 bX5
|
||||
3 cX6
|
||||
|
||||
mlr --pass-comments --inidx --oxtab cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.nidx
|
||||
mlr --pass-comments --inidx --oxtab cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.nidx
|
||||
# hello world 1
|
||||
1 aX1
|
||||
2 bX2
|
||||
|
|
@ -649,7 +649,7 @@ mlr termcvt --lf2crlf
|
|||
|
||||
|
||||
---------------------------------------------------------------- input comments1-crlf.json
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.json
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.json
|
||||
# hello world 1
|
||||
{ "a":1, "b":2, "c":3 }
|
||||
{ "a":4, "b":5, "c":6 }
|
||||
|
|
@ -660,7 +660,7 @@ mlr --skip-comments --ijson --odkvp cat
|
|||
a=1,b=2,c=3
|
||||
a=4,b=5,c=6
|
||||
|
||||
mlr --skip-comments --ijson --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.json
|
||||
mlr --skip-comments --ijson --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.json
|
||||
a=1,b=2,c=3
|
||||
a=4,b=5,c=6
|
||||
|
||||
|
|
@ -671,7 +671,7 @@ mlr --pass-comments --ijson --odkvp cat
|
|||
a=1,b=2,c=3
|
||||
a=4,b=5,c=6
|
||||
|
||||
mlr --pass-comments --ijson --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.json
|
||||
mlr --pass-comments --ijson --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.json
|
||||
# hello world 1
|
||||
a=1,b=2,c=3
|
||||
a=4,b=5,c=6
|
||||
|
|
@ -769,7 +769,7 @@ mlr termcvt --lf2crlf
|
|||
|
||||
|
||||
---------------------------------------------------------------- input comments1-crlf.xtab
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.xtab
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.xtab
|
||||
x 1
|
||||
#hello world3
|
||||
z 3
|
||||
|
|
@ -785,7 +785,7 @@ mlr --skip-comments --ixtab --odkvp cat
|
|||
x=1,z=3
|
||||
x=2,z=5
|
||||
|
||||
mlr --skip-comments --ixtab --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.xtab
|
||||
mlr --skip-comments --ixtab --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.xtab
|
||||
x=1,z=3
|
||||
x=2,z=5
|
||||
|
||||
|
|
@ -797,7 +797,7 @@ x=1,z=3
|
|||
#hello world4
|
||||
x=2,z=5
|
||||
|
||||
mlr --pass-comments --ixtab --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.xtab
|
||||
mlr --pass-comments --ixtab --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.xtab
|
||||
#hello world3
|
||||
x=1,z=3
|
||||
#hello world4
|
||||
|
|
@ -880,7 +880,7 @@ mlr termcvt --lf2crlf
|
|||
|
||||
|
||||
---------------------------------------------------------------- input comments1-crlf.csv
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.csv
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.csv
|
||||
# hello
|
||||
a,b,c
|
||||
1,2,3
|
||||
|
|
@ -892,7 +892,7 @@ mlr --skip-comments --icsvlite --odkvp cat
|
|||
a=1,b=2,c=3
|
||||
a=4,b=5,c=6
|
||||
|
||||
mlr --skip-comments --icsvlite --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.csv
|
||||
mlr --skip-comments --icsvlite --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.csv
|
||||
a=1,b=2,c=3
|
||||
a=4,b=5,c=6
|
||||
|
||||
|
|
@ -903,7 +903,7 @@ mlr --pass-comments --icsvlite --odkvp cat
|
|||
a=1,b=2,c=3
|
||||
a=4,b=5,c=6
|
||||
|
||||
mlr --pass-comments --icsvlite --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.csv
|
||||
mlr --pass-comments --icsvlite --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.csv
|
||||
# hello
|
||||
a=1,b=2,c=3
|
||||
a=4,b=5,c=6
|
||||
|
|
@ -985,7 +985,7 @@ mlr termcvt --lf2crlf
|
|||
|
||||
|
||||
---------------------------------------------------------------- input comments1-crlf.csv
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.csv
|
||||
cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.csv
|
||||
# hello
|
||||
a,b,c
|
||||
1,2,3
|
||||
|
|
@ -997,7 +997,7 @@ mlr --skip-comments --icsv --odkvp cat
|
|||
a=1,b=2,c=3
|
||||
a=4,b=5,c=6
|
||||
|
||||
mlr --skip-comments --icsv --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.csv
|
||||
mlr --skip-comments --icsv --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.csv
|
||||
a=1,b=2,c=3
|
||||
a=4,b=5,c=6
|
||||
|
||||
|
|
@ -1008,7 +1008,7 @@ mlr --pass-comments --icsv --odkvp cat
|
|||
a=1,b=2,c=3
|
||||
a=4,b=5,c=6
|
||||
|
||||
mlr --pass-comments --icsv --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/comments1-crlf.csv
|
||||
mlr --pass-comments --icsv --odkvp cat /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-reg-test/comments1-crlf.csv
|
||||
# hello
|
||||
a=1,b=2,c=3
|
||||
a=4,b=5,c=6
|
||||
|
|
|
|||
|
|
@ -144,8 +144,8 @@ fi
|
|||
# Input/output locations
|
||||
indir=$ourdir/input
|
||||
expdir=$ourdir/expected
|
||||
outdir=$pwd/output-regtest
|
||||
reloutdir=./output-regtest
|
||||
outdir=$pwd/output-reg-test
|
||||
reloutdir=./output-reg-test
|
||||
|
||||
verbose="false"
|
||||
case_file_names="" # None means all
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ no need to bootstrap a parser for the parser-generator language
|
|||
- diff the *.err files -- ?
|
||||
! move u/* data files to $indir
|
||||
- double-check c/go sieve.mlr parse/execute ok
|
||||
- easier differ -- C5 optional or something
|
||||
|
||||
* justWroteEmptyLine -> pprint too ...
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue