projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output: Get rid of histogram_plot_n function.
[pspp-builds.git]
/
src
/
language
/
command.c
diff --git
a/src/language/command.c
b/src/language/command.c
index 42580166c60e4fbcd708747d6c53fd8f3de2f293..548d671eb4d307b4af27ddae629a5407e8b87867 100644
(file)
--- a/
src/language/command.c
+++ b/
src/language/command.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000
, 2009
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-37,7
+37,6
@@
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <output/manager.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <output/manager.h>
-#include <output/table.h>
#include <libpspp/getl.h>
#if HAVE_SYS_WAIT_H
#include <libpspp/getl.h>
#if HAVE_SYS_WAIT_H
@@
-209,13
+208,13
@@
do_parse_command (struct lexer *lexer,
result = CMD_NOT_IMPLEMENTED;
goto finish;
}
result = CMD_NOT_IMPLEMENTED;
goto finish;
}
- else if ((command->flags & F_TESTING) && !get_testing_mode ())
+ else if ((command->flags & F_TESTING) && !
settings_
get_testing_mode ())
{
msg (SE, _("%s may be used only in testing mode."), command->name);
result = CMD_FAILURE;
goto finish;
}
{
msg (SE, _("%s may be used only in testing mode."), command->name);
result = CMD_FAILURE;
goto finish;
}
- else if ((command->flags & F_ENHANCED) && get_syntax () != ENHANCED)
+ else if ((command->flags & F_ENHANCED) &&
settings_
get_syntax () != ENHANCED)
{
msg (SE, _("%s may be used only in enhanced syntax mode."),
command->name);
{
msg (SE, _("%s may be used only in enhanced syntax mode."),
command->name);
@@
-231,9
+230,9
@@
do_parse_command (struct lexer *lexer,
/* Execute command. */
msg_set_command_name (command->name);
/* Execute command. */
msg_set_command_name (command->name);
-
tab
_set_command_name (command->name);
+
som
_set_command_name (command->name);
result = command->function (lexer, ds);
result = command->function (lexer, ds);
-
tab
_set_command_name (NULL);
+
som
_set_command_name (NULL);
msg_set_command_name (NULL);
assert (cmd_result_is_valid (result));
msg_set_command_name (NULL);
assert (cmd_result_is_valid (result));
@@
-718,8
+717,8
@@
cmd_complete (const char *prefix, const struct command **cmd)
for (; *cmd < commands + command_cnt; (*cmd)++)
if (!memcasecmp ((*cmd)->name, prefix, strlen (prefix))
for (; *cmd < commands + command_cnt; (*cmd)++)
if (!memcasecmp ((*cmd)->name, prefix, strlen (prefix))
- && (!((*cmd)->flags & F_TESTING) || get_testing_mode ())
- && (!((*cmd)->flags & F_ENHANCED) || get_syntax () == ENHANCED)
+ && (!((*cmd)->flags & F_TESTING) ||
settings_
get_testing_mode ())
+ && (!((*cmd)->flags & F_ENHANCED) ||
settings_
get_syntax () == ENHANCED)
&& !((*cmd)->flags & F_ABBREV)
&& ((*cmd)->function != NULL)
&& in_correct_state (*cmd, completion_state))
&& !((*cmd)->flags & F_ABBREV)
&& ((*cmd)->function != NULL)
&& in_correct_state (*cmd, completion_state))
@@
-768,7
+767,7
@@
cmd_execute (struct lexer *lexer, struct dataset *ds)
int
cmd_erase (struct lexer *lexer, struct dataset *ds UNUSED)
{
int
cmd_erase (struct lexer *lexer, struct dataset *ds UNUSED)
{
- if (get_safer_mode ())
+ if (
settings_
get_safer_mode ())
{
msg (SE, _("This command not allowed when the SAFER option is set."));
return CMD_FAILURE;
{
msg (SE, _("This command not allowed when the SAFER option is set."));
return CMD_FAILURE;
@@
-876,7
+875,7
@@
cmd_host (struct lexer *lexer, struct dataset *ds UNUSED)
{
int look_ahead;
{
int look_ahead;
- if (get_safer_mode ())
+ if (
settings_
get_safer_mode ())
{
msg (SE, _("This command not allowed when the SAFER option is set."));
return CMD_FAILURE;
{
msg (SE, _("This command not allowed when the SAFER option is set."));
return CMD_FAILURE;