Use the script parser for names files instead of custom parsing. This allows names files to define labels as other labels.

git-svn-id: https://svn.eduke32.com/eduke32@5414 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/eduke32/build/src/build.c

@@ -241,7 +241,7 @@ static void printcoords16(int32_t posxe, int32_t posye, int16_t ange);
 static void overheadeditor(void);
 static int32_t getlinehighlight(int32_t xplc, int32_t yplc, int32_t line, int8_t ignore_pointhighlight);
 static int32_t movewalls(int32_t start, int32_t offs);
-static int32_t loadnames(const char *namesfile, int8_t root);
+static void loadnames(const char *namesfile);
 static void getclosestpointonwall(int32_t x, int32_t y, int32_t dawall, int32_t *nx, int32_t *ny,
                                   int32_t maybe_screen_coord_p);
 static void initcrc(void);
@@ -663,7 +663,7 @@ int32_t app_main(int32_t argc, const char **argv)
 
     if (CallExtPostStartupWindow() < 0) return -1;
 
-    loadnames(g_namesFileName, 1);
+    loadnames(g_namesFileName);
 
     if (initinput()) return -1;
 
@@ -10162,196 +10162,132 @@ static int16_t whitelinescan(int16_t sucksect, int16_t dalinehighlight)
     return (clockdir(numwalls) == CLOCKDIR_CCW) ? -1 : tnewnumwalls;
 }
 
-int32_t loadnames(const char *namesfile, int8_t root)
+//
+// names.h loading
+//
+
+enum {
+    T_INCLUDE = 0,
+    T_DEFINE = 1,
+
+    T_DUMMY,
+};
+
+static int32_t parsenamesfile(scriptfile *script)
 {
-    char buffer[1024], *p, *name, *number, *endptr;
+    int32_t syms;
-    static int32_t syms=0;
-    int32_t num, line=0, a, comment=0;
-    int8_t quotes=0, anglebrackets=0;
-    BFILE *fp;
 
-    Bstrncpyz(buffer, namesfile, sizeof(buffer));
+    tokenlist const tokens[] =
+    {
+        { "include",         T_INCLUDE          },
+        { "#include",        T_INCLUDE          },
+        { "define",          T_DEFINE           },
+        { "#define",         T_DEFINE           },
 
-    fp = fopenfrompath(buffer,"r");
+        { "dynamicremap",    T_DUMMY            },
-    if (!fp)
+    };
+
+    while (1)
     {
-        p = buffer;
+        int32_t tokn = getatoken(script,tokens,ARRAY_SIZE(tokens));
-        while (*p)
+        char *cmdtokptr = script->ltextptr;
+        switch (tokn)
         {
-            *p = Btolower(*p);
+        case T_INCLUDE:
-            p++;
+        {
+            char *fn;
+            if (scriptfile_getstring(script,&fn))
+            {
+                initprintf("Error: Malformed include on line %s:%d\n",
+                           script->filename,scriptfile_getlinum(script,cmdtokptr));
+                break;
             }
 
-        if ((fp = fopenfrompath(buffer,"r")) == NULL)
+            scriptfile *included;
+
+            included = scriptfile_fromfile(fn);
+            if (!included)
             {
-            initprintf("Failed to open %s\n", buffer);
+                initprintf("Error: Failed including %s on line %s:%d\n",
-            return -1;
+                           fn, script->filename,scriptfile_getlinum(script,cmdtokptr));
-        }
+                break;
             }
 
-    if (root)
+            initprintf("Including: %s\n", fn);
-        //clearbufbyte(names, sizeof(names), 0);
-        Bmemset(names,0,sizeof(names));
 
-    initprintf("Loading %s\n", buffer);
+            syms += parsenamesfile(included);
+            scriptfile_close(included);
 
-    while (Bfgets(buffer, 1024, fp))
+            break;
+        }
+        case T_DEFINE:
         {
-        a = Bstrlen(buffer);
+            char *name;
-        if (a >= 1)
+            int32_t number;
+
+            if (scriptfile_getstring(script,&name))
             {
-            if (a > 1)
+                initprintf("Error: Malformed define on line %s:%d\n",
-                if (buffer[a-2] == '\r') buffer[a-2] = 0;
+                           script->filename, scriptfile_getlinum(script,cmdtokptr));
-            if (buffer[a-1] == '\n') buffer[a-1] = 0;
+                break;
             }
 
-        p = buffer;
+            if (scriptfile_getsymbol(script,&number))
-        line++;
-        while (*p == 32) p++; // 32 == 0x20 == space
-        if (*p == 0) continue; // blank line
-
-        if (*p == '#') // make '#' optional for compatibility
-            p++;
-
-        if (*p == '/')
             {
-            if (*(p+1) == '/') continue; // comment
+                initprintf("Error: No number given for name \"%s\" on line %s:%d\n",
-            if (*(p+1) == '*') {comment++; continue;} /* comment */
+                           name, script->filename, scriptfile_getlinum(script,cmdtokptr));
-        }
+                break;
-        else if (*p == '*' && p[1] == '/')
-        {
-            comment--;
-            continue;
-        }
-        else if (comment)
-            continue;
-        else if (!comment)
-        {
-            while (*p == 32) p++;
-            if (*p == 0) continue; // null directive
-
-            if (!Bstrncmp(p, "define ", 7))
-            {
-                // #define_...
-                p += 7;
-                while (*p == 32) p++;
-                if (*p == 0)
-                {
-                    initprintf("Error: Malformed #define at line %d\n", line-1);
-                    continue;
             }
 
-                name = p;
+            if ((unsigned)number >= MAXTILES)
-                while (*p != 32 && *p != 0) p++;
-                if (*p == 32)
             {
-                    *(p++) = 0;
+                initprintf("Error: Constant %d for name \"%s\" out of range on line %s:%d\n",
-                    while (*p == 32) p++;
+                           number, name, script->filename, scriptfile_getlinum(script,cmdtokptr));
-                    if (*p == 0)  	// #define_NAME with no number
+                break;
-                    {
-                        initprintf("Error: No number given for name \"%s\" (line %d)\n", name, line-1);
-                        continue;
-                    }
-
-                    number = p;
-                    while (*p != 0 && *p != 32) p++;
-                    *p = 0;
-
-                    // add to list
-                    num = Bstrtol(number, &endptr, 10);
-                    if (*endptr != 0)
-                    {
-                        p = endptr;
-                        goto badline;
-                    }
-                    //printf("Grokked \"%s\" -> \"%d\"\n", name, num);
-                    if (num < 0 || num >= MAXTILES)
-                    {
-                        initprintf("Error: Constant %d for name \"%s\" out of range (line %d)\n", num, name, line-1);
-                        continue;
             }
 
             if (Bstrlen(name) > 24)
-                        initprintf("Warning: Name \"%s\" longer than 24 characters (line %d). Truncating.\n", name, line-1);
+                initprintf("Warning: Truncating name \"%s\" to 24 characters on line %s:%d\n",
+                           name, script->filename, scriptfile_getlinum(script,cmdtokptr));
 
-                    Bstrncpyz(names[num], name, 25);
+            Bstrncpyz(names[number], name, 25);
+            name = names[number];
 
-                    syms++;
+            ++syms;
 
-                    continue;
+            if (scriptfile_addsymbolvalue(name,number) < 0)
+                initprintf("Warning: Symbol %s was NOT redefined to %d on line %s:%d\n",
+                           name, number, script->filename, scriptfile_getlinum(script,cmdtokptr));
+            break;
         }
-                else  	// #define_NAME with no number
+        case T_EOF:
-                {
+            return syms;
-                    initprintf("Error: No number given for name \"%s\" (line %d)\n", name, line-1);
+        default:
-                    continue;
+            break;
         }
     }
-            else if (!Bstrncmp(p, "include ", 8))
-            {
-                // #include_...
-                p += 8;
-                while (*p == 32) p++;
-                if (*p == 0)
-                {
-                    initprintf("Error: Malformed #include at line %d\n", line-1);
-                    continue;
-                }
 
-                if (*p == '\"')
+    return syms;
-                    {
+}
-                    quotes = 1;
-                    p++;
-                    }
-                else if (*p == '<')
-                    {
-                    anglebrackets = 1;
-                    p++;
-                    }
 
-                name = p;
+static void loadnames(const char *namesfile)
-                if (quotes == 1)
+{
-                    {
+    scriptfile *script = scriptfile_fromfile(namesfile);
-                        while (*p != '\"' && *p != 0) p++;
-                        quotes = 0;
-                        if (*p == 0)
-                        {
-                            initprintf("Error: Missing \'\"\' in #include at line %d\n", line-1);
-                            continue;
-                        }
-                        *p = 0;
-                    }
-                else if (anglebrackets == 1)
-                    {
-                        while (*p != '>' && *p != 0) p++;
-                        anglebrackets = 0;
-                        if (*p == 0)
-                        {
-                            initprintf("Error: Missing \'>\' in #include at line %d\n", line-1);
-                            continue;
-                        }
-                        *p = 0;
-                    }
-                else
-                    {
-                    while (*p != 32 && *p != 0) p++;
-                    *p = 0;
-                    }
 
-                loadnames(name, 0);
+    if (!script)
+        return;
 
-                continue;
+    initprintf("Loading names file: %s\n", namesfile);
-            }
+
-        }
+    int32_t const syms = parsenamesfile(script);
-badline:
-        initprintf("Error: Invalid statement found at character %d on line %d\n", (int32_t)(p-buffer), line-1);
-    }
-    if (root)
     initprintf("Loaded %d names.\n", syms);
 
-    Bfclose(fp);
+    scriptfile_close(script);
-    return 0;
+
+    scriptfile_clearsymbols();
 }
 
+
 void printcoords16(int32_t posxe, int32_t posye, int16_t ange)
 {
     char snotbuf[128];

polymer/eduke32/source/astub.c

@@ -9136,6 +9136,8 @@ enum
 
     T_RENAMEFILE,
     T_GLOBALGAMEFLAGS,
+
+    T_DUMMY,
 };
 
 static int32_t parsegroupfiles(scriptfile *script);
@@ -9280,6 +9282,9 @@ int32_t parsetilegroups(scriptfile *script)
         { "#include",        T_INCLUDE          },
         { "define",          T_DEFINE           },
         { "#define",         T_DEFINE           },
+
+        { "dynamicremap",    T_DUMMY            },
+
         { "tilegroup",       T_TILEGROUP        },
         { "spritehotkey",    T_HOTKEY           },
         { "alphabet",        T_ALPHABET         },