Moved parser docs to cf-lex.l, so that the parser compiles.

diff --git a/conf/Doc b/conf/Doc
index 5473badb54fd8fcf41cb2d827e33b26c0c7df80f..fe09b64d854018858fc895ed7a0b1f76cc3dc8d5 100644 (file)
--- a/conf/Doc
+++ b/conf/Doc
@@ -1,4 +1,3 @@
 H Configuration
 S conf.c
 S cf-lex.l
-S confbase.Y

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index e7cb2c8a360a0a0e96b46574228ad3ac10e8ef9e..8f8fcfbdebf741b30a295ee5877f6a378b488c72 100644 (file)
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -424,3 +424,35 @@ cf_symbol_class_name(struct symbol *sym)
       return "unknown type";
     }
 }
+
+
+/**
+ * DOC: Parser
+ *
+ * Both the configuration and CLI commands are analysed using a syntax
+ * driven parser generated by the |bison| tool from a grammar which
+ * is constructed from information gathered from grammar snippets by
+ * the |gen_parser.m4| script.
+ *
+ * Grammar snippets are files (usually with extension |.Y|) contributed
+ * by various BIRD modules to provide information about syntax of their
+ * configuration and their CLI commands. Each snipped consists of several
+ * section, each of them starting with a special keyword: |CF_HDR| for
+ * a list of |#include| directives needed by the C code, |CF_DEFINES|
+ * for a list of C declarations, |CF_DECLS| for |bison| declarations
+ * including keyword definitions specified as |CF_KEYWORDS|, |CF_GRAMMAR|
+ * for the grammar rules, |CF_CODE| for auxillary C code and finally
+ * |CF_END| at the end of the snippet.
+ *
+ * To create references between the snippets, it's possible to define
+ * multi-part rules by utilizing the |CF_ADDTO| macro which adds a new
+ * alternative to a multi-part rule.
+ *
+ * CLI commands are defined using a |CF_CLI| macro. Its parameters are:
+ * the list of keywords determining the command, the list of paramaters,
+ * help text for the parameters and help text for the command.
+ *
+ * Values of |enum| filter types can be defined using |CF_ENUM| with
+ * the following parameters: name of filter type, prefix common for all
+ * literals of this type, names of all the possible values.
+ */

diff --git a/conf/confbase.Y b/conf/confbase.Y
index 1b18a97991b262dd62265350e3496b9d89f9380a..5da84b1e6a949ffd72cff5920e8d66591b84f8a8 100644 (file)
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -6,37 +6,6 @@
  *     Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-/**
- * DOC: Parser
- *
- * Both the configuration and CLI commands are analysed using a syntax
- * driven parser generated by the |bison| tool from a grammar which
- * is constructed from information gathered from grammar snippets by
- * the |gen_parser.m4| script.
- *
- * Grammar snippets are files (usually with extension |.Y|) contributed
- * by various BIRD modules to provide information about syntax of their
- * configuration and their CLI commands. Each snipped consists of several
- * section, each of them starting with a special keyword: |CF_HDR| for
- * a list of |#include| directives needed by the C code, |CF_DEFINES|
- * for a list of C declarations, |CF_DECLS| for |bison| declarations
- * including keyword definitions specified as |CF_KEYWORDS|, |CF_GRAMMAR|
- * for the grammar rules, |CF_CODE| for auxillary C code and finally
- * |CF_END| at the end of the snippet.
- *
- * To create references between the snippets, it's possible to define
- * multi-part rules by utilizing the |CF_ADDTO| macro which adds a new
- * alternative to a multi-part rule.
- *
- * CLI commands are defined using a |CF_CLI| macro. Its parameters are:
- * the list of keywords determining the command, the list of paramaters,
- * help text for the parameters and help text for the command.
- *
- * Values of |enum| filter types can be defined using |CF_ENUM| with
- * the following parameters: name of filter type, prefix common for all
- * literals of this type, names of all the possible values.
- */
-
 CF_HDR
 
 #include "nest/bird.h"