mirror/stedolan-jq
1
0
Fork 0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00
Code Issues Releases Activity

Allow any number of jq-coded function arguments

Browse Source
This commit is contained in:
Nicolas Williams
2014-08-09 12:42:39 -05:00
parent 4249bbf0d5
commit 8cddb7c681
2 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
parser.y
View File

@@ -102,7 +102,9 @@ struct lexer_param;
%precedence "catch" %precedence "catch"
%type <blk> Exp Term MkDict MkDictPair ExpD ElseBody QQString FuncDef FuncDefs String Import Imports Param Params %type <blk> Exp Term MkDict MkDictPair ExpD ElseBody QQString
%type <blk> FuncDef FuncDefs String Import Imports Param Params
%type <blk> Arg Args
%{ %{
#include "lexer.h" #include "lexer.h"
struct lexer_param { struct lexer_param {
@@ -639,33 +641,8 @@ IDENT {
$$ = gen_location(@$, locations, gen_call(jv_string_value($1), gen_noop())); $$ = gen_location(@$, locations, gen_call(jv_string_value($1), gen_noop()));
jv_free($1); jv_free($1);
} | } |
IDENT '(' Exp ')' { IDENT '(' Args ')' {
$$ = gen_call(jv_string_value($1), gen_lambda($3)); $$ = gen_call(jv_string_value($1), $3);
$$ = gen_location(@1, locations, $$);
jv_free($1);
} |
IDENT '(' Exp ';' Exp ')' {
$$ = gen_call(jv_string_value($1), BLOCK(gen_lambda($3), gen_lambda($5)));
$$ = gen_location(@1, locations, $$);
jv_free($1);
} |
IDENT '(' Exp ';' Exp ';' Exp ')' {
$$ = gen_call(jv_string_value($1), BLOCK(gen_lambda($3), gen_lambda($5), gen_lambda($7)));
$$ = gen_location(@1, locations, $$);
jv_free($1);
} |
IDENT '(' Exp ';' Exp ';' Exp ';' Exp ')' {
$$ = gen_call(jv_string_value($1), BLOCK(gen_lambda($3), gen_lambda($5), gen_lambda($7), gen_lambda($9)));
$$ = gen_location(@1, locations, $$);
jv_free($1);
} |
IDENT '(' Exp ';' Exp ';' Exp ';' Exp ';' Exp ')' {
$$ = gen_call(jv_string_value($1), BLOCK(gen_lambda($3), gen_lambda($5), gen_lambda($7), gen_lambda($9), gen_lambda($11)));
$$ = gen_location(@1, locations, $$);
jv_free($1);
} |
IDENT '(' Exp ';' Exp ';' Exp ';' Exp ';' Exp ';' Exp ')' {
$$ = gen_call(jv_string_value($1), BLOCK(gen_lambda($3), gen_lambda($5), gen_lambda($7), gen_lambda($9), gen_lambda($11), gen_lambda($13)));
$$ = gen_location(@1, locations, $$); $$ = gen_location(@1, locations, $$);
jv_free($1); jv_free($1);
} | } |
@@ -674,6 +651,19 @@ IDENT '(' Exp ';' Exp ';' Exp ';' Exp ';' Exp ';' Exp ')' {
Term '[' error ']' { $$ = $1; } | Term '[' error ']' { $$ = $1; } |
'{' error '}' { $$ = gen_noop(); } '{' error '}' { $$ = gen_noop(); }
Args:
Arg {
$$ = $1;
} |
Args ';' Arg {
$$ = BLOCK($1, $3);
}
Arg:
Exp {
$$ = gen_lambda($1);
}
MkDict: MkDict:
%empty { %empty {
$$=gen_noop(); $$=gen_noop();

5
tests/all.test
View File

@@ -473,6 +473,11 @@ def f(a;b;c;d;e;f): [a+1,b,c,d,e,f]; f(.[0];.[1];.[0];.[0];.[0];.[0])
[1,2] [1,2]
[2,2,1,1,1,1] [2,2,1,1,1,1]
# Many arguments
def f(a;b;c;d;e;f;g;h;i;j): [j,i,h,g,f,e,d,c,b,a]; f(.[0];.[1];.[2];.[3];.[4];.[5];.[6];.[7];.[8];.[9])
[0,1,2,3,4,5,6,7,8,9]
[9,8,7,6,5,4,3,2,1,0]
([1,2] + [4,5]) ([1,2] + [4,5])
[1,2,3] [1,2,3]
[1,2,4,5] [1,2,4,5]