From 0c67cae6e45b77b29c8450c721491b32c56258fa Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Thu, 28 May 2015 01:35:32 -0300 Subject: source-parser: fixed reserved variables --- src/source-parser.c | 12 +++++- tests/check_source_parser.c | 90 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 1 deletion(-) diff --git a/src/source-parser.c b/src/source-parser.c index d7dddc7..f0fca29 100644 --- a/src/source-parser.c +++ b/src/source-parser.c @@ -81,7 +81,17 @@ blogc_source_parse(const char *src, size_t src_len, blogc_error_t **err) ((current - start == 20) && (0 == strncmp("DATE_FIRST_FORMATTED", src + start, 20))) || ((current - start == 19) && - (0 == strncmp("DATE_LAST_FORMATTED", src + start, 19)))) + (0 == strncmp("DATE_LAST_FORMATTED", src + start, 19))) || + ((current - start == 10) && + (0 == strncmp("PAGE_FIRST", src + start, 10))) || + ((current - start == 13) && + (0 == strncmp("PAGE_PREVIOUS", src + start, 13))) || + ((current - start == 12) && + (0 == strncmp("PAGE_CURRENT", src + start, 12))) || + ((current - start == 9) && + (0 == strncmp("PAGE_NEXT", src + start, 9))) || + ((current - start == 9) && + (0 == strncmp("PAGE_LAST", src + start, 9)))) { *err = blogc_error_new_printf(BLOGC_ERROR_SOURCE_PARSER, "'%s' variable is forbidden in source files. It will " diff --git a/tests/check_source_parser.c b/tests/check_source_parser.c index 65a3f9a..0cec364 100644 --- a/tests/check_source_parser.c +++ b/tests/check_source_parser.c @@ -257,6 +257,91 @@ test_source_parse_config_reserved_name5(void **state) } +static void +test_source_parse_config_reserved_name6(void **state) +{ + const char *a = "PAGE_FIRST: asd\r\n"; + blogc_error_t *err = NULL; + b_trie_t *source = blogc_source_parse(a, strlen(a), &err); + assert_null(source); + assert_non_null(err); + assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); + assert_string_equal(err->msg, + "'PAGE_FIRST' variable is forbidden in source files. It will be set " + "for you by the compiler."); + blogc_error_free(err); + b_trie_free(source); +} + + +static void +test_source_parse_config_reserved_name7(void **state) +{ + const char *a = "PAGE_PREVIOUS: asd\r\n"; + blogc_error_t *err = NULL; + b_trie_t *source = blogc_source_parse(a, strlen(a), &err); + assert_null(source); + assert_non_null(err); + assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); + assert_string_equal(err->msg, + "'PAGE_PREVIOUS' variable is forbidden in source files. It will be set " + "for you by the compiler."); + blogc_error_free(err); + b_trie_free(source); +} + + +static void +test_source_parse_config_reserved_name8(void **state) +{ + const char *a = "PAGE_CURRENT: asd\r\n"; + blogc_error_t *err = NULL; + b_trie_t *source = blogc_source_parse(a, strlen(a), &err); + assert_null(source); + assert_non_null(err); + assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); + assert_string_equal(err->msg, + "'PAGE_CURRENT' variable is forbidden in source files. It will be set " + "for you by the compiler."); + blogc_error_free(err); + b_trie_free(source); +} + + +static void +test_source_parse_config_reserved_name9(void **state) +{ + const char *a = "PAGE_NEXT: asd\r\n"; + blogc_error_t *err = NULL; + b_trie_t *source = blogc_source_parse(a, strlen(a), &err); + assert_null(source); + assert_non_null(err); + assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); + assert_string_equal(err->msg, + "'PAGE_NEXT' variable is forbidden in source files. It will be set " + "for you by the compiler."); + blogc_error_free(err); + b_trie_free(source); +} + + +static void +test_source_parse_config_reserved_name10(void **state) +{ + const char *a = "PAGE_LAST: asd\r\n"; + blogc_error_t *err = NULL; + b_trie_t *source = blogc_source_parse(a, strlen(a), &err); + assert_null(source); + assert_non_null(err); + assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); + assert_string_equal(err->msg, + "'PAGE_LAST' variable is forbidden in source files. It will be set " + "for you by the compiler."); + blogc_error_free(err); + b_trie_free(source); +} + + static void test_source_parse_config_value_no_line_ending(void **state) { @@ -307,6 +392,11 @@ main(void) unit_test(test_source_parse_config_reserved_name3), unit_test(test_source_parse_config_reserved_name4), unit_test(test_source_parse_config_reserved_name5), + unit_test(test_source_parse_config_reserved_name6), + unit_test(test_source_parse_config_reserved_name7), + unit_test(test_source_parse_config_reserved_name8), + unit_test(test_source_parse_config_reserved_name9), + unit_test(test_source_parse_config_reserved_name10), unit_test(test_source_parse_config_value_no_line_ending), unit_test(test_source_parse_invalid_separator), }; -- cgit v1.2.3-18-g5258