/* -*-c-*-
*
- * $Id: conf.c,v 1.2 1999/07/26 23:28:39 mdw Exp $
+ * $Id: conf.c,v 1.9 2002/01/13 14:48:16 mdw Exp $
*
* Configuration parsing
*
/*----- Revision history --------------------------------------------------*
*
* $Log: conf.c,v $
+ * Revision 1.9 2002/01/13 14:48:16 mdw
+ * Make delimiters be a property of a scanner. Change the delimiter-
+ * changing functions' names.
+ *
+ * Revision 1.8 2001/02/03 20:33:26 mdw
+ * Fix flags to be unsigned.
+ *
+ * Revision 1.7 2000/08/01 17:58:10 mdw
+ * Fix subtleties with <ctype.h> functions.
+ *
+ * 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.
*
/*----- 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 };
/*----- Main code ---------------------------------------------------------*/
+/* --- @conf_undelim@ --- *
+ *
+ * Arguments: @scanner *sc@ = pointer to scanner definition
+ * @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 conf_undelim(scanner *sc, const char *d, const char *dd)
+{
+ sc->wbegin = d;
+ sc->wcont = dd;
+}
+
/* --- @token@ --- *
*
* Arguments: @scanner *sc@ = pointer to scanner definition
goto done;
}
- else if (isspace((unsigned char)ch))
+ else if (isspace(ch))
;
else switch (ch) {
/* --- Various self-delimiting characters --- */
case SELFDELIM:
- dstr_putc(&sc->d, ch);
- dstr_putz(&sc->d);
- sc->t = ch;
- goto done;
+ if (!sc->wbegin || strchr(sc->wbegin, ch) == 0) {
+ dstr_putc(&sc->d, ch);
+ dstr_putz(&sc->d);
+ sc->t = ch;
+ goto done;
+ }
/* --- Bare words --- *
*
q = !q;
break;
case SELFDELIM:
- if (q)
+ if (q || (sc->wcont && strchr(sc->wcont, ch)))
goto insert;
goto word;
default:
- if (!q && isspace((unsigned char)(ch)))
+ if (!q && isspace(ch))
goto word;
insert:
DPUTC(&sc->d, ch);
}
done:
-/* printf("token `%s'\n", sc->d.buf); */
return (sc->t);
}
* 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)
void conf_name(scanner *sc, char delim, dstr *d)
{
unsigned f = 0;
- enum {
- f_ok = 1,
- f_bra = 2
- };
+
+#define f_ok 1u
+#define f_bra 2u
/* --- Read an optional opening bracket --- */
if (sc->t == '[') {
token(sc);
- f |= f_bra;
+ f |= f_bra | f_ok;
}
/* --- Do the main reading sequence --- */
error(sc, "parse error, missing `]'");
}
DPUTZ(d);
+
+#undef f_ok
+#undef f_bra
}
/* --- @conf_parse@ --- *