Clean up trailing whitespace

This commit is contained in:
David Tolnay committed 2015-07-19 09:38:50 -07:00
1 parent 812703139c
commit 1628bbf95f
17 files changed
+343 -345

No files matched your search

+38 -38
View File
@@ -23,7 +23,7 @@ struct lexer_param;
(Loc).end = YYRHSLOC(Rhs, 0).end; \
} \
} while (0)
}
}
%locations
%error-verbose
@@ -123,7 +123,7 @@ struct lexer_param {
/*YYERROR*/; \
} while (0)
void yyerror(YYLTYPE* loc, block* answer, int* errors,
void yyerror(YYLTYPE* loc, block* answer, int* errors,
struct locfile* locations, struct lexer_param* lexer_param_ptr, const char *s){
(*errors)++;
if (strstr(s, "unexpected")) {
@@ -137,7 +137,7 @@ void yyerror(YYLTYPE* loc, block* answer, int* errors,
}
}
int yylex(YYSTYPE* yylval, YYLTYPE* yylloc, block* answer, int* errors,
int yylex(YYSTYPE* yylval, YYLTYPE* yylloc, block* answer, int* errors,
struct locfile* locations, struct lexer_param* lexer_param_ptr) {
yyscan_t lexer = lexer_param_ptr->lexer;
int tok = jq_yylex(yylval, yylloc, lexer);
@@ -250,16 +250,16 @@ static block gen_definedor_assign(block object, block val) {
return BLOCK(gen_op_simple(DUP),
val, tmp,
gen_call("_modify", BLOCK(gen_lambda(object),
gen_lambda(gen_definedor(gen_noop(),
gen_lambda(gen_definedor(gen_noop(),
gen_op_bound(LOADV, tmp))))));
}
static block gen_update(block object, block val, int optype) {
block tmp = gen_op_var_fresh(STOREV, "tmp");
return BLOCK(gen_op_simple(DUP),
val,
tmp,
gen_call("_modify", BLOCK(gen_lambda(object),
gen_call("_modify", BLOCK(gen_lambda(object),
gen_lambda(gen_binop(gen_noop(),
gen_op_bound(LOADV, tmp),
optype)))));
@@ -274,7 +274,7 @@ Module Imports Exp {
} |
Module Imports FuncDefs {
*answer = BLOCK($1, $2, $3);
}
}
Module:
%empty {
@@ -369,7 +369,7 @@ Exp '=' Exp {
Exp "or" Exp {
$$ = gen_or($1, $3);
} |
} |
Exp "and" Exp {
$$ = gen_and($1, $3);
@@ -387,12 +387,12 @@ Exp "|=" Exp {
$$ = gen_call("_modify", BLOCK(gen_lambda($1), gen_lambda($3)));
} |
Exp '|' Exp {
$$ = block_join($1, $3);
Exp '|' Exp {
$$ = block_join($1, $3);
} |
Exp ',' Exp {
$$ = gen_both($1, $3);
Exp ',' Exp {
$$ = gen_both($1, $3);
} |
Exp '+' Exp {
@@ -467,8 +467,8 @@ Exp ">=" Exp {
$$ = gen_binop($1, $3, GREATEREQ);
} |
Term {
$$ = $1;
Term {
$$ = $1;
}
Import:
@@ -593,7 +593,7 @@ ElseBody:
}
ExpD:
ExpD '|' ExpD {
ExpD '|' ExpD {
$$ = block_join($1, $3);
} |
'-' ExpD {
@@ -606,7 +606,7 @@ Term {
Term:
'.' {
$$ = gen_noop();
$$ = gen_noop();
} |
REC {
$$ = gen_call("recurse", gen_noop());
@@ -626,8 +626,8 @@ BREAK error {
Term FIELD '?' {
$$ = gen_index_opt($1, gen_const($2));
} |
FIELD '?' {
$$ = gen_index_opt(gen_noop(), gen_const($1));
FIELD '?' {
$$ = gen_index_opt(gen_noop(), gen_const($1));
} |
Term '.' String '?' {
$$ = gen_index_opt($1, $3);
@@ -638,8 +638,8 @@ Term '.' String '?' {
Term FIELD {
$$ = gen_index($1, gen_const($2));
} |
FIELD {
$$ = gen_index(gen_noop(), gen_const($1));
FIELD {
$$ = gen_index(gen_noop(), gen_const($1));
} |
Term '.' String {
$$ = gen_index($1, $3);
@@ -655,19 +655,19 @@ Term '.' String {
jv_free($2);
FAIL(@$, "try .[\"field\"] instead of .field for unusually named fields");
$$ = gen_noop();
} |
} |
/* FIXME: string literals */
Term '[' Exp ']' '?' {
$$ = gen_index_opt($1, $3);
$$ = gen_index_opt($1, $3);
} |
Term '[' Exp ']' {
$$ = gen_index($1, $3);
$$ = gen_index($1, $3);
} |
Term '[' ']' '?' {
$$ = block_join($1, gen_op_simple(EACH_OPT));
$$ = block_join($1, gen_op_simple(EACH_OPT));
} |
Term '[' ']' {
$$ = block_join($1, gen_op_simple(EACH));
$$ = block_join($1, gen_op_simple(EACH));
} |
Term '[' Exp ':' Exp ']' '?' {
$$ = gen_slice_index($1, $3, $5, INDEX_OPT);
@@ -688,7 +688,7 @@ Term '[' ':' Exp ']' {
$$ = gen_slice_index($1, gen_const(jv_null()), $4, INDEX);
} |
LITERAL {
$$ = gen_const($1);
$$ = gen_const($1);
} |
String {
$$ = $1;
@@ -696,16 +696,16 @@ String {
FORMAT {
$$ = gen_format(gen_noop(), $1);
} |
'(' Exp ')' {
$$ = $2;
} |
'[' Exp ']' {
$$ = gen_collect($2);
'(' Exp ')' {
$$ = $2;
} |
'[' ']' {
$$ = gen_const(jv_array());
'[' Exp ']' {
$$ = gen_collect($2);
} |
'{' MkDict '}' {
'[' ']' {
$$ = gen_const(jv_array());
} |
'{' MkDict '}' {
block o = gen_const_object($2);
if (o.first != NULL)
$$ = o;
@@ -719,7 +719,7 @@ FORMAT {
'$' IDENT {
$$ = gen_location(@$, locations, gen_op_unbound(LOADV, jv_string_value($2)));
jv_free($2);
} |
} |
IDENT {
const char *s = jv_string_value($1);
if (strcmp(s, "false") == 0)
@@ -860,15 +860,15 @@ Keyword:
}
MkDict:
%empty {
$$=gen_noop();
%empty {
$$=gen_noop();
} |
MkDictPair { $$ = $1; }
| MkDictPair ',' MkDict { $$=block_join($1, $3); }
| error ',' MkDict { $$ = $3; }
MkDictPair:
IDENT ':' ExpD {
IDENT ':' ExpD {
$$ = gen_dictpair(gen_const($1), $3);
}
| Keyword ':' ExpD {