aboutsummaryrefslogtreecommitdiffstats
path: root/src/template-parser.c
diff options
context:
space:
mode:
authorPalmer Dabbelt <palmer@dabbelt.com>2015-10-26 22:27:19 -0700
committerPalmer Dabbelt <palmer@dabbelt.com>2015-10-26 22:27:19 -0700
commita5128b3c739a79d2bf57de25023603387dcf9ce2 (patch)
treeaec8bb454af64e6f17d6ca7b8ce0e68702d940ea /src/template-parser.c
parent9293ef61f278ca339f62da5173fc68f9b6d5b482 (diff)
downloadblogc-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 'src/template-parser.c')
-rw-r--r--src/template-parser.c23
1 files changed, 18 insertions, 5 deletions
diff --git a/src/template-parser.c b/src/template-parser.c
index fd01ac2..f6912df 100644
--- a/src/template-parser.c
+++ b/src/template-parser.c
@@ -30,7 +30,8 @@ typedef enum {
TEMPLATE_BLOCK_IF_OPERATOR_START,
TEMPLATE_BLOCK_IF_OPERATOR,
TEMPLATE_BLOCK_IF_OPERAND_START,
- TEMPLATE_BLOCK_IF_OPERAND,
+ TEMPLATE_BLOCK_IF_STRING_OPERAND,
+ TEMPLATE_BLOCK_IF_VARIABLE_OPERAND,
TEMPLATE_BLOCK_END,
TEMPLATE_VARIABLE_START,
TEMPLATE_VARIABLE,
@@ -303,6 +304,11 @@ blogc_template_parse(const char *src, size_t src_len, blogc_error_t **err)
case TEMPLATE_BLOCK_IF_OPERAND_START:
if (c == ' ')
break;
+ if ((c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_') {
+ state = TEMPLATE_BLOCK_IF_VARIABLE_OPERAND;
+ start2 = current;
+ break;
+ }
if (c != '"') {
op_start = 0;
op_end = 0;
@@ -311,16 +317,23 @@ blogc_template_parse(const char *src, size_t src_len, blogc_error_t **err)
"Invalid 'if' operand. Must be double-quoted static string.");
break;
}
- state = TEMPLATE_BLOCK_IF_OPERAND;
- start2 = current + 1;
+ state = TEMPLATE_BLOCK_IF_STRING_OPERAND;
+ start2 = current;
break;
- case TEMPLATE_BLOCK_IF_OPERAND:
+ case TEMPLATE_BLOCK_IF_STRING_OPERAND:
if (c != '"')
break;
if (c == '"' && src[current - 1] == '\\')
break;
state = TEMPLATE_BLOCK_END;
+ end2 = current + 1;
+ break;
+
+ case TEMPLATE_BLOCK_IF_VARIABLE_OPERAND:
+ if ((c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_')
+ break;
+ state = TEMPLATE_BLOCK_END;
end2 = current;
break;
@@ -446,7 +459,7 @@ blogc_template_parse(const char *src, size_t src_len, blogc_error_t **err)
}
if (*err == NULL) {
- if (state == TEMPLATE_BLOCK_IF_OPERAND)
+ if (state == TEMPLATE_BLOCK_IF_STRING_OPERAND)
*err = blogc_error_parser(BLOGC_ERROR_TEMPLATE_PARSER, src, src_len,
start2 - 1, "Found an open double-quoted string.");
else if (if_count != 0)