summaryrefslogtreecommitdiff
path: root/src/sp_config_scanner.re
diff options
context:
space:
mode:
authorBen Fuhrmannek2021-09-02 13:58:01 +0200
committerBen Fuhrmannek2021-09-02 13:58:01 +0200
commitb4dcbe2dd11efda09adc934fa2563eafc12e9b55 (patch)
treed4b18b69f24c43a91ffee55caa8f6fbcef240687 /src/sp_config_scanner.re
parent782336d8f4b9c411d344c0e7752e87631952f268 (diff)
fixed compiler warnings + test cases
Diffstat (limited to 'src/sp_config_scanner.re')
-rw-r--r--src/sp_config_scanner.re14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sp_config_scanner.re b/src/sp_config_scanner.re
index f911df3..5fd1928 100644
--- a/src/sp_config_scanner.re
+++ b/src/sp_config_scanner.re
@@ -143,7 +143,7 @@ zend_result sp_config_scan(char *data, zend_result (*process_rule)(sp_parsed_key
143 zend_hash_str_add_ptr(&vars, ZEND_STRL("PHP_VERSION_ID"), zend_string_init(ZEND_STRL(ZEND_TOSTR(PHP_VERSION_ID)), 1)); 143 zend_hash_str_add_ptr(&vars, ZEND_STRL("PHP_VERSION_ID"), zend_string_init(ZEND_STRL(ZEND_TOSTR(PHP_VERSION_ID)), 1));
144 144
145 145
146 int cond_res[100] = {0}; 146 int cond_res[100] = {1};
147 int cond_res_i = 0; 147 int cond_res_i = 0;
148 char cond_op[100] = {0}; 148 char cond_op[100] = {0};
149 int cond_op_i = 0; 149 int cond_op_i = 0;
@@ -220,12 +220,12 @@ zend_result sp_config_scan(char *data, zend_result (*process_rule)(sp_parsed_key
220 case '>': op1 = 'G'; break; // >= 220 case '>': op1 = 'G'; break; // >=
221 } 221 }
222 } 222 }
223 while (cond_op_i && sy_op_peek() != '(' && ((sy_op_precedence(sy_op_peek()) > sy_op_precedence(*t1)) || (sy_op_precedence(sy_op_peek()) == sy_op_precedence(*t1)) && sy_op_is_left_assoc(*t1))) { 223 while (cond_op_i && sy_op_peek() != '(' && ((sy_op_precedence(sy_op_peek()) > sy_op_precedence(*t1)) || (sy_op_precedence(sy_op_peek()) == sy_op_precedence(*t1) && sy_op_is_left_assoc(*t1)))) {
224 SY_APPLY_OP_FROM_STACK(); 224 SY_APPLY_OP_FROM_STACK();
225 }
226 sy_op_push(*t1);
227 goto yyc_cond;
228 } 225 }
226 sy_op_push(*t1);
227 goto yyc_cond;
228 }
229 <cond_op> ")" { 229 <cond_op> ")" {
230 while (cond_op_i && sy_op_peek() != '(') { 230 while (cond_op_i && sy_op_peek() != '(') {
231 SY_APPLY_OP_FROM_STACK(); 231 SY_APPLY_OP_FROM_STACK();
@@ -233,7 +233,7 @@ zend_result sp_config_scan(char *data, zend_result (*process_rule)(sp_parsed_key
233 if (cond_op_i == 0 || sy_op_peek() != '(') { 233 if (cond_op_i == 0 || sy_op_peek() != '(') {
234 cs_error_log("unbalanced parathesis on line %d", lineno); goto out; 234 cs_error_log("unbalanced parathesis on line %d", lineno); goto out;
235 } 235 }
236 sy_op_pop(); 236 cond_op_i--;
237 goto yyc_cond_op; 237 goto yyc_cond_op;
238 } 238 }
239 <cond_op> ";" { 239 <cond_op> ";" {