From: Michael Stapelberg Date: Mon, 8 Oct 2012 11:25:32 +0000 (+0200) Subject: change the commands_parser prefix to 'command' for consistency X-Git-Tag: 4.4~70 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c2b699f3dc4fb9ff4dfb2c7409bc9d031aeddf71;p=i3%2Fi3 change the commands_parser prefix to 'command' for consistency --- diff --git a/src/commands_parser.c b/src/commands_parser.c index bbba2c44..1720fd6f 100644 --- a/src/commands_parser.c +++ b/src/commands_parser.c @@ -46,7 +46,7 @@ * input parser-specs/commands.spec. ******************************************************************************/ -#include "GENERATED_commands_enums.h" +#include "GENERATED_command_enums.h" typedef struct token { char *name; @@ -63,7 +63,7 @@ typedef struct tokenptr { int n; } cmdp_token_ptr; -#include "GENERATED_commands_tokens.h" +#include "GENERATED_command_tokens.h" /******************************************************************************* * The (small) stack where identified literals are stored during the parsing @@ -182,7 +182,7 @@ static Match current_match; static struct CommandResult subcommand_output; static struct CommandResult command_output; -#include "GENERATED_commands_call.h" +#include "GENERATED_command_call.h" static void next_state(const cmdp_token *token) { diff --git a/src/i3.mk b/src/i3.mk index fd4afdb7..d0ff1e88 100644 --- a/src/i3.mk +++ b/src/i3.mk @@ -63,7 +63,7 @@ src/config_parser.o: src/config_parser.c $(i3_HEADERS_DEP) i3-config-parser.stam i3-command-parser.stamp: generate-command-parser.pl parser-specs/commands.spec echo "[i3] Generating command parser" - (cd include; ../generate-command-parser.pl --input=../parser-specs/commands.spec --prefix=commands) + (cd include; ../generate-command-parser.pl --input=../parser-specs/commands.spec --prefix=command) touch $@ i3-config-parser.stamp: generate-command-parser.pl parser-specs/config.spec