Changeset 3487

Timestamp:

08/13/07 16:55:59 (1 year ago)

Author:

tg

Message:

add some more helpers for important tasks

Files:

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

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

@@ -65 +65 @@
-void parser_free(struct parser_result *);
-EXTERN char *parser_errpfx I__(NULL);
+struct parser_res *parser_new(parser_kwords, enum parser_kwtype,
+    char *, unsigned, char *);
-/* pfile.c */
-struct parser_res *parse_lookupbyname(struct parser_result *, const char *);
-struct parser_res *parse_lookup(struct parser_result *, struct parser_res *);
-char *varnameck(const char *, const char *);
+char *parse_fmt(parser_kwords, enum parser_kwtype, char *, unsigned, int);
-__END_DECLS
-

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

@@ -270 +270 @@
-        if (kwp->kwprefix == NULL)
-                errx(1, "unknown keyword '%s'", cp);
-
-
-
-
+
-                syntaxerr("internal error: invalid entry type");
-
-
-
+
+
-        CIRCLEQ_INSERT_TAIL(res, entry, e);
-        free(cp);
@@ -386 +382 @@
-        va_end(args);
-}
+
+struct parser_res *
+parser_new(parser_kwords entry_kw, enum parser_kwtype entry_type,
+    char *entry_multi, unsigned entry_iter, char *value)
+{
+        struct parser_res *entry;
+
+        entry = xmalloc(sizeof (struct parser_res));
+        bzero(entry, sizeof (struct parser_res));
+        entry->keyword = entry_kw;
+        entry->itype = entry_type;
+        entry->kw_multi = entry_multi;
+        entry->kw_iter = entry_iter;
+        entry->value = value;
+        return (entry);
+}

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

@@ -252 +252 @@
-{
-        struct parser_res *rv;
-
-
+
-
-        if (head == NULL || sample == NULL)
-                return (NULL);
-
+
+
-                return (NULL);
-        name = str_save(kw->kwprefix);
-        switch (kw->kwtype) {
-        case KWT_NORMAL:
-                /* no additions */
-                break;
-        case KWT_MULTI:
-                name = str_add(name, "_");
-                name = str_add(name, sample->kw_multi);
-                break;
-        case KWT_ITERATED:
-                name = str_add(name, "_");
-                name = str_add(name, tmp = xasprintf("%u", sample->kw_iter));
-                free(tmp);
-                break;
-        case KWT_MULTITER:
-        case KWT_MULTITOP:
-                name = str_add(name, "_");
-                name = str_add(name, tmp = xasprintf("%u", sample->kw_iter));
-                free(tmp);
-                name = str_add(name, "_");
-                name = str_add(name, sample->kw_multi);
-                break;
-        default:
-                abort();
-        }
-        rv = parse_lookupbyname(head, name);
-        free(name);
@@ -315 +290 @@
-{
-        struct parser_res *entry;
-        const struct parser_keywords *kw;
-        char *iname, *ename, *cp;
-        bool found = false;
@@ -327 +301 @@
-
-        CIRCLEQ_FOREACH(entry, head, e) {
-                if ((kw = parser_getkwbynum(entry->keyword, kwords)) == NULL)
-                        continue;
-                /* recreate varname */
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                /* upper-case, normalise */
-                ename = varnameck(__func__, cp = ename);
@@ -357 +319 @@
-        return (found ? entry : NULL);
-}
+
+char *
+parse_fmt(parser_kwords kw, enum parser_kwtype kt, char *km, unsigned ki, int u)
+{
+        char buf[64], *res;
+        const struct parser_keywords *kwp;
+
+        if (kt == KWT_INVALID)
+                return (NULL);
+        if ((kwp = parser_getkwbynum(kw, kwords)) == NULL) {
+                if (!u)
+                        return (NULL);
+                snprintf(buf, sizeof (buf), "<unknown:%u>", (int)kw);
+                res = str_save(buf);
+        } else
+                res = str_save(kwp->kwprefix);
+        if (kt == KWT_NORMAL)
+                return (res);
+        if (kt == KWT_MULTITOP)
+                kt = KWT_MULTITER;
+        if (kt == KWT_ITERATED || kt == KWT_MULTITER) {
+                snprintf(buf, sizeof (buf), "_%u", ki);
+                res = str_add(res, buf);
+        }
+        if (kt == KWT_MULTI || kt == KWT_MULTITER) {
+                buf[0] = '_';
+                strlcpy(buf + 1, km, sizeof (buf) - 1);
+                res = str_add(res, buf);
+        }
+        if (kt == KWT_MULTI || kt == KWT_ITERATED || kt == KWT_MULTITER)
+                return (res);
+        /* invalid KWT */
+        free(res);
+        return (NULL);
+}