X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fcommon%2Fparse_file.c;fp=src%2Fcommon%2Fparse_file.c;h=82ba4e389bdbbe34d930df6eb7af71a08a5ab485;hb=891ba8fbca53d920f6b3704827fa6b8aee737de4;hp=8ce20ad55db79c7369225134e73d2f09a5d2b42a;hpb=997edd45d2002dc021d1d74a12473e6055a82a75;p=plomrogue

diff --git a/src/common/parse_file.c b/src/common/parse_file.c
index 8ce20ad..82ba4e3 100644
--- a/src/common/parse_file.c
+++ b/src/common/parse_file.c
@@ -7,8 +7,6 @@
 #include <stdint.h> /* int16_t,uint8_t,uint32_t, INT16_MIN, UINT{8,16,32}_MAX */
 #include <stdlib.h> /* atoi(), free() */
 #include <string.h> /* strchr, strcmp(), strdup(), strlen() */
-#include <unistd.h> /* access(), F_OK */
-#include "readwrite.h" /* try_fopen(), try_fclose(), textfile_width() */
 #include "rexit.h" /* exit_err(), exit_trouble() */
 #include "try_malloc.h" /* try_malloc() */
 
@@ -49,53 +47,26 @@ static void set_token_end(char ** start, char ** limit_char)
 
 
 
-extern void parse_file(char * path, void (* token_to_entry) (char *, char *))
+extern void set_err_line_options(char * intro, char * line, uint8_t exit)
 {
-    char * f_name = "read_new_config_file()";
-    char * prefix = "Failed reading config file: \"";
-    char * affix = "\". ";
-    size_t size = strlen(prefix) + strlen(path) + strlen(affix) + 1;
-    char * errline_intro = try_malloc(size, f_name);
-    int test = snprintf(errline_intro, size, "%s%s%s", prefix, path, affix);
-    exit_trouble(test < 0, f_name, "snprintf()");
-    exit_err(access(path, F_OK), errline_intro);
-    FILE * file = try_fopen(path, "r", f_name);
-    uint32_t linemax = textfile_width(file);
-    char * errline_line = try_malloc(linemax + 1, f_name);
-    set_err_line_options(errline_intro, errline_line, 0, 1);
-    err_line(0 == linemax, "File is empty.");
-    char * token0 = NULL; /* For final token_to_entry() if while() stagnates. */
-    char * token1 = NULL;
-    char * err_val = "No value given.";
-    while (try_fgets(errline_line, linemax + 1, file, f_name))
-    {
-        err_line_count++;
-        err_line(UINT32_MAX == err_line_count, "Line reaches max lines limit.");
-        char * line_copy = strdup(errline_line);
-        token0 = token_from_line(line_copy);
-        if (token0)
-        {
-            err_line(0 == (token1 = token_from_line(NULL)), err_val);
-            token_to_entry(token0, token1);
-            token0 = NULL;
-        }
-        free(line_copy);
-    }
-    token_to_entry(token0, token1);
-    try_fclose(file, f_name);
-    free(errline_line);
-    free(errline_intro);
+    err_line_line = line;
+    err_line_intro = intro;
+    err_line_exit = exit;
 }
 
 
 
-extern void set_err_line_options(char * intro, char * line, uint32_t count,
-                                 uint8_t exit)
+extern void err_line_inc()
 {
-    err_line_count = count;
-    err_line_line = line;
-    err_line_intro = intro;
-    err_line_exit = exit;
+    err_line_count++;
+    err_line(UINT32_MAX == err_line_count, "Line reaches max lines limit.");
+}
+
+
+
+extern void err_line_zero()
+{
+    err_line_count = 0;
 }
 
 
@@ -108,7 +79,7 @@ extern uint8_t err_line(uint8_t test, char * msg)
     }
     char * f_name = "err_line()";
     char * prefix = " Offending line ";
-    char * affix = ":\n";
+    char * affix = ": ";
     size_t size =   strlen(err_line_intro) + strlen(msg) + strlen(prefix)
                   + 10                 /* strlen for uint32_t representations */
                   + strlen(affix) + strlen(err_line_line) + 1;
@@ -208,13 +179,6 @@ extern uint8_t parsetest_int(char * string, char type)
 
 
 
-extern void parsetest_defcontext(uint8_t flags)
-{
-    err_line(!(flags & EDIT_STARTED),"Outside appropriate definition context.");
-}
-
-
-
 extern uint8_t parsetest_singlechar(char * string)
 {
     return err_line(1 !=strlen(string),"Value must be single ASCII character.");
@@ -222,38 +186,6 @@ extern uint8_t parsetest_singlechar(char * string)
 
 
 
-extern void parsetest_too_many_values()
-{
-    err_line(NULL != token_from_line(NULL), "Too many values.");
-}
-
-
-
-extern void parse_id_uniq(int test)
-{
-    err_line(0 != test, "Declaration of ID already used.");
-}
-
-
-
-extern void parse_unknown_arg()
-{
-    err_line(1, "Unknown argument.");
-}
-
-
-
-extern char * parse_init_entry(uint8_t * flags, size_t size)
-{
-    char * f_name = "parse_init_entry()";
-    *flags = EDIT_STARTED;
-    char * p = try_malloc(size, f_name);
-    memset(p, 0, size);
-    return p;
-}
-
-
-
 extern uint8_t parse_val(char * token0, char * token1, char * comparand,
                          char type, char * element)
 {
@@ -261,11 +193,15 @@ extern uint8_t parse_val(char * token0, char * token1, char * comparand,
     {
         if      ('s' == type)
         {
+            free(* (char **) element);
             * (char **) element = strdup(token1);
         }
-        else if ('c' == type && !parsetest_singlechar(token1))
+        else if ('c' == type)
         {
-            *element = (token1)[0];
+            if (!parsetest_singlechar(token1))
+            {
+                *element = (token1)[0];
+            }
         }
         else if (!parsetest_int(token1, type))
         {
@@ -290,27 +226,3 @@ extern uint8_t parse_val(char * token0, char * token1, char * comparand,
     }
     return 0;
 }
-
-
-
-extern uint8_t parse_flagval(char * token0, char * token1, char * comparand,
-                             uint8_t * flags, uint8_t set_flag, char type,
-                             char * element)
-{
-    if (parse_val(token0, token1, comparand, type, element))
-    {
-        parsetest_defcontext(*flags);
-        *flags = *flags | set_flag;
-        return 1;
-    }
-    return 0;
-}
-
-
-
-extern void parse_and_reduce_to_readyflag(uint8_t * flags, uint8_t ready_flag)
-{
-    char * err_fin = "Last definition block not finished yet.";
-    err_line((*flags & ready_flag) ^ ready_flag, err_fin);
-    *flags = ready_flag;
-}