Changeset 3470

Timestamp:

08/09/07 18:04:11 (1 year ago)

Author:

tg

Message:

track the _real_ entry type, for varname expansion:
• KWT_MULTI etc. with a short match become KWT_NORMAL
• KWT_MULTITOP becomes KWT_MULTI xor KWT_MULTITER

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/nfotiser.h

@@ -45 +45 @@
-        CIRCLEQ_ENTRY(parser_res) e;
-        parser_kwords keyword;
+        enum parser_kwtype itype;
-        char *kw_multi;
-        unsigned kw_iter;

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

@@ -105 +105 @@
-        char *entry_multi;
-        unsigned entry_iter;
+        enum parser_kwtype entry_type;
-
-        res = xmalloc(sizeof (struct parser_result));
@@ -218 +219 @@
-
-                /* exact match? */
-
-
+
+
+
+
+
-                /* prefix match allowed? */
-                if (kwp->kwtype == KWT_NORMAL)
@@ -230 +234 @@
-                /* okay, we got a prefix match, get args */
-                np = cp + n + 1;
+                entry_type = kwp->kwtype;
-                if (kwp->kwtype == KWT_ITERATED ||
-                    (kwp->kwtype == KWT_MULTITOP &&
@@ -250 +255 @@
-                        entry_iter = (unsigned)strtoul(np, NULL, 0);
-                        np = zp;
+                        if (kwp->kwtype == KWT_MULTITOP)
+                                entry_type = KWT_MULTITER;
-                }
+                if (kwp->kwtype == KWT_MULTITOP)
+                        entry_type = KWT_MULTI;
-                if (kwp->kwtype == KWT_MULTI ||
-                    kwp->kwtype == KWT_MULTITOP ||
@@ -263 +272 @@
-        bzero(entry, sizeof (struct parser_res));
-        entry->keyword = kwp->kwnum;
+        entry->itype = entry_type;
-        entry->kw_multi = entry_multi;
-        entry->kw_iter = entry_iter;