diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2013-07-28 15:44:09 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-07-28 15:44:09 -0700 |
| commit | 680ac41bb1ee83e708e7309f2141a76203d90c7c (patch) | |
| tree | afa35b867a5a0e9816cfd2597c991ea944c1bf0f /parse_productions.cpp | |
| parent | b133137a1f0341f9e21b622448bf5d5056c53046 (diff) | |
Clean up some error handling
Diffstat (limited to 'parse_productions.cpp')
| -rw-r--r-- | parse_productions.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/parse_productions.cpp b/parse_productions.cpp index e63f5602..61f7636d 100644 --- a/parse_productions.cpp +++ b/parse_productions.cpp @@ -30,6 +30,9 @@ static bool production_is_valid(const production_options_t production_list, prod #define RESOLVE(sym) static production_option_idx_t resolve_##sym (parse_token_type_t token_type, parse_keyword_t token_keyword, production_tag_t *tag) #define RESOLVE_ONLY(sym) static production_option_idx_t resolve_##sym (parse_token_type_t token_type, parse_keyword_t token_keyword, production_tag_t *tag) { return 0; } +#define PRODUCE_KEYWORD(x) ((x) + LAST_TOKEN_OR_SYMBOL + 1) + + /* A job_list is a list of jobs, separated by semicolons or newlines */ PRODUCTIONS(job_list) = { @@ -409,7 +412,7 @@ RESOLVE(optional_background) } #define TEST(sym) case (symbol_##sym): production_list = & productions_ ## sym ; resolver = resolve_ ## sym ; break; -const production_t *parse_productions::production_for_token(parse_token_type_t node_type, parse_token_type_t input_type, parse_keyword_t input_keyword, production_option_idx_t *out_which_production, production_tag_t *out_tag) +const production_t *parse_productions::production_for_token(parse_token_type_t node_type, parse_token_type_t input_type, parse_keyword_t input_keyword, production_option_idx_t *out_which_production, production_tag_t *out_tag, wcstring *out_error_text) { bool log_it = false; if (log_it) @@ -478,7 +481,10 @@ const production_t *parse_productions::production_for_token(parse_token_type_t n if (which == NO_PRODUCTION) { - fprintf(stderr, "Token type '%ls' has no production for input type '%ls', keyword '%ls' (in %s)\n", token_type_description(node_type).c_str(), token_type_description(input_type).c_str(), keyword_description(input_keyword).c_str(), __FUNCTION__); + if (log_it) + { + fprintf(stderr, "Token type '%ls' has no production for input type '%ls', keyword '%ls' (in %s)\n", token_type_description(node_type).c_str(), token_type_description(input_type).c_str(), keyword_description(input_keyword).c_str(), __FUNCTION__); + } result = NULL; } else |