diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/cf-lex.l | 12 | ||||
| -rw-r--r-- | conf/conf.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l index 9ded49c5..49984f55 100644 --- a/conf/cf-lex.l +++ b/conf/cf-lex.l @@ -7,9 +7,9 @@ */ /** - * DOC: Lexical analyser + * DOC: Lexical analyzer * - * The lexical analyser used for configuration files and CLI commands + * The lexical analyzer used for configuration files and CLI commands * is generated using the |flex| tool accompanied with a couple of * functions maintaining the hash tables containing information about * symbols and keywords. @@ -341,7 +341,7 @@ cf_lex_init_kh(void) * cf_lex_init - initialize the lexer * @is_cli: true if we're going to parse CLI command, false for configuration * - * cf_lex_init() initializes the lexical analyser and prepares it for + * cf_lex_init() initializes the lexical analyzer and prepares it for * parsing of a new input. */ void @@ -448,7 +448,7 @@ cf_symbol_class_name(struct symbol *sym) /** * DOC: Parser * - * Both the configuration and CLI commands are analysed using a syntax + * Both the configuration and CLI commands are analyzed 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. @@ -460,7 +460,7 @@ cf_symbol_class_name(struct symbol *sym) * 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 + * for the grammar rules, |CF_CODE| for auxiliary C code and finally * |CF_END| at the end of the snippet. * * To create references between the snippets, it's possible to define @@ -468,7 +468,7 @@ cf_symbol_class_name(struct symbol *sym) * 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, + * the list of keywords determining the command, the list of parameters, * help text for the parameters and help text for the command. * * Values of |enum| filter types can be defined using |CF_ENUM| with diff --git a/conf/conf.c b/conf/conf.c index e2a003d3..232be3fd 100644 --- a/conf/conf.c +++ b/conf/conf.c @@ -12,7 +12,7 @@ * Configuration of BIRD is complex, but straightforward. There exist three * modules taking care of the configuration: config manager (which takes care * of storage of config information and controls switching between configs), - * lexical analyser and parser. + * lexical analyzer and parser. * * The configuration manager stores each config as a &config structure * accompanied by a linear pool from which all information associated @@ -32,7 +32,7 @@ * config by calling config_commit(). * * CLI commands are parsed in a very similar way -- there is also a stripped-down - * &config structure associated with them and they are lexed and parsed by the + * &config structure associated with them and they are lex-ed and parsed by the * same functions, only a special fake token is prepended before the command * text to make the parser recognize only the rules corresponding to CLI commands. */ @@ -91,10 +91,10 @@ config_alloc(byte *name) * config_parse() reads input by calling a hook function pointed to * by @cf_read_hook and parses it according to the configuration * grammar. It also calls all the preconfig and postconfig hooks - * before resp. after parsing. + * before, resp. after parsing. * * Result: 1 if the config has been parsed successfully, 0 if any - * error has occured (such as anybody calling cf_error()) and + * error has occurred (such as anybody calling cf_error()) and * the @err_msg field has been set to the error message. */ int |