fincy new scanner/parser for config rules + fixed a few bugs along the way + fixed related unittests

1 files changed, 0 insertions, 103 deletions

diff --git a/src/sp_config_utils.c b/src/sp_config_utils.c
index bc7b405..e93ef31 100644
--- a/src/sp_config_utils.c
+++ b/src/sp_config_utils.c
@@ -1,108 +1,5 @@
 #include "php_snuffleupagus.h"
 
-int parse_keywords(sp_config_functions *funcs, char *line) {
-  int value_len = 0;
-  const char *original_line = line;
-  for (size_t i = 0; funcs[i].func; i++) {
-    if (!strncmp(funcs[i].token, line, strlen(funcs[i].token))) {
-      line += strlen(funcs[i].token);
-      value_len = funcs[i].func(line, funcs[i].token, funcs[i].retval) + 1;
-      if (value_len == 0) {  // bad parameter
-        return -1;
-      }
-      line += value_len;
-      i = -1;  // we start the loop again
-    }
-  }
-  while (*line == ';' || *line == '\t' || *line == ' ') {
-    line++;
-  }
-
-  if (*line == '#') {
-    return 0;
-  }
-
-  if (*line) {
-    sp_log_err("config", "Trailing chars '%s' at the end of '%s' on line %zu",
-               line, original_line, sp_line_no);
-    return -1;
-  }
-  return 0;
-}
-
-zend_string *get_param(size_t *consumed, char *restrict line, sp_type type,
-                       const char *restrict keyword) {
-  enum { IN_ESCAPE, NONE } state = NONE;
-  char *original_line = line;
-  size_t j = 0;
-
-  zend_string *ret = NULL;
-  if (NULL == line || '\0' == *line) {
-    goto err;
-  }
-
-  ret = zend_string_alloc(strlen(line) + 1, 1);
-
-  /* The first char of a string is always '"', since they MUST be quoted. */
-  if ('"' == *line) {
-    line++;
-  } else {
-    goto err;
-  }
-
-  for (size_t i = 0; line[i] && j < strlen(original_line) - 2; i++) {
-    switch (line[i]) {
-      case '"':
-        /* A double quote at this point is either:
-          - at the very end of the string.
-          - escaped
-          */
-        if ((state == NONE) && (line[i + 1] == SP_TOKEN_END_PARAM)) {
-          /* The `+2` if for
-           1. the terminal double-quote
-           2. the SP_TOKEN_END_PARAM
-           */
-          *consumed = i + 2;
-          // Make sure that the string we return is the right size,
-          // as it can be smaller than strlen(line)
-          ret = zend_string_truncate(ret, j, 1);
-          // truncate does not add a \0
-          ZSTR_VAL(ret)[ZSTR_LEN(ret)] = 0;
-          return ret;
-        } else if (state == IN_ESCAPE) {
-          break;  // we're on an escped double quote
-        } else {
-          goto err;
-        }
-      case '\\':
-        if (state == NONE) {
-          state = IN_ESCAPE;
-          continue;
-        }
-      default:
-        break;
-    }
-    if (state == IN_ESCAPE) {
-      state = NONE;
-    }
-    ZSTR_VAL(ret)[j++] = line[i];
-  }
-err:
-  if (0 == j) {
-    sp_log_err("error", "A valid string as parameter is expected on line %zu",
-               sp_line_no);
-  } else {
-    sp_log_err("error",
-               "There is an issue with the parsing of '%s': it doesn't look "
-               "like a valid string on line %zu",
-               original_line ? original_line : "NULL", sp_line_no);
-  }
-  line = NULL;
-  if (ret) {
-    zend_string_release(ret);
-  }
-  return NULL;
-}
 
 sp_list_node *parse_functions_list(char *value) {
   static const char *sep = ">";