navigine/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-30 10:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include filename and lineno in error messages

Browse Source
This commit is contained in:
Nicolas Williams committed 2015-03-30 15:56:29 -05:00
1 parent 7d6d4066dd
commit 1dcfc2f547
7 files changed
+27 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

locfile.c
+5 -2
View File
@@ -9,9 +9,10 @@
#include "locfile.h"
struct locfile* locfile_init(jq_state *jq, const char* data, int length) {
struct locfile* locfile_init(jq_state *jq, const char *fname, const char* data, int length) {
struct locfile* l = jv_mem_alloc(sizeof(struct locfile));
l->jq = jq;
l->fname = jv_string(fname);
l->data = jv_mem_alloc(length);
memcpy((char*)l->data,data,length);
l->length = length;
@@ -39,6 +40,7 @@ struct locfile* locfile_retain(struct locfile* l) {
}
void locfile_free(struct locfile* l) {
if (--(l->refct) == 0) {
jv_free(l->fname);
jv_mem_free(l->linemap);
jv_mem_free((char*)l->data);
jv_mem_free(l);
@@ -79,7 +81,8 @@ void locfile_locate(struct locfile* l, location loc, const char* fmt, ...) {
jv_free(m1);
return;
}
jv m2 = jv_string_fmt("%s\n%.*s%*s", jv_string_value(m1),
jv m2 = jv_string_fmt("%s at %s, line %d:\n%.*s%*s", jv_string_value(m1),
jv_string_value(l->fname), startline + 1,
locfile_line_length(l, startline), l->data + offset,
loc.start - offset, "");
jv_free(m1);