Refactor file parsing patterns.

[plomrogue] / src / server / configfile.c

diff --git a/src/server/configfile.c b/src/server/configfile.c
index 026f658346b6308270c71682a623b3a1427620ce..a48c494a2d4ab8a7ba49d767f568015430df75d4 100644 (file)
--- a/src/server/configfile.c
+++ b/src/server/configfile.c
@@ -5,9 +5,10 @@
 #include <stdint.h> /* uint8_t */
 #include <stdlib.h> /* atoi(), free() */
 #include <string.h> /* strcmp() */
-#include "../common/parse_file.h" /* EDIT_STARTED, set_val(), test_for_int(),
-                                   * err_line(), parse_file(),token_from_line(),
-                                   * finalize_by_readyflag()
+#include "../common/parse_file.h" /* EDIT_STARTED, parsetest_int(),parse_file(),
+                                   * parsetest_too_many_values(),parse_id_uniq()
+                                   * parse_unknown_arg(), parse_init_entry(),
+                                   * parse_and_reduce_to_readyflag(),parse_val()
                                    */
 #include "../common/rexit.h" /* exit_err(), exit_trouble() */
 #include "../common/try_malloc.h" /* try_malloc() */
@@ -66,7 +67,7 @@ static void tokens_into_entries(char * token0, char * token1);
  * reading. Check that "token1" id of new entry has not already been used in DB
  * starting at "entry_cmp".
  */
-static uint8_t new_entry(char * token0, char * token1, char * comparand,
+static uint8_t start_entry(char * token0, char * token1, char * comparand,
                          uint8_t * flags, size_t size,
                          struct EntryHead ** entry,
                          struct EntryHead * entry_cmp);
@@ -111,47 +112,47 @@ static void tokens_into_entries(char * token0, char * token1)
     static struct EntryHead * mod = NULL;
     if (!token0 || !strcmp(token0,str_act) || !strcmp(token0,str_obj))
     {
-        finalize_by_readyflag(&action_flags, READY_ACT);
-        finalize_by_readyflag(&object_flags, READY_OBJ);
+        parse_and_reduce_to_readyflag(&action_flags, READY_ACT);
+        parse_and_reduce_to_readyflag(&object_flags, READY_OBJ);
         write_if_entry(&moa, (struct EntryHead ***) &moa_p_p);
         write_if_entry(&mod, (struct EntryHead ***) &mod_p_p);
     }
-    err_line(token0 && NULL != token_from_line(NULL), "Too many values.");
-    if (   token0
-        && !(   new_entry(token0, token1, str_act, &action_flags,
-                          sizeof(struct MapObjAct), (struct EntryHead**) &moa,
-                          (struct EntryHead *) world.map_obj_acts)
-             || new_entry(token0, token1, str_obj, &object_flags,
-                          sizeof(struct MapObjDef), (struct EntryHead**) &mod,
-                          (struct EntryHead *) world.map_obj_defs)
-             || set_members(token0, token1, &object_flags, &action_flags,
-                            (struct MapObjDef *) mod, (struct MapObjAct *) moa)))
+    if (token0)
     {
-        err_line(1, "Unknown argument.");
+        parsetest_too_many_values();
+        if (!(   start_entry(token0, token1, str_act, &action_flags,
+                             sizeof(struct MapObjAct),(struct EntryHead**) &moa,
+                             (struct EntryHead *) world.map_obj_acts)
+              || start_entry(token0, token1, str_obj, &object_flags,
+                             sizeof(struct MapObjDef),(struct EntryHead**) &mod,
+                             (struct EntryHead *) world.map_obj_defs)
+              || set_members(token0, token1, &object_flags, &action_flags,
+                             (struct MapObjDef *)mod,(struct MapObjAct *) moa)))
+        {
+            parse_unknown_arg();
+        }
     }
 }
 
 
 
-static uint8_t new_entry(char * token0, char * token1, char * comparand,
-                         uint8_t * flags, size_t size,
-                         struct EntryHead ** entry,struct EntryHead * entry_cmp)
+static uint8_t start_entry(char * token0, char * token1, char * comparand,
+                           uint8_t * flags, size_t size,
+                           struct EntryHead ** entry,
+                           struct EntryHead * entry_cmp)
 {
-    char * f_name = "new_entry()";
-    if (!strcmp(token0, comparand))
+    if (strcmp(token0, comparand))
     {
-        char * err_uniq = "Declaration of ID already used.";
-        * flags = EDIT_STARTED;
-        * entry = try_malloc(size, f_name);
-        test_for_int(token1, '8');
-        (*entry)-> id = atoi(token1);
-        for (; NULL != entry_cmp; entry_cmp = entry_cmp->next)
-        {
-            err_line((*entry)->id == entry_cmp->id, err_uniq);
-        }
-        return 1;
+        return 0;
     }
-    return 0;
+    *entry = (struct EntryHead *) parse_init_entry(flags, size);
+    parsetest_int(token1, '8');
+    (*entry)-> id = atoi(token1);
+    for (; NULL != entry_cmp; entry_cmp = entry_cmp->next)
+    {
+        parse_id_uniq((*entry)->id == entry_cmp->id);
+    }
+    return 1;
 }
 
 
@@ -204,8 +205,8 @@ static uint8_t set_members(char * token0, char * token1, uint8_t * object_flags,
                            struct MapObjAct * moa)
 {
     if (   *action_flags & EDIT_STARTED
-        && set_val(token0, token1, "NAME", action_flags,
-                   NAME_SET, 's', (char *) &moa->name))
+        && parse_val(token0, token1, "NAME", action_flags,
+                     NAME_SET, 's', (char *) &moa->name))
     {
         if (!(   try_func_name(moa, "move", actor_move)
               || try_func_name(moa, "pick_up", actor_pick)
@@ -217,18 +218,18 @@ static uint8_t set_members(char * token0, char * token1, uint8_t * object_flags,
         *action_flags = *action_flags | NAME_SET;
         return 1;
     }
-    else if (   set_val(token0, token1, "NAME", object_flags,
-                        NAME_SET, 's', (char *) &mod->name)
-             || set_val(token0, token1, "SYMBOL", object_flags,
-                        SYMBOL_SET, 'c', (char *) &mod->char_on_map)
-             || set_val(token0, token1, "EFFORT", action_flags,
-                        EFFORT_SET, '8', (char *) &moa->effort)
-             || set_val(token0, token1, "LIFEPOINTS", object_flags,
-                        LIFEPOINTS_SET, '8', (char *) &mod->lifepoints)
-             || set_val(token0, token1, "CONSUMABLE", object_flags,
-                        CONSUMABLE_SET, '8', (char *) &mod->consumable)
-             || set_val(token0, token1, "CORPSE_ID", object_flags,
-                        CORPSE_ID_SET, '8', (char *) &mod->corpse_id))
+    else if (   parse_val(token0, token1, "NAME", object_flags,
+                          NAME_SET, 's', (char *) &mod->name)
+             || parse_val(token0, token1, "SYMBOL", object_flags,
+                          SYMBOL_SET, 'c', (char *) &mod->char_on_map)
+             || parse_val(token0, token1, "EFFORT", action_flags,
+                          EFFORT_SET, '8', (char *) &moa->effort)
+             || parse_val(token0, token1, "LIFEPOINTS", object_flags,
+                          LIFEPOINTS_SET, '8', (char *) &mod->lifepoints)
+             || parse_val(token0, token1, "CONSUMABLE", object_flags,
+                          CONSUMABLE_SET, '8', (char *) &mod->consumable)
+             || parse_val(token0, token1, "CORPSE_ID", object_flags,
+                          CORPSE_ID_SET, '8', (char *) &mod->corpse_id))
     {
         return 1;
     }