projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Support more options in lex_error_expecting_array().
[pspp]
/
src
/
language
/
data-io
/
list.c
diff --git
a/src/language/data-io/list.c
b/src/language/data-io/list.c
index d9798852c1a815bb4aa4f390b39f4fbfbdb07171..c98b6f9a5218dce96f157a8698af1a84857ec12e 100644
(file)
--- a/
src/language/data-io/list.c
+++ b/
src/language/data-io/list.c
@@
-37,7
+37,6
@@
#include "libpspp/message.h"
#include "libpspp/misc.h"
#include "output/pivot-table.h"
#include "libpspp/message.h"
#include "libpspp/misc.h"
#include "output/pivot-table.h"
-#include "output/table-item.h"
#include "gl/intprops.h"
#include "gl/minmax.h"
#include "gl/intprops.h"
#include "gl/minmax.h"
@@
-132,7
+131,7
@@
list_execute (const struct lst_cmd *lcmd, struct dataset *ds)
ok = casegrouper_destroy (grouper);
ok = proc_commit (ds) && ok;
ok = casegrouper_destroy (grouper);
ok = proc_commit (ds) && ok;
- subcase_
destroy
(&sc);
+ subcase_
uninit
(&sc);
free (lcmd->v_variables);
return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE;
free (lcmd->v_variables);
return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE;
@@
-158,23
+157,23
@@
cmd_list (struct lexer *lexer, struct dataset *ds)
while (lex_token (lexer) != T_ENDCMD)
{
lex_match (lexer, T_SLASH);
while (lex_token (lexer) != T_ENDCMD)
{
lex_match (lexer, T_SLASH);
- if (lex_match_id (lexer, "VARIABLES")
)
+ if (lex_match_id (lexer, "VARIABLES"))
{
lex_match (lexer, T_EQUALS);
{
lex_match (lexer, T_EQUALS);
- if (! parse_variables_const (lexer, dict, &cmd.v_variables, &cmd.n_variables, 0
))
+ if (! parse_variables_const (lexer, dict, &cmd.v_variables, &cmd.n_variables, 0))
{
msg (SE, _("No variables specified."));
return CMD_FAILURE;
}
}
{
msg (SE, _("No variables specified."));
return CMD_FAILURE;
}
}
- else if (lex_match_id (lexer, "FORMAT")
)
+ else if (lex_match_id (lexer, "FORMAT"))
{
lex_match (lexer, T_EQUALS);
{
lex_match (lexer, T_EQUALS);
- if (lex_match_id (lexer, "NUMBERED")
)
+ if (lex_match_id (lexer, "NUMBERED"))
{
cmd.numbering = format_numbered;
}
{
cmd.numbering = format_numbered;
}
- else if (lex_match_id (lexer, "UNNUMBERED")
)
+ else if (lex_match_id (lexer, "UNNUMBERED"))
{
cmd.numbering = format_unnumbered;
}
{
cmd.numbering = format_unnumbered;
}
@@
-207,7
+206,7
@@
cmd_list (struct lexer *lexer, struct dataset *ds)
lex_get (lexer);
}
}
lex_get (lexer);
}
}
- else if (! parse_variables_const (lexer, dict, &cmd.v_variables, &cmd.n_variables, 0
))
+ else if (! parse_variables_const (lexer, dict, &cmd.v_variables, &cmd.n_variables, 0))
{
return CMD_FAILURE;
}
{
return CMD_FAILURE;
}