summaryrefslogtreecommitdiff
path: root/src/sp_var_parser.c
diff options
context:
space:
mode:
authorjvoisin2017-12-21 14:03:18 +0100
committerjvoisin2017-12-21 14:03:18 +0100
commit0d98f51e7dbde4a40c0039910d43ad378eaefa83 (patch)
tree78749747bc46c80f85bc2c3cdfb629b331d200f1 /src/sp_var_parser.c
parentf91cf7390c060986e51b77990f4e472165b97dad (diff)
Rename sp_node_t to sp_list_node
Since we now have sp_list and sp_tree, it makes sense to specify that nodes are only for lists.
Diffstat (limited to 'src/sp_var_parser.c')
-rw-r--r--src/sp_var_parser.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sp_var_parser.c b/src/sp_var_parser.c
index b6dde03..6ec415a 100644
--- a/src/sp_var_parser.c
+++ b/src/sp_var_parser.c
@@ -1,7 +1,7 @@
1#include "php_snuffleupagus.h" 1#include "php_snuffleupagus.h"
2 2
3static int parse_str_tokens(const char *str, const sp_token_t token, 3static int parse_str_tokens(const char *str, const sp_token_t token,
4 sp_node_t *tokens_list) { 4 sp_list_node *tokens_list) {
5 const char *cur_str = str; 5 const char *cur_str = str;
6 6
7 while ((cur_str = strchr(cur_str, token.token[0]))) { 7 while ((cur_str = strchr(cur_str, token.token[0]))) {
@@ -87,7 +87,7 @@ static int create_var(sp_tree *tree, const char *restrict value,
87 return 0; 87 return 0;
88} 88}
89 89
90int cmp_tokens(sp_node_t *list1, sp_node_t *list2) { 90int cmp_tokens(sp_list_node *list1, sp_list_node *list2) {
91 return (((sp_token_t *)list1->data)->pos 91 return (((sp_token_t *)list1->data)->pos
92 - ((sp_token_t *)list2->data)->pos); 92 - ((sp_token_t *)list2->data)->pos);
93} 93}
@@ -101,7 +101,7 @@ static int is_next_token_empty(sp_token_t *token, sp_token_t *token_next,
101 return 0; 101 return 0;
102} 102}
103 103
104static int is_token_valid(sp_node_t *tokens_list, elem_type ignore, 104static int is_token_valid(sp_list_node *tokens_list, elem_type ignore,
105 int array_count, const char * restrict str, 105 int array_count, const char * restrict str,
106 size_t pos) { 106 size_t pos) {
107 sp_token_t *token = (sp_token_t *)tokens_list->data; 107 sp_token_t *token = (sp_token_t *)tokens_list->data;
@@ -157,7 +157,7 @@ static int is_token_valid(sp_node_t *tokens_list, elem_type ignore,
157} 157}
158 158
159static sp_tree *parse_tokens(const char * restrict str, 159static sp_tree *parse_tokens(const char * restrict str,
160 sp_node_t *tokens_list) { 160 sp_list_node *tokens_list) {
161 size_t pos = 0; 161 size_t pos = 0;
162 int array_count = 0, pos_idx_start = -1; 162 int array_count = 0, pos_idx_start = -1;
163 elem_type ignore = 0; 163 elem_type ignore = 0;
@@ -217,7 +217,7 @@ error:
217} 217}
218 218
219sp_tree *parse_var(const char *line) { 219sp_tree *parse_var(const char *line) {
220 sp_node_t *tokens_list = NULL; 220 sp_list_node *tokens_list = NULL;
221 sp_tree *tree = NULL; 221 sp_tree *tree = NULL;
222 const sp_token_t delimiter_list[] = { 222 const sp_token_t delimiter_list[] = {
223 {.type=OBJECT, .token=OBJECT_TOKEN}, 223 {.type=OBJECT, .token=OBJECT_TOKEN},