Encapsulated lexer and updated calling functions accordingly.

[pspp-builds.git] / src / language / command.h

diff --git a/src/language/command.h b/src/language/command.h
index ec51f658689861494a1b94130d91825c73edac3c..e38707ddbe74257018f09083b22d649a8409150a 100644 (file)
--- a/src/language/command.h
+++ b/src/language/command.h
@@ -54,14 +54,18 @@ enum cmd_state
     CMD_STATE_FILE_TYPE         /* Inside FILE TYPE. */
   };
 
-#if HAVE_READLINE
-char **pspp_attempted_completion_function (const char *, int start, int end);
-#endif
+struct dataset;
+struct lexer; 
 
-enum cmd_result cmd_parse (enum cmd_state);
+enum cmd_result cmd_parse (struct lexer *lexer, struct dataset *ds, enum cmd_state);
+
+struct command;
+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 (void);
+#define DEF_CMD(STATES, FLAGS, NAME, FUNCTION) int FUNCTION (struct lexer *, struct dataset *);
 #define UNIMPL_CMD(NAME, DESCRIPTION)
 #include "command.def"
 #undef DEF_CMD