Use new mLib selbuf features.

[fwd] / conf.c

diff --git a/conf.c b/conf.c
index 020df7a..dfc3765 100644 (file)
--- a/conf.c
+++ b/conf.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: conf.c,v 1.2 1999/07/26 23:28:39 mdw Exp $
+ * $Id: conf.c,v 1.6 2000/02/12 18:13:20 mdw Exp $
  *
  * Configuration parsing
  *
@@ -29,6 +29,19 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: conf.c,v $
+ * Revision 1.6  2000/02/12 18:13:20  mdw
+ * Terminate tables of sources and targets.
+ *
+ * Revision 1.5  1999/10/22 22:46:44  mdw
+ * Improve documentation for conf_enum.
+ *
+ * Revision 1.4  1999/10/15 21:12:36  mdw
+ * Remove redundant debugging code.
+ *
+ * Revision 1.3  1999/08/19 18:32:48  mdw
+ * Improve lexical analysis.  In particular, `chmod' patterns don't have to
+ * be quoted any more.
+ *
  * Revision 1.2  1999/07/26 23:28:39  mdw
  * Major reconstruction work for new design.
  *
@@ -63,11 +76,29 @@
 
 /*----- Source and target tables ------------------------------------------*/
 
-static source_ops *sources[] = { &xsource_ops, &fsource_ops, &ssource_ops };
-static target_ops *targets[] = { &xtarget_ops, &ftarget_ops, &starget_ops };
+static source_ops *sources[] =
+  { &xsource_ops, &fsource_ops, &ssource_ops, 0 };
+static target_ops *targets[] =
+  { &xtarget_ops, &ftarget_ops, &starget_ops, 0 };
+
+static const char *notword = 0;
+static const char *notdelim = 0;
 
 /*----- Main code ---------------------------------------------------------*/
 
+/* --- @undelim@ --- *
+ *
+ * Arguments:  @const char *d, dd@ = pointer to characters to escape
+ *
+ * Returns:    ---
+ *
+ * Use:                Modifies the tokenizer.  Characters in the first list will
+ *             always be considered to begin a word.  Characters in the
+ *             second list will always be allowed to continue a word.
+ */
+
+void undelim(const char *d, const char *dd) { notword = d; notdelim = dd; }
+
 /* --- @token@ --- *
  *
  * Arguments:  @scanner *sc@ = pointer to scanner definition
@@ -122,10 +153,12 @@ int token(scanner *sc)
       /* --- Various self-delimiting characters --- */
 
       case SELFDELIM:
-       dstr_putc(&sc->d, ch);
-       dstr_putz(&sc->d);
-       sc->t = ch;
-       goto done;
+       if (!notword || strchr(notword, ch) == 0) {
+         dstr_putc(&sc->d, ch);
+         dstr_putz(&sc->d);
+         sc->t = ch;
+         goto done;
+       }
 
       /* --- Bare words --- *
        *
@@ -150,7 +183,7 @@ int token(scanner *sc)
              q = !q;
              break;
            case SELFDELIM:
-             if (q)
+             if (q || (notdelim && strchr(notdelim, ch)))
                goto insert;
              goto word;
            default:
@@ -172,7 +205,6 @@ int token(scanner *sc)
   }
 
 done:
-/*   printf("token `%s'\n", sc->d.buf); */
   return (sc->t);
 }
 
@@ -223,9 +255,15 @@ void error(scanner *sc, const char *msg, ...)
  * Returns:    Index into list, zero-based, or @-1@.
  *
  * Use:                Checks whether the current token is a string which matches
- *             one of the comma-separated items given.  If not, an error is
- *             reported; otherwise the index of the matched item is
- *             returned.
+ *             one of the comma-separated items given.  The return value is
+ *             the index (zero-based) of the matched string in the list.
+ *
+ *             The flags control the behaviour if no exact match is found.
+ *             If @ENUM_ABBREV@ is set, and the current token is a left
+ *             substring of exactly one of the possibilities, then that one
+ *             is chosen.  If @ENUM_NONE@ is set, the value @-1@ is
+ *             returned; otherwise an error is reported and the program is
+ *             terminated.
  */
 
 int conf_enum(scanner *sc, const char *list, unsigned f, const char *err)