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

Slightly better string interpolation.

Browse Source
This commit is contained in:
Stephen Dolan
2012-09-18 13:22:22 +01:00
parent 8041ce3119
commit 25cbab056b
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
c/lexer.l
View File

@@ -78,14 +78,32 @@
"%(" {
return enter(QQSTRING_INTERP_START, YY_START, yyscanner);
}
[a-z]+ {
yylval->literal = jv_string_sized(yytext, yyleng);
return QQSTRING_TEXT;
"%"[^(] {
return INVALID_CHARACTER;
}
")" {
yy_pop_state(yyscanner);
return QQSTRING_END;
}
"\\"[)%] {
char text[2] = {yytext[1], 0};
yylval->literal = jv_string(text);
return QQSTRING_TEXT;
}
(\\[^u)%]|\\u[a-zA-Z0-9]{0,4})+ {
/* pass escapes to the json parser */
jv escapes = jv_string_fmt("\"%.*s\"", yyleng, yytext);
yylval->literal = jv_parse_sized(jv_string_value(escapes), jv_string_length(jv_copy(escapes)));
jv_free(escapes);
return QQSTRING_TEXT;
}
[^\\)%]+ {
yylval->literal = jv_string_sized(yytext, yyleng);
return QQSTRING_TEXT;
}
. {
return INVALID_CHARACTER;
}
}

8
c/parser.y
View File

@@ -102,7 +102,7 @@ int yylex(YYSTYPE* yylval, YYLTYPE* yylloc, block* answer, int* errors,
if (tok == INVALID_CHARACTER) {
FAIL(*yylloc, "Invalid character");
} else {
if (tok == LITERAL && !jv_is_valid(yylval->literal)) {
if ((tok == LITERAL || tok == QQSTRING_TEXT) && !jv_is_valid(yylval->literal)) {
jv msg = jv_invalid_get_msg(jv_copy(yylval->literal));
if (jv_get_kind(msg) == JV_KIND_STRING) {
FAIL(*yylloc, jv_string_value(msg));
@@ -147,6 +147,10 @@ static block gen_binop(block a, block b, int op) {
return c;
}
static block gen_format(block a) {
return block_join(a, gen_op_call(CALL_1_1, gen_op_block_unbound(CLOSURE_REF, "tostring")));
}
static block gen_update(block a, block op, int optype) {
block assign = a;
block_append(&assign, gen_op_simple(DUP));
@@ -299,7 +303,7 @@ QQString QQSTRING_TEXT {
$$ = gen_binop($1, gen_op_const(LOADK, $2), '+');
} |
QQString QQSTRING_INTERP_START Exp QQSTRING_INTERP_END {
$$ = gen_binop($1, $3, '+');
$$ = gen_binop($1, gen_format($3), '+');
}