Changeset 3471

Timestamp:

08/09/07 18:28:02 (1 year ago)

Author:

tg

Message:

work on lookup stuff; next: unbreak varexpand...

Files:

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

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

@@ -19 +19 @@
-
-enum parser_kwtype {
+        KWT_INVALID,
-        KWT_NORMAL,
-        KWT_MULTI,
@@ -64 +65 @@
-void parser_free(struct parser_result *);
-EXTERN char *parser_errpfx I__(NULL);
+/* 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 *);
-__END_DECLS
-

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

@@ -215 +215 @@
-        entry_multi = NULL;
-        entry_iter = 0;
+        entry_type = KWT_INVALID;
-        for (kwp = kws; kwp->kwprefix != NULL; ++kwp) {
-                char *np;
@@ -272 +273 @@
-        bzero(entry, sizeof (struct parser_res));
-        entry->keyword = kwp->kwnum;
-
+
+
-        entry->kw_multi = entry_multi;
-        entry->kw_iter = entry_iter;

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

@@ -186 +186 @@
-                if (!ch)
-                        continue;
-to
-
+past
+ - 1
-                /* read variable name */
-                if (*++cp != '{' /*}*/)
@@ -208 +208 @@
- copy_rest:
-                dp = str_add(dp, cp);
+                D(2, "do_varexpand: '%s' -> '%s'\n", entry->value, dp);
-                free(entry->value);
-                entry->value = dp;
@@ -231 +232 @@
-        }
-}
+
+struct parser_res *
+parse_lookup(struct parser_result *head, struct parser_res *sample)
+{
+        struct parser_res *rv;
+        const struct parser_keywords *kw;
+        char *name, *tmp;
+
+        if (head == NULL || sample == NULL)
+                return (NULL);
+        if ((kw = parser_getkwbynum(sample->keyword, kwords)) == 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);
+        return (rv);
+}
+
+char *
+varnameck(const char *func, const char *ivar)
+{
+        char *ovar, *cp;
+
+        /* make “ivar” upper-case and validate */
+        cp = ovar = str_save(ivar);
+        if (*cp >= '0' && *cp <= '9')
+                errx(1, "%s: variable name '%s' must not begin with a digit!",
+                    func, ivar);
+        while (*cp) {
+                if (*cp >= 'a' && *cp <= 'z')
+                        *cp = *cp - 0x20;
+                else if ((*cp < 'A' || *cp > 'Z') && *cp != '_' &&
+                    (*cp < '0' || *cp > '9'))
+                        errx(1, "%s: variable name '%s' contains invalid"
+                            " char %02X!", func, ivar, (uint8_t)(*cp));
+                ++cp;
+        }
+        return (ovar);
+}
+
+struct parser_res *
+parse_lookupbyname(struct parser_result *head, const char *name)
+{
+        struct parser_res *entry;
+        const struct parser_keywords *kw;
+        char *iname, *ename, *cp;
+        bool found = false;
+
+        if (head == NULL || name == NULL || *name == '\0')
+                return (NULL);
+
+        iname = varnameck(__func__, name);
+
+        CIRCLEQ_FOREACH(entry, head, e) {
+                if ((kw = parser_getkwbynum(entry->keyword, kwords)) == NULL)
+                        continue;
+                /* recreate varname */
+                ename = str_save(kw->kwprefix);
+                if (entry->itype == KWT_ITERATED ||
+                    entry->itype == KWT_MULTITER) {
+                        ename = str_add(ename, "_");
+                        ename = str_add(ename,
+                            cp = xasprintf("%u", entry->kw_iter));
+                        free(cp);
+                }
+                if (entry->itype == KWT_MULTI ||
+                    entry->itype == KWT_MULTITER) {
+                        ename = str_add(ename, "_");
+                        ename = str_add(ename, entry->kw_multi);
+                }
+                /* upper-case, normalise */
+                ename = varnameck(__func__, cp = ename);
+                free(cp);
+                if (!strcmp(iname, ename))
+                        found = true;
+                free(ename);
+                if (found)
+                        break;
+        }
+        free(iname);
+        return (found ? entry : NULL);
+}

branches/common-nfo/tools/sqlite/nfohelpr.h

@@ -125 +125 @@
-})
-
+#define xasprintf(fmt, ...) ({                          \
+        char *xasprintf_ptr;                            \
+                                                        \
+        if (asprintf(&xasprintf_ptr, (fmt),             \
+            ##__VA_ARGS__) < 0)                         \
+                xasprintf_ptr = NULL;                   \
+        if (xasprintf_ptr == NULL)                      \
+                err(255, "cannot asprintf");            \
+        (xasprintf_ptr);                                \
+})
+
-#endif