diff options
author | Palmer Dabbelt <palmer@dabbelt.com> | 2015-10-26 22:27:19 -0700 |
---|---|---|
committer | Palmer Dabbelt <palmer@dabbelt.com> | 2015-10-26 22:27:19 -0700 |
commit | a5128b3c739a79d2bf57de25023603387dcf9ce2 (patch) | |
tree | aec8bb454af64e6f17d6ca7b8ce0e68702d940ea /tests | |
parent | 9293ef61f278ca339f62da5173fc68f9b6d5b482 (diff) | |
download | blogc-a5128b3c739a79d2bf57de25023603387dcf9ce2.tar.gz blogc-a5128b3c739a79d2bf57de25023603387dcf9ce2.tar.bz2 blogc-a5128b3c739a79d2bf57de25023603387dcf9ce2.zip |
Allow {% if VALUE1 == VALUE2 %}, with two defines
I was surprised to see that blogc doesn't support testing for equality
between two defined values, it just supports comparison between a
variable and a constant string. I want to be able to compare two
variables so I can build the same source with different "-D" argument on
the command line to produce different outputs.
This patch adds support for this pattern. I changed the parser to
include the '"' at the beginning and end of a string, which allows the
renderer to determine if the user passed in a string or a variable name.
This is a bit hacky and causes some of the tests to fail -- these tests
look at the string values coming out of the parser. I updated the tests
to match the new behavior.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/check_template_parser.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/check_template_parser.c b/tests/check_template_parser.c index 94f669b..b712f22 100644 --- a/tests/check_template_parser.c +++ b/tests/check_template_parser.c @@ -106,7 +106,7 @@ test_template_parse(void **state) blogc_assert_template_stmt(tmp->next->next->next->next->next->next->next->next->next, "\n", BLOGC_TEMPLATE_CONTENT_STMT); tmp = tmp->next->next->next->next->next->next->next->next->next->next; - blogc_assert_template_if_stmt(tmp, "BOLA", BLOGC_TEMPLATE_OP_EQ, "1\\\"0"); + blogc_assert_template_if_stmt(tmp, "BOLA", BLOGC_TEMPLATE_OP_EQ, "\"1\\\"0\""); blogc_assert_template_stmt(tmp->next, "aee", BLOGC_TEMPLATE_CONTENT_STMT); blogc_assert_template_stmt(tmp->next->next, NULL, BLOGC_TEMPLATE_ENDIF_STMT); @@ -176,7 +176,7 @@ test_template_parse_crlf(void **state) blogc_assert_template_stmt(tmp->next->next->next->next->next->next->next->next->next, "\r\n", BLOGC_TEMPLATE_CONTENT_STMT); tmp = tmp->next->next->next->next->next->next->next->next->next->next; - blogc_assert_template_if_stmt(tmp, "BOLA", BLOGC_TEMPLATE_OP_EQ, "1\\\"0"); + blogc_assert_template_if_stmt(tmp, "BOLA", BLOGC_TEMPLATE_OP_EQ, "\"1\\\"0\""); blogc_assert_template_stmt(tmp->next, "aee", BLOGC_TEMPLATE_CONTENT_STMT); blogc_assert_template_stmt(tmp->next->next, NULL, BLOGC_TEMPLATE_ENDIF_STMT); @@ -543,7 +543,7 @@ test_template_parse_invalid_if_operand2(void **state) assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); assert_string_equal(err->msg, "Found an open double-quoted string.\n" - "Error occurred near line 1, position 32: " + "Error occurred near line 1, position 31: " "{% block entry %}{% if BOLA == \"asd %}"); blogc_error_free(err); } |