X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fcommand.h;h=32cb3c2ed06c3172cbac76c33f0e4003d37f8afe;hb=8019f5ebb77a3b010ff63b14ba69d70810b040fb;hp=cca9f8391c21038c3e6338bebb8997bf058a98b3;hpb=244ade48f9c233532cc535d3233fdef53bf9266b;p=pspp diff --git a/src/language/command.h b/src/language/command.h index cca9f8391c..32cb3c2ed0 100644 --- a/src/language/command.h +++ b/src/language/command.h @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. - Written by Ben Pfaff . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -33,8 +32,8 @@ enum cmd_result /* Range of successful return values available for use by agreement between a command and the caller of cmd_parse(). */ - CMD_PRIVATE_FIRST = 4, - CMD_PRIVATE_LAST = 127, + CMD_PRIVATE_FIRST = 4, + CMD_PRIVATE_LAST = 127, /* Various kinds of failures. */ CMD_FAILURE = -1, /* Not executed at all. */ @@ -55,7 +54,12 @@ enum cmd_state }; struct dataset; -enum cmd_result cmd_parse (struct dataset *ds, enum cmd_state); +struct lexer; + +enum cmd_result cmd_parse_in_state (struct lexer *lexer, struct dataset *ds, + enum cmd_state); + +enum cmd_result cmd_parse (struct lexer *lexer, struct dataset *ds); struct command; const char *cmd_complete (const char *, const struct command **); @@ -63,7 +67,7 @@ const char *cmd_complete (const char *, const struct command **); struct dataset; /* Prototype all the command functions. */ -#define DEF_CMD(STATES, FLAGS, NAME, FUNCTION) int FUNCTION (struct dataset *); +#define DEF_CMD(STATES, FLAGS, NAME, FUNCTION) int FUNCTION (struct lexer *, struct dataset *); #define UNIMPL_CMD(NAME, DESCRIPTION) #include "command.def" #undef DEF_CMD