Version bump.

[fwd] / conf.h

diff --git a/conf.h b/conf.h
index 5b78b13..f9e25e9 100644 (file)
--- a/conf.h
+++ b/conf.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: conf.h,v 1.5 1999/10/22 22:46:44 mdw Exp $
+ * $Id: conf.h,v 1.7 2002/02/22 23:42:56 mdw Exp $
  *
  * Configuration parsing
  *
@@ -29,6 +29,14 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: conf.h,v $
+ * Revision 1.7  2002/02/22 23:42:56  mdw
+ * `fw'-specific configuration code moved out.  This file might become part
+ * of a library some day.
+ *
+ * Revision 1.6  2002/01/13 14:48:16  mdw
+ * Make delimiters be a property of a scanner.  Change the delimiter-
+ * changing functions' names.
+ *
  * Revision 1.5  1999/10/22 22:46:44  mdw
  * Improve documentation for conf_enum.
  *
@@ -70,9 +78,10 @@
 
 /*----- Functions provided ------------------------------------------------*/
 
-/* --- @undelim@ --- *
+/* --- @conf_undelim@ --- *
  *
- * Arguments:  @const char *d, dd@ = pointer to characters to escape
+ * Arguments:  @scanner *sc@ = pointer to scanner definition
+ *             @const char *d, *dd@ = pointer to characters to escape
  *
  * Returns:    ---
  *
@@ -81,7 +90,8 @@
  *             second list will always be allowed to continue a word.
  */
 
-extern void undelim(const char */*d*/, const char */*dd*/);
+extern void conf_undelim(scanner */*sc*/,
+                        const char */*d*/, const char */*dd*/);
 
 /* --- @token@ --- *
  *
@@ -107,6 +117,18 @@ extern int token(scanner */*sc*/);
 
 extern void error(scanner */*sc*/, const char */*msg*/, ...);
 
+/* --- @pushback@ --- *
+ *
+ * Arguments:  @scanner *sc@ = pointer to scanner definition
+ *
+ * Returns:    ---
+ *
+ * Use:                Pushes the current token back.  This is normally a precursor
+ *             to pushing a new scanner source.
+ */
+
+extern void pushback(scanner */*sc*/);
+
 /* --- @conf_enum@ --- *
  *
  * Arguments:  @scanner *sc@ = pointer to a scanner object
@@ -285,17 +307,6 @@ extern int conf_prefix(scanner */*sc*/, const char */*p*/);
 
 extern void conf_name(scanner */*sc*/, char /*delim*/, dstr */*d*/);
 
-/* --- @conf_parse@ --- *
- *
- * Arguments:  @scanner *sc@ = pointer to a scanner structure
- *
- * Returns:    ---
- *
- * Use:                Parses a configuration file fragment from the scanner
- */
-
-extern void conf_parse(scanner *sc);
-
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus