nvgn/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-26 20:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make jq.h usable from C++

Browse Source 
Previously, with clang++:
jq.h:46:37: error: typedef redefinition with different
      types ('struct jq_util_input_state *' vs 'jq_util_input_state')

With g++:
jq.h:46:37: error: conflicting declaration
      ‘typedef struct jq_util_input_state* jq_util_input_state’

This typedef was added to libjq by commit 0d41447 which was
after the 1.4 release, so although it is a public API, this
is not a backcompat break because it has never been in a
release.

Specifying the "*" at all uses of jq_util_input_state is
slightly tedious, but jq_state already works that way, so at
least it will be consistent.
This commit is contained in:
David Tolnay committed 2015-07-04 15:08:01 -07:00
1 parent 05899f8b3e
commit 1e5e0c9fe2
3 files changed
+22 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

jq.h
+7 -7
View File
@@ -43,15 +43,15 @@ jv jq_get_attr(jq_state *, jv);
* whereas jv string values must be in UTF-8. This way the caller * whereas jv string values must be in UTF-8. This way the caller
* doesn't have to perform any codeset conversions. * doesn't have to perform any codeset conversions.
*/ */
typedef struct jq_util_input_state *jq_util_input_state; typedef struct jq_util_input_state jq_util_input_state;
typedef void (*jq_util_msg_cb)(void *, const char *); typedef void (*jq_util_msg_cb)(void *, const char *);
jq_util_input_state jq_util_input_init(jq_util_msg_cb, void *); jq_util_input_state *jq_util_input_init(jq_util_msg_cb, void *);
void jq_util_input_set_parser(jq_util_input_state, jv_parser *, int); void jq_util_input_set_parser(jq_util_input_state *, jv_parser *, int);
void jq_util_input_free(jq_util_input_state *); void jq_util_input_free(jq_util_input_state **);
void jq_util_input_add_input(jq_util_input_state, const char *); void jq_util_input_add_input(jq_util_input_state *, const char *);
int jq_util_input_errors(jq_util_input_state); int jq_util_input_errors(jq_util_input_state *);
jv jq_util_input_next_input(jq_util_input_state); jv jq_util_input_next_input(jq_util_input_state *);
jv jq_util_input_next_input_cb(jq_state *, void *); jv jq_util_input_next_input_cb(jq_state *, void *);
jv jq_util_input_get_position(jq_state*); jv jq_util_input_get_position(jq_state*);
jv jq_util_input_get_current_filename(jq_state*); jv jq_util_input_get_current_filename(jq_state*);
main.c
+1 -1
View File
@@ -207,7 +207,7 @@ int main(int argc, char* argv[]) {
int dumpopts = JV_PRINT_INDENT_FLAGS(2); int dumpopts = JV_PRINT_INDENT_FLAGS(2);
const char* program = 0; const char* program = 0;
jq_util_input_state input_state = jq_util_input_init(NULL, NULL); // XXX add err_cb jq_util_input_state *input_state = jq_util_input_init(NULL, NULL); // XXX add err_cb
int further_args_are_files = 0; int further_args_are_files = 0;
int jq_flags = 0; int jq_flags = 0;
util.c
+14 -14
View File
@@ -203,12 +203,12 @@ static void fprinter(void *data, const char *fname) {
} }
// If parser == NULL -> RAW // If parser == NULL -> RAW
jq_util_input_state jq_util_input_init(jq_util_msg_cb err_cb, void *err_cb_data) { jq_util_input_state *jq_util_input_init(jq_util_msg_cb err_cb, void *err_cb_data) {
if (err_cb == NULL) { if (err_cb == NULL) {
err_cb = fprinter; err_cb = fprinter;
err_cb_data = stderr; err_cb_data = stderr;
} }
jq_util_input_state new_state = jv_mem_alloc(sizeof(*new_state)); jq_util_input_state *new_state = jv_mem_alloc(sizeof(*new_state));
memset(new_state, 0, sizeof(*new_state)); memset(new_state, 0, sizeof(*new_state));
new_state->err_cb = err_cb; new_state->err_cb = err_cb;
new_state->err_cb_data = err_cb_data; new_state->err_cb_data = err_cb_data;
@@ -226,7 +226,7 @@ jq_util_input_state jq_util_input_init(jq_util_msg_cb err_cb, void *err_cb_data)
return new_state; return new_state;
} }
void jq_util_input_set_parser(jq_util_input_state state, jv_parser *parser, int slurp) { void jq_util_input_set_parser(jq_util_input_state *state, jv_parser *parser, int slurp) {
assert(!jv_is_valid(state->slurped)); assert(!jv_is_valid(state->slurped));
state->parser = parser; state->parser = parser;
@@ -238,8 +238,8 @@ void jq_util_input_set_parser(jq_util_input_state state, jv_parser *parser, int
state->slurped = jv_invalid(); state->slurped = jv_invalid();
} }
void jq_util_input_free(jq_util_input_state *state) { void jq_util_input_free(jq_util_input_state **state) {
jq_util_input_state old_state = *state; jq_util_input_state *old_state = *state;
*state = NULL; *state = NULL;
if (old_state == NULL) if (old_state == NULL)
return; return;
@@ -254,22 +254,22 @@ void jq_util_input_free(jq_util_input_state *state) {
jv_mem_free(old_state); jv_mem_free(old_state);
} }
void jq_util_input_add_input(jq_util_input_state state, const char *fname) { void jq_util_input_add_input(jq_util_input_state *state, const char *fname) {
state->files = jv_mem_realloc(state->files, (state->nfiles + 1) * sizeof(state->files[0])); state->files = jv_mem_realloc(state->files, (state->nfiles + 1) * sizeof(state->files[0]));
state->files[state->nfiles++] = jv_mem_strdup(fname); state->files[state->nfiles++] = jv_mem_strdup(fname);
} }
int jq_util_input_errors(jq_util_input_state state) { int jq_util_input_errors(jq_util_input_state *state) {
return state->failures; return state->failures;
} }
static const char *next_file(jq_util_input_state state) { static const char *next_file(jq_util_input_state *state) {
if (state->curr_file < state->nfiles) if (state->curr_file < state->nfiles)
return state->files[state->curr_file++]; return state->files[state->curr_file++];
return NULL; return NULL;
} }
static int jq_util_input_read_more(jq_util_input_state state) { static int jq_util_input_read_more(jq_util_input_state *state) {
if (!state->current_input || feof(state->current_input) || ferror(state->current_input)) { if (!state->current_input || feof(state->current_input) || ferror(state->current_input)) {
if (state->current_input && ferror(state->current_input)) { if (state->current_input && ferror(state->current_input)) {
// System-level input error on the stream. It will be closed (below). // System-level input error on the stream. It will be closed (below).
@@ -360,7 +360,7 @@ static int jq_util_input_read_more(jq_util_input_state state) {
} }
jv jq_util_input_next_input_cb(jq_state *jq, void *data) { jv jq_util_input_next_input_cb(jq_state *jq, void *data) {
return jq_util_input_next_input((jq_util_input_state)data); return jq_util_input_next_input((jq_util_input_state *)data);
} }
// Return the current_filename:current_line // Return the current_filename:current_line
@@ -371,7 +371,7 @@ jv jq_util_input_get_position(jq_state *jq) {
assert(cb == jq_util_input_next_input_cb); assert(cb == jq_util_input_next_input_cb);
if (cb != jq_util_input_next_input_cb) if (cb != jq_util_input_next_input_cb)
return jv_invalid_with_msg(jv_string("Invalid jq_util_input API usage")); return jv_invalid_with_msg(jv_string("Invalid jq_util_input API usage"));
jq_util_input_state s = (jq_util_input_state)cb_data; jq_util_input_state *s = (jq_util_input_state *)cb_data;
// We can't assert that current_filename is a string because if // We can't assert that current_filename is a string because if
// the error was a JSON parser error then we may not have set // the error was a JSON parser error then we may not have set
@@ -389,7 +389,7 @@ jv jq_util_input_get_current_filename(jq_state* jq) {
jq_get_input_cb(jq, &cb, &cb_data); jq_get_input_cb(jq, &cb, &cb_data);
if (cb != jq_util_input_next_input_cb) if (cb != jq_util_input_next_input_cb)
return jv_invalid_with_msg(jv_string("Unknown input filename")); return jv_invalid_with_msg(jv_string("Unknown input filename"));
jq_util_input_state s = (jq_util_input_state)cb_data; jq_util_input_state *s = (jq_util_input_state *)cb_data;
jv v = jv_copy(s->current_filename); jv v = jv_copy(s->current_filename);
return v; return v;
} }
@@ -400,7 +400,7 @@ jv jq_util_input_get_current_line(jq_state* jq) {
jq_get_input_cb(jq, &cb, &cb_data); jq_get_input_cb(jq, &cb, &cb_data);
if (cb != jq_util_input_next_input_cb) if (cb != jq_util_input_next_input_cb)
return jv_invalid_with_msg(jv_string("Unknown input line number")); return jv_invalid_with_msg(jv_string("Unknown input line number"));
jq_util_input_state s = (jq_util_input_state)cb_data; jq_util_input_state *s = (jq_util_input_state *)cb_data;
jv v = jv_number(s->current_line); jv v = jv_number(s->current_line);
return v; return v;
} }
@@ -408,7 +408,7 @@ jv jq_util_input_get_current_line(jq_state* jq) {
// Blocks to read one more input from stdin and/or given files // Blocks to read one more input from stdin and/or given files
// When slurping, it returns just one value // When slurping, it returns just one value
jv jq_util_input_next_input(jq_util_input_state state) { jv jq_util_input_next_input(jq_util_input_state *state) {
int is_last = 0; int is_last = 0;
jv value = jv_invalid(); // need more input jv value = jv_invalid(); // need more input
do { do {