diff options
| author | Rafael G. Martins <rafael@rafaelmartins.eng.br> | 2016-09-03 21:23:27 +0200 |
|---|---|---|
| committer | Rafael G. Martins <rafael@rafaelmartins.eng.br> | 2016-09-03 21:57:04 +0200 |
| commit | e5f9cd349da231eae42ec9d35e3ebcd0d8fff973 (patch) | |
| tree | ca81ecd0548cafdefffc4a61b3e1dd2afac32d16 /src/blogc/source-parser.c | |
| parent | a319fe44f6d50d25f546e17ad9907eedd9a358a0 (diff) | |
| download | blogc-e5f9cd349da231eae42ec9d35e3ebcd0d8fff973.tar.gz blogc-e5f9cd349da231eae42ec9d35e3ebcd0d8fff973.tar.bz2 blogc-e5f9cd349da231eae42ec9d35e3ebcd0d8fff973.zip | |
*: moved error handling to src/common/
Diffstat (limited to 'src/blogc/source-parser.c')
| -rw-r--r-- | src/blogc/source-parser.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/blogc/source-parser.c b/src/blogc/source-parser.c index dc39760..7cb929e 100644 --- a/src/blogc/source-parser.c +++ b/src/blogc/source-parser.c @@ -11,7 +11,8 @@ #include "content-parser.h" #include "source-parser.h" -#include "error.h" +#include "errors.h" +#include "../common/error.h" #include "../common/utils.h" @@ -27,7 +28,7 @@ typedef enum { bc_trie_t* -blogc_source_parse(const char *src, size_t src_len, blogc_error_t **err) +blogc_source_parse(const char *src, size_t src_len, bc_error_t **err) { if (err == NULL || *err != NULL) return NULL; @@ -60,7 +61,7 @@ blogc_source_parse(const char *src, size_t src_len, blogc_error_t **err) state = SOURCE_SEPARATOR; break; } - *err = blogc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, + *err = bc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, current, "Can't find a configuration key or the content separator."); break; @@ -93,7 +94,7 @@ blogc_source_parse(const char *src, size_t src_len, blogc_error_t **err) ((current - start == 13) && (0 == strncmp("BLOGC_VERSION", src + start, 13)))) { - *err = blogc_error_new_printf(BLOGC_ERROR_SOURCE_PARSER, + *err = bc_error_new_printf(BLOGC_ERROR_SOURCE_PARSER, "'%s' variable is forbidden in source files. It will " "be set for you by the compiler.", key); break; @@ -101,7 +102,7 @@ blogc_source_parse(const char *src, size_t src_len, blogc_error_t **err) state = SOURCE_CONFIG_VALUE_START; break; } - *err = blogc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, + *err = bc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, current, "Invalid configuration key."); break; @@ -111,7 +112,7 @@ blogc_source_parse(const char *src, size_t src_len, blogc_error_t **err) start = current; break; } - *err = blogc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, + *err = bc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, current, "Configuration value not provided for '%s'.", key); break; @@ -134,7 +135,7 @@ blogc_source_parse(const char *src, size_t src_len, blogc_error_t **err) state = SOURCE_CONTENT_START; break; } - *err = blogc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, + *err = bc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, current, "Invalid content separator. Must be more than one '-' characters."); break; @@ -183,21 +184,21 @@ blogc_source_parse(const char *src, size_t src_len, blogc_error_t **err) // output. :) switch (state) { case SOURCE_START: - *err = blogc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, + *err = bc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, current, "Your source file is empty."); break; case SOURCE_CONFIG_KEY: - *err = blogc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, + *err = bc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, current, "Your last configuration key is missing ':' and " "the value"); break; case SOURCE_CONFIG_VALUE_START: - *err = blogc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, + *err = bc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, current, "Configuration value not provided for '%s'.", key); break; case SOURCE_CONFIG_VALUE: - *err = blogc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, + *err = bc_error_parser(BLOGC_ERROR_SOURCE_PARSER, src, src_len, current, "No line ending after the configuration value for " "'%s'.", key); break; |