tests.at: Wrap an overly long comment line.

[runlisp] / lib.c

diff --git a/lib.c b/lib.c
index 4eadf7048b732219756d8bd6fcee71bb9a065cf4..d369e7d77e6c43708d30f83aa8a520d723d3c17c 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -953,9 +953,9 @@ static void set_config_section_parents(struct config *conf,
  * Inheritance cycles and ambiguous inheritance are diagnosed as fatal
  * errors.
  */
-struct config_var *search_recursive(struct config *conf,
-                                   struct config_section *sect,
-                                   const char *name, size_t sz)
+static struct config_var *search_recursive(struct config *conf,
+                                          struct config_section *sect,
+                                          const char *name, size_t sz)
 {
   struct config_cache_entry *cache;
   struct treap_path path;
@@ -1251,7 +1251,7 @@ void config_read_env(struct config *conf, struct config_section *sect)
  *
  * This only keeps track of the immutable parameters for the substitution
  * task: stuff which changes (flags, filtering state, cursor position) is
- *      maintained separately.
+ * maintained separately.
  */
 struct subst {
   struct config *config;               /* configuration state */
@@ -1336,8 +1336,9 @@ static void filter_string(const char *p, const char *l,
 
 /* Scan and resolve a `[SECT:]VAR' specifier at P.
  *
- * Return the address of the next character following the specifier.  L is a
- * limit on the region of the buffer that we should process; SB is the
+ * Return the address of the next character following the specifier; and set
+ * *VAR_OUT to point to the variable we found, or null if it's not there.  L
+ * is a limit on the region of the buffer that we should process; SB is the
  * substitution state which provides the home section if none is given
  * explicitly; FILE and LINE are the source location to blame for problems.
  */
@@ -1383,7 +1384,8 @@ static const char *subst(const char *p, const char *l,
    * us which special characters we need to stop at.  This way, we can use
    * `strcspn' to skip over literal text and stop at the next character which
    * needs special handling.  Entries in this table with a null pointer
-   * correspond to impossible flag settings.
+   * correspond to impossible flag settings: notably, `SF_QUOT' can only be
+   * set when `SF_SUBST' is also set.
    */
   static const char *const delimtab[] = {
 
@@ -1395,26 +1397,27 @@ static const char *subst(const char *p, const char *l,
                                         * `SF_QUOT' */
 #define DELIM "|}"                     /* end delimiters of `SF_SUBEXPR' */
 
-    ESCAPE,
-    ESCAPE            WORDSEP,
-    0,
-    ESCAPE            QUOT,
-    ESCAPE      SUBST,
-    ESCAPE      SUBST WORDSEP,
-    0,
-    ESCAPE      SUBST QUOT,
-    ESCAPE DELIM,
-    ESCAPE DELIM       WORDSEP,
-    0,
-    ESCAPE DELIM       QUOT,
-    ESCAPE DELIM SUBST,
-    ESCAPE DELIM SUBST WORDSEP,
-    0,
-    ESCAPE DELIM SUBST QUOT
-
-#undef COMMON
+    ESCAPE,                            /* --- */
+    ESCAPE            WORDSEP,         /* SPLIT */
+    0,                                 /*         QUOT */
+    ESCAPE            QUOT,            /* SPLIT | QUOT */
+    ESCAPE      SUBST,                 /*                SUBST */
+    ESCAPE      SUBST WORDSEP,         /* SPLIT |        SUBST */
+    0,                                 /*         QUOT | SUBST */
+    ESCAPE      SUBST QUOT,            /* SPLIT | QUOT | SUBST */
+    ESCAPE DELIM,                      /*                        SUBEXPR */
+    ESCAPE DELIM       WORDSEP,                /* SPLIT |                SUBEXPR */
+    0,                                 /*         QUOT |         SUBEXPR */
+    ESCAPE DELIM       QUOT,           /* SPLIT | QUOT |         SUBEXPR */
+    ESCAPE DELIM SUBST,                        /*                SUBST | SUBEXPR */
+    ESCAPE DELIM SUBST WORDSEP,                /* SPLIT |        SUBST | SUBEXPR */
+    0,                                 /*         QUOT | SUBST | SUBEXPR */
+    ESCAPE DELIM SUBST QUOT            /* SPLIT | QUOT | SUBST | SUBEXPR */
+
+#undef ESCAPE
+#undef SUBST
 #undef WORDSEP
-#undef SQUOT
+#undef QUOT
 #undef DELIM
   };
 
@@ -1455,12 +1458,12 @@ static const char *subst(const char *p, const char *l,
        * to it.
        */
 
-      /* If there's no next charact3er then we should be upset. */
+      /* If there's no next character then we should be upset. */
       p++; if (p >= l) lose("%s:%u: unfinished `\\' escape", file, line);
 
       if (!(f&SF_SKIP)) {
 
-       /* If this is a double quote or backslash then check DFLT to see if
+       /* If this is a double quote or backslash then check QFILT to see if
         * it needs escaping.
         */
        if (qfilt && (*p == '"' || *p == '\\'))
@@ -1587,13 +1590,13 @@ static const char *subst(const char *p, const char *l,
               * toothpick, so now we need Q + (Q + 1) = 2 Q + 1 toothpicks.
               *
               * Calculate this here rather than at each point toothpicks
-              * needs to be deployed.
+              * need to be deployed.
               */
 
              subqfilt = 2*subqfilt + 1;
 
            else if (t - p == 1 && *p == 'l')
-             /* `u' -- convert to uppercase.
+             /* `l' -- convert to lowercase.
               *
               * If a case conversion is already set, then that will override
               * whatever we do here, so don't bother.