diff options
| -rw-r--r-- | include/grecs/json.h | 1 | ||||
| -rw-r--r-- | include/wordsplit.h | 8 | ||||
| -rw-r--r-- | src/diag.c | 2 | ||||
| -rw-r--r-- | src/json-gram.y | 1 | ||||
| -rw-r--r-- | src/json-lex.l | 35 |
5 files changed, 31 insertions, 16 deletions
diff --git a/include/grecs/json.h b/include/grecs/json.h index f8402e7..49a6b87 100644 --- a/include/grecs/json.h +++ b/include/grecs/json.h @@ -56,2 +56,3 @@ extern struct json_value *json_return_obj; void jsonlex_setup(char const *s, size_t l); +void jsonlex_cleanup(void); void jsonlex_diag(const char *s); diff --git a/include/wordsplit.h b/include/wordsplit.h index d13ec3c..7229df3 100644 --- a/include/wordsplit.h +++ b/include/wordsplit.h @@ -28,5 +28,7 @@ typedef struct wordsplit wordsplit_t; - In the comments below, the - identifiers in parentheses indicate bits that must be set (or unset, if - starting with !) in the ws_flags to initialize or use the given member. + In the comments below, the identifiers in parentheses indicate bits that + must be set (or unset, if starting with !) in ws_flags (if starting with + WRDSF_) or ws_options (if starting with WRDSO_) to initialize or use the + given member. + If not redefined explicitly, most of them are set to some reasonable @@ -39,3 +39,3 @@ default_print_diag(grecs_locus_t const *locus, int err, int errcode, if (errcode) - fprintf(stderr, ": %s", strerror(errno)); + fprintf(stderr, ": %s", strerror(errcode)); fputc('\n', stderr); diff --git a/src/json-gram.y b/src/json-gram.y index fe8996b..d5b0248 100644 --- a/src/json-gram.y +++ b/src/json-gram.y @@ -282,2 +282,3 @@ json_parse_string(char const *input, size_t len) } + jsonlex_cleanup(); return json_return_obj; diff --git a/src/json-lex.l b/src/json-lex.l index 169cf32..4bbdedf 100644 --- a/src/json-lex.l +++ b/src/json-lex.l @@ -57,14 +57,2 @@ struct grecs_locus json_err_locus; void -jsonlex_setup(char const *s, size_t l) -{ - input_ptr = s; - input_size = l; - json_current_locus_point.file = NULL; - json_current_locus_point.line = 1; - json_current_locus_point.col = 0; - json_err_diag = NULL; - yy_flex_debug = 0; -} - -void jsonlex_diag(const char *s) @@ -229 +217,24 @@ false { yylval.b = 0; return T_BOOL; } return T_ERR; } +%% +void +jsonlex_setup(char const *s, size_t l) +{ + input_ptr = s; + input_size = l; + json_current_locus_point.file = "input"; + json_current_locus_point.line = 1; + json_current_locus_point.col = 0; + json_err_diag = NULL; + yy_flex_debug = 0; + BEGIN(INITIAL); + yyrestart(NULL); +} + +void +jsonlex_cleanup(void) +{ + if (json_line_acc) { + grecs_txtacc_free(json_line_acc); + json_line_acc = NULL; + } +} |