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

Sensible error messages when a silly addition is performed.

Browse Source 
Fix a test to no longer perform an invalid addition.
This commit is contained in:
Stephen Dolan
2012-09-10 16:07:03 +01:00
parent a3e509034b
commit e718bd50b6
5 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/builtin.c
View File

@@ -27,7 +27,9 @@ static void f_plus(jv input[], jv output[]) {
} else if (jv_get_kind(a) == JV_KIND_OBJECT && jv_get_kind(b) == JV_KIND_OBJECT) { } else if (jv_get_kind(a) == JV_KIND_OBJECT && jv_get_kind(b) == JV_KIND_OBJECT) {
output[0] = jv_object_merge(a, b); output[0] = jv_object_merge(a, b);
} else { } else {
output[0] = jv_string("wtf gaize"); output[0] = jv_invalid_with_msg(jv_string_fmt("Attempted to add %s and %s",
jv_kind_name(jv_get_kind(a)),
jv_kind_name(jv_get_kind(b))));
jv_free(a); jv_free(a);
jv_free(b); jv_free(b);
} }

18
c/execute.c
View File

@@ -376,7 +376,16 @@ jv jq_next() {
struct cfunction* func = &frame_current_bytecode(&frame_stk)->globals->cfunctions[*pc++]; struct cfunction* func = &frame_current_bytecode(&frame_stk)->globals->cfunctions[*pc++];
func->fptr(cfunc_input, cfunc_output); func->fptr(cfunc_input, cfunc_output);
top.value = cfunc_output[0]; top.value = cfunc_output[0];
if (jv_is_valid(top.value)) {
stack_push(top); stack_push(top);
} else {
jv msg = jv_invalid_get_msg(top.value);
if (jv_get_kind(msg) == JV_KIND_STRING) {
fprintf(stderr, "jq: error: %s\n", jv_string_value(msg));
}
jv_free(msg);
goto do_backtrack;
}
break; break;
} }
@@ -393,7 +402,16 @@ jv jq_next() {
struct cfunction* func = &frame_current_bytecode(&frame_stk)->globals->cfunctions[*pc++]; struct cfunction* func = &frame_current_bytecode(&frame_stk)->globals->cfunctions[*pc++];
func->fptr(cfunc_input, cfunc_output); func->fptr(cfunc_input, cfunc_output);
top.value = cfunc_output[0]; top.value = cfunc_output[0];
if (jv_is_valid(top.value)) {
stack_push(top); stack_push(top);
} else {
jv msg = jv_invalid_get_msg(top.value);
if (jv_get_kind(msg) == JV_KIND_STRING) {
fprintf(stderr, "jq: error: %s\n", jv_string_value(msg));
}
jv_free(msg);
goto do_backtrack;
}
break; break;
} }

15
c/jv.c
View File

@@ -38,6 +38,21 @@ jv_kind jv_get_kind(jv x) {
return x.kind; return x.kind;
} }
const char* jv_kind_name(jv_kind k) {
switch (k) {
case JV_KIND_INVALID: return "<invalid>";
case JV_KIND_NULL: return "null";
case JV_KIND_FALSE: return "boolean";
case JV_KIND_TRUE: return "boolean";
case JV_KIND_NUMBER: return "number";
case JV_KIND_STRING: return "string";
case JV_KIND_ARRAY: return "array";
case JV_KIND_OBJECT: return "object";
}
assert(0);
return "<unknown>";
}
static const jv JV_NULL = {JV_KIND_NULL, {0}}; static const jv JV_NULL = {JV_KIND_NULL, {0}};
static const jv JV_FALSE = {JV_KIND_FALSE, {0}}; static const jv JV_FALSE = {JV_KIND_FALSE, {0}};
static const jv JV_TRUE = {JV_KIND_TRUE, {0}}; static const jv JV_TRUE = {JV_KIND_TRUE, {0}};

1
c/jv.h
View File

@@ -41,6 +41,7 @@ typedef struct {
*/ */
jv_kind jv_get_kind(jv); jv_kind jv_get_kind(jv);
const char* jv_kind_name(jv_kind);
static int jv_is_valid(jv x) { return jv_get_kind(x) != JV_KIND_INVALID; } static int jv_is_valid(jv x) { return jv_get_kind(x) != JV_KIND_INVALID; }
jv jv_copy(jv); jv jv_copy(jv);

2
c/testdata
View File

@@ -207,7 +207,7 @@ def id(x):x; 2000 as $x | def f(x):1 as $x | id([$x, x, x]); def g(x): 100 as $x
# test backtracking through function calls and returns # test backtracking through function calls and returns
# this test is *evil* # this test is *evil*
[[20,10][1,0] as $x | def f: (100,200) as $y | def g: [$x + $y, .]; . + $x | g; f[0] | [f][0][1] | f] [[20,10][1,0] as $x | def f: (100,200) as $y | def g: [$x + $y, .]; . + $x | g; f[0] | [f][0][1] | f]
"woo, testing!" 999999999
[[110.0, 130.0], [210.0, 130.0], [110.0, 230.0], [210.0, 230.0], [120.0, 160.0], [220.0, 160.0], [120.0, 260.0], [220.0, 260.0]] [[110.0, 130.0], [210.0, 130.0], [110.0, 230.0], [210.0, 230.0], [120.0, 160.0], [220.0, 160.0], [120.0, 260.0], [220.0, 260.0]]
# #