From bc2fb68098faaf09393437a7743285d2af71d102 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sun, 31 Oct 1999 17:47:47 +0000 Subject: 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. --- conf/confbase.Y | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'conf/confbase.Y') diff --git a/conf/confbase.Y b/conf/confbase.Y index b266d25..4a94287 100644 --- a/conf/confbase.Y +++ b/conf/confbase.Y @@ -16,8 +16,11 @@ CF_HDR #include "nest/protocol.h" #include "nest/iface.h" #include "nest/route.h" +#include "nest/cli.h" #include "filter/filter.h" +#define cli_msg(x...) cli_printf(this_cli, x) + CF_DECLS %union { @@ -34,7 +37,7 @@ CF_DECLS struct password_item *p; } -%token END +%token END CLI_MARKER %token NUM %token RTRID %token IPA @@ -54,9 +57,8 @@ CF_GRAMMAR /* Basic config file structure */ -config: conf_entries END { - return 0; - } +config: conf_entries END { return 0; } + | CLI_MARKER cli_cmd END { return 0; } ; conf_entries: -- cgit v1.2.3