Changeset 3461

Timestamp:

08/09/07 16:53:21 (1 year ago)

Author:

tg

Message:

• new keyword type MULTITOP = multi + optional iterator
• change a little in the data types to match spec and nfo draft
• fix a double free while here: str_[n]add() does realloc, no need to free

Files:

• branches/common-nfo/tools/nfotiser/nfotiser.h (modified) (1 diff)
• branches/common-nfo/tools/nfotiser/parser.c (modified) (5 diffs)
• branches/common-nfo/tools/nfotiser/pfile.c (modified) (3 diffs)

branches/common-nfo/tools/nfotiser/nfotiser.h

@@ -22 +22 @@
-        KWT_MULTI,
-        KWT_ITERATED,
-
+
+
-};
-

branches/common-nfo/tools/nfotiser/parser.c

@@ -82 +82 @@
- *   + \1 = keyword (toupper'd)
- *   + \2 = kw_iter (unsigned integer value)
+ *   + \3 = kw_multi (case preserving)
+ * - KWT_MULTITOP => ([A-Za-z_][A-Za-z0-9_]*)_(([0-9]*)_)?([A-Za-z0-9_]*)
+ *   + \1 = keyword (toupper'd)
+ *   + \2 = kw_iter (unsigned integer value), 0 if not set
- *   + \3 = kw_multi (case preserving)
- *
@@ -187 +191 @@
-        *tp = '\n';
-        tp = str_add(cp, t);
-        if (cp != NULL)
-                free(cp);
-        free(t);
-        cp = tp;
@@ -227 +229 @@
-                np = cp + n + 1;
-                if (kwp->kwtype == KWT_ITERATED ||
+                    (kwp->kwtype == KWT_MULTITOP &&
+                     (*np >= '0' && *np <= '9')) ||
-                    kwp->kwtype == KWT_MULTITER) {
-                        char *zp = np;
@@ -246 +250 @@
-                }
-                if (kwp->kwtype == KWT_MULTI ||
+                    kwp->kwtype == KWT_MULTITOP ||
-                    kwp->kwtype == KWT_MULTITER)
-                        entry_multi = str_save(np);
@@ -297 +302 @@
-            kwp->kwtype == KWT_MULTI ? "multi" :
-            kwp->kwtype == KWT_ITERATED ? "iterated" :
-
+
+
-        if (kwp) {
-                if (kwp->kwtype == KWT_ITERATED ||
+                    kwp->kwtype == KWT_MULTITOP ||
-                    kwp->kwtype == KWT_MULTITER)
-                        printf(", iterator %u", entry->kw_iter);
-                if (kwp->kwtype == KWT_MULTI ||
+                    kwp->kwtype == KWT_MULTITOP ||
-                    kwp->kwtype == KWT_MULTITER)
-                        printf(", multival '%s'", entry->kw_multi);

branches/common-nfo/tools/nfotiser/pfile.c

@@ -44 +44 @@
-        KA_DISTFILE,
-        KA_HASH,
-_SYM
+
-        KN_DISTFILES,
-        K_BDEPS,
@@ -99 +99 @@
-        { "GROUPS", K_GROUPS, KWT_NORMAL, ARGT_STRING },
-        { "HASHES", K_HASHES, KWT_NORMAL, ARGT_STRING },
-ER
+OP
-        { "HELPTEXT", K_HELP, KWT_MULTI, ARGT_STRING },
-        { "MASTER_SITES", K_SITES, KWT_ITERATED, ARGT_STRING },
@@ -111 +111 @@
-        { "PKGNAME", K_PKGNAME, KWT_NORMAL, ARGT_STRING },
-        { "RCCONF_SYMS", K_RCCONF_SYMS, KWT_NORMAL, ARGT_INTEGER },
-_SYM", KA_RCCONF_SYM
+", KA_RCCONF
-        { "URLS", K_URLS, KWT_NORMAL, ARGT_STRING },
-        { "USERS", K_USERS, KWT_NORMAL, ARGT_STRING },