projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PsppireVarView: Use g_realloc instead of xrealloc
[pspp]
/
src
/
language
/
command.c
diff --git
a/src/language/command.c
b/src/language/command.c
index 8f955b3e4987022ab1bd66950bf0a956668cd206..2fa05ad742d21ed6752a991ff6120893dfb2acea 100644
(file)
--- a/
src/language/command.c
+++ b/
src/language/command.c
@@
-36,9
+36,8
@@
#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/str.h"
#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/str.h"
-#include "output/
text
-item.h"
+#include "output/
group
-item.h"
-#include "xalloc.h"
#include "xmalloca.h"
#include "gettext.h"
#include "xmalloca.h"
#include "gettext.h"
@@
-199,7
+198,8
@@
do_parse_command (struct lexer *lexer,
result = CMD_FAILURE;
goto finish;
}
result = CMD_FAILURE;
goto finish;
}
- text_item_submit (text_item_create (TEXT_ITEM_COMMAND_OPEN, command->name));
+ group_open_item_submit (group_open_item_create_nocopy (
+ utf8_to_title (command->name)));
opened = true;
if (command->function == NULL)
opened = true;
if (command->function == NULL)
@@
-247,8
+247,7
@@
finish:
lex_get (lexer);
if (opened)
lex_get (lexer);
if (opened)
- text_item_submit (text_item_create (TEXT_ITEM_COMMAND_CLOSE,
- command->name));
+ group_close_item_submit (group_close_item_create ());
return result;
}
return result;
}
@@
-443,7
+442,7
@@
report_state_mismatch (const struct command *command, enum cmd_state state)
}
else if (state == CMD_STATE_INPUT_PROGRAM)
msg (SE, _("%s is not allowed inside %s."),
}
else if (state == CMD_STATE_INPUT_PROGRAM)
msg (SE, _("%s is not allowed inside %s."),
- command->name, "INPUT PROGRAM"
);
+ command->name, "INPUT PROGRAM");
else if (state == CMD_STATE_FILE_TYPE)
msg (SE, _("%s is not allowed inside %s."), command->name, "FILE TYPE");
else if (state == CMD_STATE_FILE_TYPE)
msg (SE, _("%s is not allowed inside %s."), command->name, "FILE TYPE");