Parse CLI commands. We use the same parser as for configuration files (because

we want to allow filter and similar complex constructs to be used in commands
and we should avoid code duplication), only with CLI_MARKER token prepended
before the whole input.

Defined macro CF_CLI(cmd, args, help) for defining CLI commands in .Y files.
The first argument specifies the command itself, the remaining two arguments
are copied to the help file (er, will be copied after the help file starts
to exist). This macro automatically creates a skeleton rule for the command,
you only need to append arguments as in:

	CF_CLI(STEAL MONEY, <$>, [[Steal <$> US dollars or equivalent in any other currency]]): NUM {
		cli_msg(0, "%d$ stolen", $3);
	} ;

Also don't forget to reset lexer state between inputs.

1 files changed, 2 insertions, 2 deletions

diff --git a/conf/conf.h b/conf/conf.h
index 4f6f030..d62f138 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -30,13 +30,13 @@ extern struct config *config, *new_config;
 
 struct config *config_alloc(byte *name);
 int config_parse(struct config *);
+int cli_parse(struct config *);
 void config_free(struct config *);
 void config_commit(struct config *);
 void cf_error(char *msg, ...) NORET;
 
 /* Pools */
 
-extern pool *cfg_pool;
 extern linpool *cfg_mem;
 
 #define cfg_alloc(size) lp_alloc(cfg_mem, size)
@@ -71,7 +71,7 @@ extern int conf_lino;
 
 void cf_lex_init_tables(void);
 int cf_lex(void);
-void cf_lex_init(int flag);
+void cf_lex_init(int is_cli);
 struct symbol *cf_find_symbol(byte *c);
 struct symbol *cf_default_name(char *prefix, int *counter);
 void cf_define_symbol(struct symbol *symbol, int type, void *def);