diff --git a/go/reg-test/cases/case-c-dsl-break-continue.sh b/go/reg-test/cases/case-dsl-break-continue.sh similarity index 100% rename from go/reg-test/cases/case-c-dsl-break-continue.sh rename to go/reg-test/cases/case-dsl-break-continue.sh diff --git a/go/reg-test/expected/case-c-dsl-break-continue.sh.out b/go/reg-test/expected/case-dsl-break-continue.sh.out similarity index 80% rename from go/reg-test/expected/case-c-dsl-break-continue.sh.out rename to go/reg-test/expected/case-dsl-break-continue.sh.out index a4316dcc7..7605fc9e7 100644 --- a/go/reg-test/expected/case-c-dsl-break-continue.sh.out +++ b/go/reg-test/expected/case-dsl-break-continue.sh.out @@ -598,43 +598,43 @@ NR k logging1 1 a pan 1 b pan 1 i 1 -1 x 0.346790 +1 x 0.3467901443380824 2 a eks 2 b pan 2 i 2 -2 x 0.758680 +2 x 0.7586799647899636 3 a wye 3 b wye 3 i 3 -3 x 0.204603 +3 x 0.20460330576630303 4 a eks 4 b wye 4 i 4 -4 x 0.381399 +4 x 0.38139939387114097 5 a wye 5 b pan 5 i 5 -5 x 0.573289 +5 x 0.5732889198020006 6 a zee 6 b pan 6 i 6 -6 x 0.527126 +6 x 0.5271261600918548 7 a eks 7 b zee 7 i 7 -7 x 0.611784 +7 x 0.6117840605678454 8 a zee 8 b wye 8 i 8 -8 x 0.598554 +8 x 0.5985540091064224 9 a hat 9 b wye 9 i 9 -9 x 0.031442 +9 x 0.03144187646093577 10 a pan 10 b wye 10 i 10 -10 x 0.502626 +10 x 0.5026260055412137 mlr --opprint --from ./reg-test/input/abixy put -q for (k,v in $*) { @@ -694,53 +694,53 @@ NR k logging3 1 a pan 1 b pan 1 i 1 -1 x 0.346790 -1 y 0.726803 +1 x 0.3467901443380824 +1 y 0.7268028627434533 2 a eks 2 b pan 2 i 2 -2 x 0.758680 -2 y 0.522151 +2 x 0.7586799647899636 +2 y 0.5221511083334797 3 a wye 3 b wye 3 i 3 -3 x 0.204603 -3 y 0.338319 +3 x 0.20460330576630303 +3 y 0.33831852551664776 4 a eks 4 b wye 4 i 4 -4 x 0.381399 -4 y 0.134189 +4 x 0.38139939387114097 +4 y 0.13418874328430463 5 a wye 5 b pan 5 i 5 -5 x 0.573289 -5 y 0.863624 +5 x 0.5732889198020006 +5 y 0.8636244699032729 6 a zee 6 b pan 6 i 6 -6 x 0.527126 -6 y 0.493221 +6 x 0.5271261600918548 +6 y 0.49322128674835697 7 a eks 7 b zee 7 i 7 -7 x 0.611784 -7 y 0.187885 +7 x 0.6117840605678454 +7 y 0.1878849191181694 8 a zee 8 b wye 8 i 8 -8 x 0.598554 -8 y 0.976181 +8 x 0.5985540091064224 +8 y 0.976181385699006 9 a hat 9 b wye 9 i 9 -9 x 0.031442 -9 y 0.749551 +9 x 0.03144187646093577 +9 y 0.7495507603507059 10 a pan 10 b wye 10 i 10 -10 x 0.502626 -10 y 0.952618 +10 x 0.5026260055412137 +10 y 0.9526183602969864 mlr --opprint --from ./reg-test/input/abixy put -q for (k,v in $*) { @@ -757,43 +757,43 @@ NR k logging4 1 a pan 1 b pan 1 i 1 -1 y 0.726803 +1 y 0.7268028627434533 2 a eks 2 b pan 2 i 2 -2 y 0.522151 +2 y 0.5221511083334797 3 a wye 3 b wye 3 i 3 -3 y 0.338319 +3 y 0.33831852551664776 4 a eks 4 b wye 4 i 4 -4 y 0.134189 +4 y 0.13418874328430463 5 a wye 5 b pan 5 i 5 -5 y 0.863624 +5 y 0.8636244699032729 6 a zee 6 b pan 6 i 6 -6 y 0.493221 +6 y 0.49322128674835697 7 a eks 7 b zee 7 i 7 -7 y 0.187885 +7 y 0.1878849191181694 8 a zee 8 b wye 8 i 8 -8 y 0.976181 +8 y 0.976181385699006 9 a hat 9 b wye 9 i 9 -9 y 0.749551 +9 y 0.7495507603507059 10 a pan 10 b wye 10 i 10 -10 y 0.952618 +10 y 0.9526183602969864 mlr --opprint --from ./reg-test/input/abixy put -q for (k,v in $*) { @@ -835,43 +835,43 @@ NR k logging1 1 a pan 1 b pan 1 i 1 -1 x 0.346790 +1 x 0.3467901443380824 2 a eks 2 b pan 2 i 2 -2 x 0.758680 +2 x 0.7586799647899636 3 a wye 3 b wye 3 i 3 -3 x 0.204603 +3 x 0.20460330576630303 4 a eks 4 b wye 4 i 4 -4 x 0.381399 +4 x 0.38139939387114097 5 a wye 5 b pan 5 i 5 -5 x 0.573289 +5 x 0.5732889198020006 6 a zee 6 b pan 6 i 6 -6 x 0.527126 +6 x 0.5271261600918548 7 a eks 7 b zee 7 i 7 -7 x 0.611784 +7 x 0.6117840605678454 8 a zee 8 b wye 8 i 8 -8 x 0.598554 +8 x 0.5985540091064224 9 a hat 9 b wye 9 i 9 -9 x 0.031442 +9 x 0.03144187646093577 10 a pan 10 b wye 10 i 10 -10 x 0.502626 +10 x 0.5026260055412137 NR k logging2 1 a pan @@ -909,95 +909,95 @@ NR k logging3 1 a pan 1 b pan 1 i 1 -1 x 0.346790 -1 y 0.726803 +1 x 0.3467901443380824 +1 y 0.7268028627434533 2 a eks 2 b pan 2 i 2 -2 x 0.758680 -2 y 0.522151 +2 x 0.7586799647899636 +2 y 0.5221511083334797 3 a wye 3 b wye 3 i 3 -3 x 0.204603 -3 y 0.338319 +3 x 0.20460330576630303 +3 y 0.33831852551664776 4 a eks 4 b wye 4 i 4 -4 x 0.381399 -4 y 0.134189 +4 x 0.38139939387114097 +4 y 0.13418874328430463 5 a wye 5 b pan 5 i 5 -5 x 0.573289 -5 y 0.863624 +5 x 0.5732889198020006 +5 y 0.8636244699032729 6 a zee 6 b pan 6 i 6 -6 x 0.527126 -6 y 0.493221 +6 x 0.5271261600918548 +6 y 0.49322128674835697 7 a eks 7 b zee 7 i 7 -7 x 0.611784 -7 y 0.187885 +7 x 0.6117840605678454 +7 y 0.1878849191181694 8 a zee 8 b wye 8 i 8 -8 x 0.598554 -8 y 0.976181 +8 x 0.5985540091064224 +8 y 0.976181385699006 9 a hat 9 b wye 9 i 9 -9 x 0.031442 -9 y 0.749551 +9 x 0.03144187646093577 +9 y 0.7495507603507059 10 a pan 10 b wye 10 i 10 -10 x 0.502626 -10 y 0.952618 +10 x 0.5026260055412137 +10 y 0.9526183602969864 NR k logging4 1 a pan 1 b pan 1 i 1 -1 y 0.726803 +1 y 0.7268028627434533 2 a eks 2 b pan 2 i 2 -2 y 0.522151 +2 y 0.5221511083334797 3 a wye 3 b wye 3 i 3 -3 y 0.338319 +3 y 0.33831852551664776 4 a eks 4 b wye 4 i 4 -4 y 0.134189 +4 y 0.13418874328430463 5 a wye 5 b pan 5 i 5 -5 y 0.863624 +5 y 0.8636244699032729 6 a zee 6 b pan 6 i 6 -6 y 0.493221 +6 y 0.49322128674835697 7 a eks 7 b zee 7 i 7 -7 y 0.187885 +7 y 0.1878849191181694 8 a zee 8 b wye 8 i 8 -8 y 0.976181 +8 y 0.976181385699006 9 a hat 9 b wye 9 i 9 -9 y 0.749551 +9 y 0.7495507603507059 10 a pan 10 b wye 10 i 10 -10 y 0.952618 +10 y 0.9526183602969864 ================================================================ @@ -1116,53 +1116,53 @@ NR name output1 1 a pan 1 b pan 1 i 1 -1 x 0.346790 -1 y 0.726803 +1 x 0.3467901443380824 +1 y 0.7268028627434533 2 a eks 2 b pan 2 i 2 -2 x 0.758680 -2 y 0.522151 +2 x 0.7586799647899636 +2 y 0.5221511083334797 3 a wye 3 b wye 3 i 3 -3 x 0.204603 -3 y 0.338319 +3 x 0.20460330576630303 +3 y 0.33831852551664776 4 a eks 4 b wye 4 i 4 -4 x 0.381399 -4 y 0.134189 +4 x 0.38139939387114097 +4 y 0.13418874328430463 5 a wye 5 b pan 5 i 5 -5 x 0.573289 -5 y 0.863624 +5 x 0.5732889198020006 +5 y 0.8636244699032729 6 a zee 6 b pan 6 i 6 -6 x 0.527126 -6 y 0.493221 +6 x 0.5271261600918548 +6 y 0.49322128674835697 7 a eks 7 b zee 7 i 7 -7 x 0.611784 -7 y 0.187885 +7 x 0.6117840605678454 +7 y 0.1878849191181694 8 a zee 8 b wye 8 i 8 -8 x 0.598554 -8 y 0.976181 +8 x 0.5985540091064224 +8 y 0.976181385699006 9 a hat 9 b wye 9 i 9 -9 x 0.031442 -9 y 0.749551 +9 x 0.03144187646093577 +9 y 0.7495507603507059 10 a pan 10 b wye 10 i 10 -10 x 0.502626 -10 y 0.952618 +10 x 0.5026260055412137 +10 y 0.9526183602969864 NR names output2 1 a_a before @@ -1235,53 +1235,53 @@ NR name output1 1 a pan 1 b pan 1 i 1 -1 x 0.346790 -1 y 0.726803 +1 x 0.3467901443380824 +1 y 0.7268028627434533 2 a eks 2 b pan 2 i 2 -2 x 0.758680 -2 y 0.522151 +2 x 0.7586799647899636 +2 y 0.5221511083334797 3 a wye 3 b wye 3 i 3 -3 x 0.204603 -3 y 0.338319 +3 x 0.20460330576630303 +3 y 0.33831852551664776 4 a eks 4 b wye 4 i 4 -4 x 0.381399 -4 y 0.134189 +4 x 0.38139939387114097 +4 y 0.13418874328430463 5 a wye 5 b pan 5 i 5 -5 x 0.573289 -5 y 0.863624 +5 x 0.5732889198020006 +5 y 0.8636244699032729 6 a zee 6 b pan 6 i 6 -6 x 0.527126 -6 y 0.493221 +6 x 0.5271261600918548 +6 y 0.49322128674835697 7 a eks 7 b zee 7 i 7 -7 x 0.611784 -7 y 0.187885 +7 x 0.6117840605678454 +7 y 0.1878849191181694 8 a zee 8 b wye 8 i 8 -8 x 0.598554 -8 y 0.976181 +8 x 0.5985540091064224 +8 y 0.976181385699006 9 a hat 9 b wye 9 i 9 -9 x 0.031442 -9 y 0.749551 +9 x 0.03144187646093577 +9 y 0.7495507603507059 10 a pan 10 b wye 10 i 10 -10 x 0.502626 -10 y 0.952618 +10 x 0.5026260055412137 +10 y 0.9526183602969864 NR names output2 1 a_a before @@ -1770,53 +1770,53 @@ NR names output2 1 a_a pan 1 a_b pan 1 a_i 1 -1 a_x 0.346790 -1 a_y 0.726803 +1 a_x 0.3467901443380824 +1 a_y 0.7268028627434533 2 a_a eks 2 a_b pan 2 a_i 2 -2 a_x 0.758680 -2 a_y 0.522151 +2 a_x 0.7586799647899636 +2 a_y 0.5221511083334797 3 a_a wye 3 a_b wye 3 a_i 3 -3 a_x 0.204603 -3 a_y 0.338319 +3 a_x 0.20460330576630303 +3 a_y 0.33831852551664776 4 a_a eks 4 a_b wye 4 a_i 4 -4 a_x 0.381399 -4 a_y 0.134189 +4 a_x 0.38139939387114097 +4 a_y 0.13418874328430463 5 a_a wye 5 a_b pan 5 a_i 5 -5 a_x 0.573289 -5 a_y 0.863624 +5 a_x 0.5732889198020006 +5 a_y 0.8636244699032729 6 a_a zee 6 a_b pan 6 a_i 6 -6 a_x 0.527126 -6 a_y 0.493221 +6 a_x 0.5271261600918548 +6 a_y 0.49322128674835697 7 a_a eks 7 a_b zee 7 a_i 7 -7 a_x 0.611784 -7 a_y 0.187885 +7 a_x 0.6117840605678454 +7 a_y 0.1878849191181694 8 a_a zee 8 a_b wye 8 a_i 8 -8 a_x 0.598554 -8 a_y 0.976181 +8 a_x 0.5985540091064224 +8 a_y 0.976181385699006 9 a_a hat 9 a_b wye 9 a_i 9 -9 a_x 0.031442 -9 a_y 0.749551 +9 a_x 0.03144187646093577 +9 a_y 0.7495507603507059 10 a_a pan 10 a_b wye 10 a_i 10 -10 a_x 0.502626 -10 a_y 0.952618 +10 a_x 0.5026260055412137 +10 a_y 0.9526183602969864 mlr --opprint --from ./reg-test/input/abixy put -q for (k1, v1 in $*) { @@ -1839,255 +1839,255 @@ NR name output1 1 a pan 1 b before 1 i 1 -1 x 0.346790 -1 y 0.726803 +1 x 0.3467901443380824 +1 y 0.7268028627434533 2 a eks 2 b before 2 i 2 -2 x 0.758680 -2 y 0.522151 +2 x 0.7586799647899636 +2 y 0.5221511083334797 3 a wye 3 b before 3 i 3 -3 x 0.204603 -3 y 0.338319 +3 x 0.20460330576630303 +3 y 0.33831852551664776 4 a eks 4 b before 4 i 4 -4 x 0.381399 -4 y 0.134189 +4 x 0.38139939387114097 +4 y 0.13418874328430463 5 a wye 5 b before 5 i 5 -5 x 0.573289 -5 y 0.863624 +5 x 0.5732889198020006 +5 y 0.8636244699032729 6 a zee 6 b before 6 i 6 -6 x 0.527126 -6 y 0.493221 +6 x 0.5271261600918548 +6 y 0.49322128674835697 7 a eks 7 b before 7 i 7 -7 x 0.611784 -7 y 0.187885 +7 x 0.6117840605678454 +7 y 0.1878849191181694 8 a zee 8 b before 8 i 8 -8 x 0.598554 -8 y 0.976181 +8 x 0.5985540091064224 +8 y 0.976181385699006 9 a hat 9 b before 9 i 9 -9 x 0.031442 -9 y 0.749551 +9 x 0.03144187646093577 +9 y 0.7495507603507059 10 a pan 10 b before 10 i 10 -10 x 0.502626 -10 y 0.952618 +10 x 0.5026260055412137 +10 y 0.9526183602969864 NR names output2 1 a_a pan 1 a_b pan 1 a_i 1 -1 a_x 0.346790 -1 a_y 0.726803 +1 a_x 0.3467901443380824 +1 a_y 0.7268028627434533 1 i_a pan 1 i_b pan 1 i_i 1 -1 i_x 0.346790 -1 i_y 0.726803 +1 i_x 0.3467901443380824 +1 i_y 0.7268028627434533 1 x_a pan 1 x_b pan 1 x_i 1 -1 x_x 0.346790 -1 x_y 0.726803 +1 x_x 0.3467901443380824 +1 x_y 0.7268028627434533 1 y_a pan 1 y_b pan 1 y_i 1 -1 y_x 0.346790 -1 y_y 0.726803 +1 y_x 0.3467901443380824 +1 y_y 0.7268028627434533 2 a_a eks 2 a_b pan 2 a_i 2 -2 a_x 0.758680 -2 a_y 0.522151 +2 a_x 0.7586799647899636 +2 a_y 0.5221511083334797 2 i_a eks 2 i_b pan 2 i_i 2 -2 i_x 0.758680 -2 i_y 0.522151 +2 i_x 0.7586799647899636 +2 i_y 0.5221511083334797 2 x_a eks 2 x_b pan 2 x_i 2 -2 x_x 0.758680 -2 x_y 0.522151 +2 x_x 0.7586799647899636 +2 x_y 0.5221511083334797 2 y_a eks 2 y_b pan 2 y_i 2 -2 y_x 0.758680 -2 y_y 0.522151 +2 y_x 0.7586799647899636 +2 y_y 0.5221511083334797 3 a_a wye 3 a_b wye 3 a_i 3 -3 a_x 0.204603 -3 a_y 0.338319 +3 a_x 0.20460330576630303 +3 a_y 0.33831852551664776 3 i_a wye 3 i_b wye 3 i_i 3 -3 i_x 0.204603 -3 i_y 0.338319 +3 i_x 0.20460330576630303 +3 i_y 0.33831852551664776 3 x_a wye 3 x_b wye 3 x_i 3 -3 x_x 0.204603 -3 x_y 0.338319 +3 x_x 0.20460330576630303 +3 x_y 0.33831852551664776 3 y_a wye 3 y_b wye 3 y_i 3 -3 y_x 0.204603 -3 y_y 0.338319 +3 y_x 0.20460330576630303 +3 y_y 0.33831852551664776 4 a_a eks 4 a_b wye 4 a_i 4 -4 a_x 0.381399 -4 a_y 0.134189 +4 a_x 0.38139939387114097 +4 a_y 0.13418874328430463 4 i_a eks 4 i_b wye 4 i_i 4 -4 i_x 0.381399 -4 i_y 0.134189 +4 i_x 0.38139939387114097 +4 i_y 0.13418874328430463 4 x_a eks 4 x_b wye 4 x_i 4 -4 x_x 0.381399 -4 x_y 0.134189 +4 x_x 0.38139939387114097 +4 x_y 0.13418874328430463 4 y_a eks 4 y_b wye 4 y_i 4 -4 y_x 0.381399 -4 y_y 0.134189 +4 y_x 0.38139939387114097 +4 y_y 0.13418874328430463 5 a_a wye 5 a_b pan 5 a_i 5 -5 a_x 0.573289 -5 a_y 0.863624 +5 a_x 0.5732889198020006 +5 a_y 0.8636244699032729 5 i_a wye 5 i_b pan 5 i_i 5 -5 i_x 0.573289 -5 i_y 0.863624 +5 i_x 0.5732889198020006 +5 i_y 0.8636244699032729 5 x_a wye 5 x_b pan 5 x_i 5 -5 x_x 0.573289 -5 x_y 0.863624 +5 x_x 0.5732889198020006 +5 x_y 0.8636244699032729 5 y_a wye 5 y_b pan 5 y_i 5 -5 y_x 0.573289 -5 y_y 0.863624 +5 y_x 0.5732889198020006 +5 y_y 0.8636244699032729 6 a_a zee 6 a_b pan 6 a_i 6 -6 a_x 0.527126 -6 a_y 0.493221 +6 a_x 0.5271261600918548 +6 a_y 0.49322128674835697 6 i_a zee 6 i_b pan 6 i_i 6 -6 i_x 0.527126 -6 i_y 0.493221 +6 i_x 0.5271261600918548 +6 i_y 0.49322128674835697 6 x_a zee 6 x_b pan 6 x_i 6 -6 x_x 0.527126 -6 x_y 0.493221 +6 x_x 0.5271261600918548 +6 x_y 0.49322128674835697 6 y_a zee 6 y_b pan 6 y_i 6 -6 y_x 0.527126 -6 y_y 0.493221 +6 y_x 0.5271261600918548 +6 y_y 0.49322128674835697 7 a_a eks 7 a_b zee 7 a_i 7 -7 a_x 0.611784 -7 a_y 0.187885 +7 a_x 0.6117840605678454 +7 a_y 0.1878849191181694 7 i_a eks 7 i_b zee 7 i_i 7 -7 i_x 0.611784 -7 i_y 0.187885 +7 i_x 0.6117840605678454 +7 i_y 0.1878849191181694 7 x_a eks 7 x_b zee 7 x_i 7 -7 x_x 0.611784 -7 x_y 0.187885 +7 x_x 0.6117840605678454 +7 x_y 0.1878849191181694 7 y_a eks 7 y_b zee 7 y_i 7 -7 y_x 0.611784 -7 y_y 0.187885 +7 y_x 0.6117840605678454 +7 y_y 0.1878849191181694 8 a_a zee 8 a_b wye 8 a_i 8 -8 a_x 0.598554 -8 a_y 0.976181 +8 a_x 0.5985540091064224 +8 a_y 0.976181385699006 8 i_a zee 8 i_b wye 8 i_i 8 -8 i_x 0.598554 -8 i_y 0.976181 +8 i_x 0.5985540091064224 +8 i_y 0.976181385699006 8 x_a zee 8 x_b wye 8 x_i 8 -8 x_x 0.598554 -8 x_y 0.976181 +8 x_x 0.5985540091064224 +8 x_y 0.976181385699006 8 y_a zee 8 y_b wye 8 y_i 8 -8 y_x 0.598554 -8 y_y 0.976181 +8 y_x 0.5985540091064224 +8 y_y 0.976181385699006 9 a_a hat 9 a_b wye 9 a_i 9 -9 a_x 0.031442 -9 a_y 0.749551 +9 a_x 0.03144187646093577 +9 a_y 0.7495507603507059 9 i_a hat 9 i_b wye 9 i_i 9 -9 i_x 0.031442 -9 i_y 0.749551 +9 i_x 0.03144187646093577 +9 i_y 0.7495507603507059 9 x_a hat 9 x_b wye 9 x_i 9 -9 x_x 0.031442 -9 x_y 0.749551 +9 x_x 0.03144187646093577 +9 x_y 0.7495507603507059 9 y_a hat 9 y_b wye 9 y_i 9 -9 y_x 0.031442 -9 y_y 0.749551 +9 y_x 0.03144187646093577 +9 y_y 0.7495507603507059 10 a_a pan 10 a_b wye 10 a_i 10 -10 a_x 0.502626 -10 a_y 0.952618 +10 a_x 0.5026260055412137 +10 a_y 0.9526183602969864 10 i_a pan 10 i_b wye 10 i_i 10 -10 i_x 0.502626 -10 i_y 0.952618 +10 i_x 0.5026260055412137 +10 i_y 0.9526183602969864 10 x_a pan 10 x_b wye 10 x_i 10 -10 x_x 0.502626 -10 x_y 0.952618 +10 x_x 0.5026260055412137 +10 x_y 0.9526183602969864 10 y_a pan 10 y_b wye 10 y_i 10 -10 y_x 0.502626 -10 y_y 0.952618 +10 y_x 0.5026260055412137 +10 y_y 0.9526183602969864 mlr --opprint --from ./reg-test/input/abixy put -q for (k1, v1 in $*) { @@ -2110,53 +2110,53 @@ NR name output1 1 a pan 1 b pan 1 i 1 -1 x 0.346790 -1 y 0.726803 +1 x 0.3467901443380824 +1 y 0.7268028627434533 2 a eks 2 b pan 2 i 2 -2 x 0.758680 -2 y 0.522151 +2 x 0.7586799647899636 +2 y 0.5221511083334797 3 a wye 3 b wye 3 i 3 -3 x 0.204603 -3 y 0.338319 +3 x 0.20460330576630303 +3 y 0.33831852551664776 4 a eks 4 b wye 4 i 4 -4 x 0.381399 -4 y 0.134189 +4 x 0.38139939387114097 +4 y 0.13418874328430463 5 a wye 5 b pan 5 i 5 -5 x 0.573289 -5 y 0.863624 +5 x 0.5732889198020006 +5 y 0.8636244699032729 6 a zee 6 b pan 6 i 6 -6 x 0.527126 -6 y 0.493221 +6 x 0.5271261600918548 +6 y 0.49322128674835697 7 a eks 7 b zee 7 i 7 -7 x 0.611784 -7 y 0.187885 +7 x 0.6117840605678454 +7 y 0.1878849191181694 8 a zee 8 b wye 8 i 8 -8 x 0.598554 -8 y 0.976181 +8 x 0.5985540091064224 +8 y 0.976181385699006 9 a hat 9 b wye 9 i 9 -9 x 0.031442 -9 y 0.749551 +9 x 0.03144187646093577 +9 y 0.7495507603507059 10 a pan 10 b wye 10 i 10 -10 x 0.502626 -10 y 0.952618 +10 x 0.5026260055412137 +10 y 0.9526183602969864 NR names output2 1 a_a before @@ -2231,305 +2231,305 @@ NR name output1 1 a pan 1 b pan 1 i 1 -1 x 0.346790 -1 y 0.726803 +1 x 0.3467901443380824 +1 y 0.7268028627434533 2 a eks 2 b pan 2 i 2 -2 x 0.758680 -2 y 0.522151 +2 x 0.7586799647899636 +2 y 0.5221511083334797 3 a wye 3 b wye 3 i 3 -3 x 0.204603 -3 y 0.338319 +3 x 0.20460330576630303 +3 y 0.33831852551664776 4 a eks 4 b wye 4 i 4 -4 x 0.381399 -4 y 0.134189 +4 x 0.38139939387114097 +4 y 0.13418874328430463 5 a wye 5 b pan 5 i 5 -5 x 0.573289 -5 y 0.863624 +5 x 0.5732889198020006 +5 y 0.8636244699032729 6 a zee 6 b pan 6 i 6 -6 x 0.527126 -6 y 0.493221 +6 x 0.5271261600918548 +6 y 0.49322128674835697 7 a eks 7 b zee 7 i 7 -7 x 0.611784 -7 y 0.187885 +7 x 0.6117840605678454 +7 y 0.1878849191181694 8 a zee 8 b wye 8 i 8 -8 x 0.598554 -8 y 0.976181 +8 x 0.5985540091064224 +8 y 0.976181385699006 9 a hat 9 b wye 9 i 9 -9 x 0.031442 -9 y 0.749551 +9 x 0.03144187646093577 +9 y 0.7495507603507059 10 a pan 10 b wye 10 i 10 -10 x 0.502626 -10 y 0.952618 +10 x 0.5026260055412137 +10 y 0.9526183602969864 NR names output2 1 a_a pan 1 a_b before 1 a_i 1 -1 a_x 0.346790 -1 a_y 0.726803 +1 a_x 0.3467901443380824 +1 a_y 0.7268028627434533 1 b_a pan 1 b_b before 1 b_i 1 -1 b_x 0.346790 -1 b_y 0.726803 +1 b_x 0.3467901443380824 +1 b_y 0.7268028627434533 1 i_a pan 1 i_b before 1 i_i 1 -1 i_x 0.346790 -1 i_y 0.726803 +1 i_x 0.3467901443380824 +1 i_y 0.7268028627434533 1 x_a pan 1 x_b before 1 x_i 1 -1 x_x 0.346790 -1 x_y 0.726803 +1 x_x 0.3467901443380824 +1 x_y 0.7268028627434533 1 y_a pan 1 y_b before 1 y_i 1 -1 y_x 0.346790 -1 y_y 0.726803 +1 y_x 0.3467901443380824 +1 y_y 0.7268028627434533 2 a_a eks 2 a_b before 2 a_i 2 -2 a_x 0.758680 -2 a_y 0.522151 +2 a_x 0.7586799647899636 +2 a_y 0.5221511083334797 2 b_a eks 2 b_b before 2 b_i 2 -2 b_x 0.758680 -2 b_y 0.522151 +2 b_x 0.7586799647899636 +2 b_y 0.5221511083334797 2 i_a eks 2 i_b before 2 i_i 2 -2 i_x 0.758680 -2 i_y 0.522151 +2 i_x 0.7586799647899636 +2 i_y 0.5221511083334797 2 x_a eks 2 x_b before 2 x_i 2 -2 x_x 0.758680 -2 x_y 0.522151 +2 x_x 0.7586799647899636 +2 x_y 0.5221511083334797 2 y_a eks 2 y_b before 2 y_i 2 -2 y_x 0.758680 -2 y_y 0.522151 +2 y_x 0.7586799647899636 +2 y_y 0.5221511083334797 3 a_a wye 3 a_b before 3 a_i 3 -3 a_x 0.204603 -3 a_y 0.338319 +3 a_x 0.20460330576630303 +3 a_y 0.33831852551664776 3 b_a wye 3 b_b before 3 b_i 3 -3 b_x 0.204603 -3 b_y 0.338319 +3 b_x 0.20460330576630303 +3 b_y 0.33831852551664776 3 i_a wye 3 i_b before 3 i_i 3 -3 i_x 0.204603 -3 i_y 0.338319 +3 i_x 0.20460330576630303 +3 i_y 0.33831852551664776 3 x_a wye 3 x_b before 3 x_i 3 -3 x_x 0.204603 -3 x_y 0.338319 +3 x_x 0.20460330576630303 +3 x_y 0.33831852551664776 3 y_a wye 3 y_b before 3 y_i 3 -3 y_x 0.204603 -3 y_y 0.338319 +3 y_x 0.20460330576630303 +3 y_y 0.33831852551664776 4 a_a eks 4 a_b before 4 a_i 4 -4 a_x 0.381399 -4 a_y 0.134189 +4 a_x 0.38139939387114097 +4 a_y 0.13418874328430463 4 b_a eks 4 b_b before 4 b_i 4 -4 b_x 0.381399 -4 b_y 0.134189 +4 b_x 0.38139939387114097 +4 b_y 0.13418874328430463 4 i_a eks 4 i_b before 4 i_i 4 -4 i_x 0.381399 -4 i_y 0.134189 +4 i_x 0.38139939387114097 +4 i_y 0.13418874328430463 4 x_a eks 4 x_b before 4 x_i 4 -4 x_x 0.381399 -4 x_y 0.134189 +4 x_x 0.38139939387114097 +4 x_y 0.13418874328430463 4 y_a eks 4 y_b before 4 y_i 4 -4 y_x 0.381399 -4 y_y 0.134189 +4 y_x 0.38139939387114097 +4 y_y 0.13418874328430463 5 a_a wye 5 a_b before 5 a_i 5 -5 a_x 0.573289 -5 a_y 0.863624 +5 a_x 0.5732889198020006 +5 a_y 0.8636244699032729 5 b_a wye 5 b_b before 5 b_i 5 -5 b_x 0.573289 -5 b_y 0.863624 +5 b_x 0.5732889198020006 +5 b_y 0.8636244699032729 5 i_a wye 5 i_b before 5 i_i 5 -5 i_x 0.573289 -5 i_y 0.863624 +5 i_x 0.5732889198020006 +5 i_y 0.8636244699032729 5 x_a wye 5 x_b before 5 x_i 5 -5 x_x 0.573289 -5 x_y 0.863624 +5 x_x 0.5732889198020006 +5 x_y 0.8636244699032729 5 y_a wye 5 y_b before 5 y_i 5 -5 y_x 0.573289 -5 y_y 0.863624 +5 y_x 0.5732889198020006 +5 y_y 0.8636244699032729 6 a_a zee 6 a_b before 6 a_i 6 -6 a_x 0.527126 -6 a_y 0.493221 +6 a_x 0.5271261600918548 +6 a_y 0.49322128674835697 6 b_a zee 6 b_b before 6 b_i 6 -6 b_x 0.527126 -6 b_y 0.493221 +6 b_x 0.5271261600918548 +6 b_y 0.49322128674835697 6 i_a zee 6 i_b before 6 i_i 6 -6 i_x 0.527126 -6 i_y 0.493221 +6 i_x 0.5271261600918548 +6 i_y 0.49322128674835697 6 x_a zee 6 x_b before 6 x_i 6 -6 x_x 0.527126 -6 x_y 0.493221 +6 x_x 0.5271261600918548 +6 x_y 0.49322128674835697 6 y_a zee 6 y_b before 6 y_i 6 -6 y_x 0.527126 -6 y_y 0.493221 +6 y_x 0.5271261600918548 +6 y_y 0.49322128674835697 7 a_a eks 7 a_b before 7 a_i 7 -7 a_x 0.611784 -7 a_y 0.187885 +7 a_x 0.6117840605678454 +7 a_y 0.1878849191181694 7 b_a eks 7 b_b before 7 b_i 7 -7 b_x 0.611784 -7 b_y 0.187885 +7 b_x 0.6117840605678454 +7 b_y 0.1878849191181694 7 i_a eks 7 i_b before 7 i_i 7 -7 i_x 0.611784 -7 i_y 0.187885 +7 i_x 0.6117840605678454 +7 i_y 0.1878849191181694 7 x_a eks 7 x_b before 7 x_i 7 -7 x_x 0.611784 -7 x_y 0.187885 +7 x_x 0.6117840605678454 +7 x_y 0.1878849191181694 7 y_a eks 7 y_b before 7 y_i 7 -7 y_x 0.611784 -7 y_y 0.187885 +7 y_x 0.6117840605678454 +7 y_y 0.1878849191181694 8 a_a zee 8 a_b before 8 a_i 8 -8 a_x 0.598554 -8 a_y 0.976181 +8 a_x 0.5985540091064224 +8 a_y 0.976181385699006 8 b_a zee 8 b_b before 8 b_i 8 -8 b_x 0.598554 -8 b_y 0.976181 +8 b_x 0.5985540091064224 +8 b_y 0.976181385699006 8 i_a zee 8 i_b before 8 i_i 8 -8 i_x 0.598554 -8 i_y 0.976181 +8 i_x 0.5985540091064224 +8 i_y 0.976181385699006 8 x_a zee 8 x_b before 8 x_i 8 -8 x_x 0.598554 -8 x_y 0.976181 +8 x_x 0.5985540091064224 +8 x_y 0.976181385699006 8 y_a zee 8 y_b before 8 y_i 8 -8 y_x 0.598554 -8 y_y 0.976181 +8 y_x 0.5985540091064224 +8 y_y 0.976181385699006 9 a_a hat 9 a_b before 9 a_i 9 -9 a_x 0.031442 -9 a_y 0.749551 +9 a_x 0.03144187646093577 +9 a_y 0.7495507603507059 9 b_a hat 9 b_b before 9 b_i 9 -9 b_x 0.031442 -9 b_y 0.749551 +9 b_x 0.03144187646093577 +9 b_y 0.7495507603507059 9 i_a hat 9 i_b before 9 i_i 9 -9 i_x 0.031442 -9 i_y 0.749551 +9 i_x 0.03144187646093577 +9 i_y 0.7495507603507059 9 x_a hat 9 x_b before 9 x_i 9 -9 x_x 0.031442 -9 x_y 0.749551 +9 x_x 0.03144187646093577 +9 x_y 0.7495507603507059 9 y_a hat 9 y_b before 9 y_i 9 -9 y_x 0.031442 -9 y_y 0.749551 +9 y_x 0.03144187646093577 +9 y_y 0.7495507603507059 10 a_a pan 10 a_b before 10 a_i 10 -10 a_x 0.502626 -10 a_y 0.952618 +10 a_x 0.5026260055412137 +10 a_y 0.9526183602969864 10 b_a pan 10 b_b before 10 b_i 10 -10 b_x 0.502626 -10 b_y 0.952618 +10 b_x 0.5026260055412137 +10 b_y 0.9526183602969864 10 i_a pan 10 i_b before 10 i_i 10 -10 i_x 0.502626 -10 i_y 0.952618 +10 i_x 0.5026260055412137 +10 i_y 0.9526183602969864 10 x_a pan 10 x_b before 10 x_i 10 -10 x_x 0.502626 -10 x_y 0.952618 +10 x_x 0.5026260055412137 +10 x_y 0.9526183602969864 10 y_a pan 10 y_b before 10 y_i 10 -10 y_x 0.502626 -10 y_y 0.952618 +10 y_x 0.5026260055412137 +10 y_y 0.9526183602969864 mlr --opprint --from ./reg-test/input/abixy put -q for (k1, v1 in $*) { @@ -2609,53 +2609,53 @@ NR name output1 1 a pan 1 b before 1 i 1 -1 x 0.346790 -1 y 0.726803 +1 x 0.3467901443380824 +1 y 0.7268028627434533 2 a eks 2 b before 2 i 2 -2 x 0.758680 -2 y 0.522151 +2 x 0.7586799647899636 +2 y 0.5221511083334797 3 a wye 3 b before 3 i 3 -3 x 0.204603 -3 y 0.338319 +3 x 0.20460330576630303 +3 y 0.33831852551664776 4 a eks 4 b before 4 i 4 -4 x 0.381399 -4 y 0.134189 +4 x 0.38139939387114097 +4 y 0.13418874328430463 5 a wye 5 b before 5 i 5 -5 x 0.573289 -5 y 0.863624 +5 x 0.5732889198020006 +5 y 0.8636244699032729 6 a zee 6 b before 6 i 6 -6 x 0.527126 -6 y 0.493221 +6 x 0.5271261600918548 +6 y 0.49322128674835697 7 a eks 7 b before 7 i 7 -7 x 0.611784 -7 y 0.187885 +7 x 0.6117840605678454 +7 y 0.1878849191181694 8 a zee 8 b before 8 i 8 -8 x 0.598554 -8 y 0.976181 +8 x 0.5985540091064224 +8 y 0.976181385699006 9 a hat 9 b before 9 i 9 -9 x 0.031442 -9 y 0.749551 +9 x 0.03144187646093577 +9 y 0.7495507603507059 10 a pan 10 b before 10 i 10 -10 x 0.502626 -10 y 0.952618 +10 x 0.5026260055412137 +10 y 0.9526183602969864 NR names output2 1 a_a before @@ -2745,53 +2745,53 @@ NR names output2 1 a_a before 1 a_b pan 1 a_i 1 -1 a_x 0.346790 -1 a_y 0.726803 +1 a_x 0.3467901443380824 +1 a_y 0.7268028627434533 2 a_a before 2 a_b pan 2 a_i 2 -2 a_x 0.758680 -2 a_y 0.522151 +2 a_x 0.7586799647899636 +2 a_y 0.5221511083334797 3 a_a before 3 a_b wye 3 a_i 3 -3 a_x 0.204603 -3 a_y 0.338319 +3 a_x 0.20460330576630303 +3 a_y 0.33831852551664776 4 a_a before 4 a_b wye 4 a_i 4 -4 a_x 0.381399 -4 a_y 0.134189 +4 a_x 0.38139939387114097 +4 a_y 0.13418874328430463 5 a_a before 5 a_b pan 5 a_i 5 -5 a_x 0.573289 -5 a_y 0.863624 +5 a_x 0.5732889198020006 +5 a_y 0.8636244699032729 6 a_a before 6 a_b pan 6 a_i 6 -6 a_x 0.527126 -6 a_y 0.493221 +6 a_x 0.5271261600918548 +6 a_y 0.49322128674835697 7 a_a before 7 a_b zee 7 a_i 7 -7 a_x 0.611784 -7 a_y 0.187885 +7 a_x 0.6117840605678454 +7 a_y 0.1878849191181694 8 a_a before 8 a_b wye 8 a_i 8 -8 a_x 0.598554 -8 a_y 0.976181 +8 a_x 0.5985540091064224 +8 a_y 0.976181385699006 9 a_a before 9 a_b wye 9 a_i 9 -9 a_x 0.031442 -9 a_y 0.749551 +9 a_x 0.03144187646093577 +9 a_y 0.7495507603507059 10 a_a before 10 a_b wye 10 a_i 10 -10 a_x 0.502626 -10 a_y 0.952618 +10 a_x 0.5026260055412137 +10 a_y 0.9526183602969864 mlr --opprint --from ./reg-test/input/abixy put -q for (k1, v1 in $*) { @@ -2817,255 +2817,255 @@ NR name output1 1 a pan 1 b before 1 i 1 -1 x 0.346790 -1 y 0.726803 +1 x 0.3467901443380824 +1 y 0.7268028627434533 2 a eks 2 b before 2 i 2 -2 x 0.758680 -2 y 0.522151 +2 x 0.7586799647899636 +2 y 0.5221511083334797 3 a wye 3 b before 3 i 3 -3 x 0.204603 -3 y 0.338319 +3 x 0.20460330576630303 +3 y 0.33831852551664776 4 a eks 4 b before 4 i 4 -4 x 0.381399 -4 y 0.134189 +4 x 0.38139939387114097 +4 y 0.13418874328430463 5 a wye 5 b before 5 i 5 -5 x 0.573289 -5 y 0.863624 +5 x 0.5732889198020006 +5 y 0.8636244699032729 6 a zee 6 b before 6 i 6 -6 x 0.527126 -6 y 0.493221 +6 x 0.5271261600918548 +6 y 0.49322128674835697 7 a eks 7 b before 7 i 7 -7 x 0.611784 -7 y 0.187885 +7 x 0.6117840605678454 +7 y 0.1878849191181694 8 a zee 8 b before 8 i 8 -8 x 0.598554 -8 y 0.976181 +8 x 0.5985540091064224 +8 y 0.976181385699006 9 a hat 9 b before 9 i 9 -9 x 0.031442 -9 y 0.749551 +9 x 0.03144187646093577 +9 y 0.7495507603507059 10 a pan 10 b before 10 i 10 -10 x 0.502626 -10 y 0.952618 +10 x 0.5026260055412137 +10 y 0.9526183602969864 NR names output2 1 a_a before 1 a_b pan 1 a_i 1 -1 a_x 0.346790 -1 a_y 0.726803 +1 a_x 0.3467901443380824 +1 a_y 0.7268028627434533 1 i_a before 1 i_b pan 1 i_i 1 -1 i_x 0.346790 -1 i_y 0.726803 +1 i_x 0.3467901443380824 +1 i_y 0.7268028627434533 1 x_a before 1 x_b pan 1 x_i 1 -1 x_x 0.346790 -1 x_y 0.726803 +1 x_x 0.3467901443380824 +1 x_y 0.7268028627434533 1 y_a before 1 y_b pan 1 y_i 1 -1 y_x 0.346790 -1 y_y 0.726803 +1 y_x 0.3467901443380824 +1 y_y 0.7268028627434533 2 a_a before 2 a_b pan 2 a_i 2 -2 a_x 0.758680 -2 a_y 0.522151 +2 a_x 0.7586799647899636 +2 a_y 0.5221511083334797 2 i_a before 2 i_b pan 2 i_i 2 -2 i_x 0.758680 -2 i_y 0.522151 +2 i_x 0.7586799647899636 +2 i_y 0.5221511083334797 2 x_a before 2 x_b pan 2 x_i 2 -2 x_x 0.758680 -2 x_y 0.522151 +2 x_x 0.7586799647899636 +2 x_y 0.5221511083334797 2 y_a before 2 y_b pan 2 y_i 2 -2 y_x 0.758680 -2 y_y 0.522151 +2 y_x 0.7586799647899636 +2 y_y 0.5221511083334797 3 a_a before 3 a_b wye 3 a_i 3 -3 a_x 0.204603 -3 a_y 0.338319 +3 a_x 0.20460330576630303 +3 a_y 0.33831852551664776 3 i_a before 3 i_b wye 3 i_i 3 -3 i_x 0.204603 -3 i_y 0.338319 +3 i_x 0.20460330576630303 +3 i_y 0.33831852551664776 3 x_a before 3 x_b wye 3 x_i 3 -3 x_x 0.204603 -3 x_y 0.338319 +3 x_x 0.20460330576630303 +3 x_y 0.33831852551664776 3 y_a before 3 y_b wye 3 y_i 3 -3 y_x 0.204603 -3 y_y 0.338319 +3 y_x 0.20460330576630303 +3 y_y 0.33831852551664776 4 a_a before 4 a_b wye 4 a_i 4 -4 a_x 0.381399 -4 a_y 0.134189 +4 a_x 0.38139939387114097 +4 a_y 0.13418874328430463 4 i_a before 4 i_b wye 4 i_i 4 -4 i_x 0.381399 -4 i_y 0.134189 +4 i_x 0.38139939387114097 +4 i_y 0.13418874328430463 4 x_a before 4 x_b wye 4 x_i 4 -4 x_x 0.381399 -4 x_y 0.134189 +4 x_x 0.38139939387114097 +4 x_y 0.13418874328430463 4 y_a before 4 y_b wye 4 y_i 4 -4 y_x 0.381399 -4 y_y 0.134189 +4 y_x 0.38139939387114097 +4 y_y 0.13418874328430463 5 a_a before 5 a_b pan 5 a_i 5 -5 a_x 0.573289 -5 a_y 0.863624 +5 a_x 0.5732889198020006 +5 a_y 0.8636244699032729 5 i_a before 5 i_b pan 5 i_i 5 -5 i_x 0.573289 -5 i_y 0.863624 +5 i_x 0.5732889198020006 +5 i_y 0.8636244699032729 5 x_a before 5 x_b pan 5 x_i 5 -5 x_x 0.573289 -5 x_y 0.863624 +5 x_x 0.5732889198020006 +5 x_y 0.8636244699032729 5 y_a before 5 y_b pan 5 y_i 5 -5 y_x 0.573289 -5 y_y 0.863624 +5 y_x 0.5732889198020006 +5 y_y 0.8636244699032729 6 a_a before 6 a_b pan 6 a_i 6 -6 a_x 0.527126 -6 a_y 0.493221 +6 a_x 0.5271261600918548 +6 a_y 0.49322128674835697 6 i_a before 6 i_b pan 6 i_i 6 -6 i_x 0.527126 -6 i_y 0.493221 +6 i_x 0.5271261600918548 +6 i_y 0.49322128674835697 6 x_a before 6 x_b pan 6 x_i 6 -6 x_x 0.527126 -6 x_y 0.493221 +6 x_x 0.5271261600918548 +6 x_y 0.49322128674835697 6 y_a before 6 y_b pan 6 y_i 6 -6 y_x 0.527126 -6 y_y 0.493221 +6 y_x 0.5271261600918548 +6 y_y 0.49322128674835697 7 a_a before 7 a_b zee 7 a_i 7 -7 a_x 0.611784 -7 a_y 0.187885 +7 a_x 0.6117840605678454 +7 a_y 0.1878849191181694 7 i_a before 7 i_b zee 7 i_i 7 -7 i_x 0.611784 -7 i_y 0.187885 +7 i_x 0.6117840605678454 +7 i_y 0.1878849191181694 7 x_a before 7 x_b zee 7 x_i 7 -7 x_x 0.611784 -7 x_y 0.187885 +7 x_x 0.6117840605678454 +7 x_y 0.1878849191181694 7 y_a before 7 y_b zee 7 y_i 7 -7 y_x 0.611784 -7 y_y 0.187885 +7 y_x 0.6117840605678454 +7 y_y 0.1878849191181694 8 a_a before 8 a_b wye 8 a_i 8 -8 a_x 0.598554 -8 a_y 0.976181 +8 a_x 0.5985540091064224 +8 a_y 0.976181385699006 8 i_a before 8 i_b wye 8 i_i 8 -8 i_x 0.598554 -8 i_y 0.976181 +8 i_x 0.5985540091064224 +8 i_y 0.976181385699006 8 x_a before 8 x_b wye 8 x_i 8 -8 x_x 0.598554 -8 x_y 0.976181 +8 x_x 0.5985540091064224 +8 x_y 0.976181385699006 8 y_a before 8 y_b wye 8 y_i 8 -8 y_x 0.598554 -8 y_y 0.976181 +8 y_x 0.5985540091064224 +8 y_y 0.976181385699006 9 a_a before 9 a_b wye 9 a_i 9 -9 a_x 0.031442 -9 a_y 0.749551 +9 a_x 0.03144187646093577 +9 a_y 0.7495507603507059 9 i_a before 9 i_b wye 9 i_i 9 -9 i_x 0.031442 -9 i_y 0.749551 +9 i_x 0.03144187646093577 +9 i_y 0.7495507603507059 9 x_a before 9 x_b wye 9 x_i 9 -9 x_x 0.031442 -9 x_y 0.749551 +9 x_x 0.03144187646093577 +9 x_y 0.7495507603507059 9 y_a before 9 y_b wye 9 y_i 9 -9 y_x 0.031442 -9 y_y 0.749551 +9 y_x 0.03144187646093577 +9 y_y 0.7495507603507059 10 a_a before 10 a_b wye 10 a_i 10 -10 a_x 0.502626 -10 a_y 0.952618 +10 a_x 0.5026260055412137 +10 a_y 0.9526183602969864 10 i_a before 10 i_b wye 10 i_i 10 -10 i_x 0.502626 -10 i_y 0.952618 +10 i_x 0.5026260055412137 +10 i_y 0.9526183602969864 10 x_a before 10 x_b wye 10 x_i 10 -10 x_x 0.502626 -10 x_y 0.952618 +10 x_x 0.5026260055412137 +10 x_y 0.9526183602969864 10 y_a before 10 y_b wye 10 y_i 10 -10 y_x 0.502626 -10 y_y 0.952618 +10 y_x 0.5026260055412137 +10 y_y 0.9526183602969864 ================================================================ diff --git a/go/src/miller/dsl/cst/for.go b/go/src/miller/dsl/cst/for.go index b6883aa9a..1d761c3a1 100644 --- a/go/src/miller/dsl/cst/for.go +++ b/go/src/miller/dsl/cst/for.go @@ -482,7 +482,21 @@ func (this *ForLoopMultivariableNode) Execute(state *State) (*BlockExitPayload, state.stack.PushStackFrame() defer state.stack.PopStackFrame() - return this.executeOuter(&mlrval, this.keyVariableNames, state) + // Miller's multi-variable loops, in the Miller DSL, have a single {...} + // but are implemented in Go via multiple, recursive functions. A break + // from any of the latter is a break from all. However, at this point, the + // break has been "broken" and should not be returned to the caller. + // Return-statements should, though. + blockExitPayload, err := this.executeOuter(&mlrval, this.keyVariableNames, state) + if blockExitPayload == nil { + return nil, err + } else { + if blockExitPayload.blockExitStatus == BLOCK_EXIT_BREAK { + return nil, err + } else { + return blockExitPayload, err + } + } } // ---------------------------------------------------------------- @@ -510,7 +524,7 @@ func (this *ForLoopMultivariableNode) executeOuter( } if blockExitPayload != nil { if blockExitPayload.blockExitStatus == BLOCK_EXIT_BREAK { - break + return blockExitPayload, nil } // If BLOCK_EXIT_CONTINUE, keep going -- this means the body was exited // early but we keep going at this level @@ -540,6 +554,7 @@ func (this *ForLoopMultivariableNode) executeOuter( } if blockExitPayload != nil { if blockExitPayload.blockExitStatus == BLOCK_EXIT_BREAK { + return blockExitPayload, nil break } // If BLOCK_EXIT_CONTINUE, keep going -- this means the body was exited @@ -593,7 +608,7 @@ func (this *ForLoopMultivariableNode) executeInner( } if blockExitPayload != nil { if blockExitPayload.blockExitStatus == BLOCK_EXIT_BREAK { - break + return blockExitPayload, nil } // If BLOCK_EXIT_CONTINUE, keep going -- this means the body was exited // early but we keep going at this level @@ -625,7 +640,7 @@ func (this *ForLoopMultivariableNode) executeInner( } if blockExitPayload != nil { if blockExitPayload.blockExitStatus == BLOCK_EXIT_BREAK { - break + return blockExitPayload, nil } // If BLOCK_EXIT_CONTINUE, keep going -- this means the body was exited // early but we keep going at this level