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
/
dictionary
/
variable-display.c
diff --git
a/src/language/dictionary/variable-display.c
b/src/language/dictionary/variable-display.c
index 9e50551c92b9a17359af658d947014762fb78bc2..1fa17017e09556c662bf8ab7d0da5a7cd398eb71 100644
(file)
--- a/
src/language/dictionary/variable-display.c
+++ b/
src/language/dictionary/variable-display.c
@@
-51,13
+51,13
@@
cmd_variable_alignment (struct lexer *lexer, struct dataset *ds)
if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
- if (
lex_force_match (lexer, T_LPAREN)
)
+ if (
lex_force_match (lexer, T_LPAREN)
)
{
{
- if (
lex_match_id (lexer, "LEFT"))
+ if (lex_match_id (lexer, "LEFT"))
align = ALIGN_LEFT;
align = ALIGN_LEFT;
- else if (
lex_match_id (lexer, "RIGHT"))
+ else if (lex_match_id (lexer, "RIGHT"))
align = ALIGN_RIGHT;
align = ALIGN_RIGHT;
- else if (
lex_match_id (lexer, "CENTER"))
+ else if (lex_match_id (lexer, "CENTER"))
align = ALIGN_CENTRE;
else
{
align = ALIGN_CENTRE;
else
{
@@
-65,7
+65,8
@@
cmd_variable_alignment (struct lexer *lexer, struct dataset *ds)
return CMD_FAILURE;
}
return CMD_FAILURE;
}
- lex_force_match (lexer, T_RPAREN);
+ if (!lex_force_match (lexer, T_RPAREN))
+ return CMD_FAILURE;
}
else
{
}
else
{
@@
-73,7
+74,7
@@
cmd_variable_alignment (struct lexer *lexer, struct dataset *ds)
return CMD_FAILURE;
}
return CMD_FAILURE;
}
- for(
i = 0 ; i < nv ; ++i
)
+ for(
i = 0 ; i < nv ; ++i
)
var_set_alignment (v[i], align);
while (lex_token (lexer) == T_SLASH)
var_set_alignment (v[i], align);
while (lex_token (lexer) == T_SLASH)
@@
-123,7
+124,7
@@
cmd_variable_width (struct lexer *lexer, struct dataset *ds)
}
width = MIN (width, 2 * MAX_STRING);
}
width = MIN (width, 2 * MAX_STRING);
- for(
i = 0 ; i < nv ; ++i
)
+ for(
i = 0 ; i < nv ; ++i
)
var_set_display_width (v[i], width);
while (lex_token (lexer) == T_SLASH)
var_set_display_width (v[i], width);
while (lex_token (lexer) == T_SLASH)
@@
-149,13
+150,13
@@
cmd_variable_level (struct lexer *lexer, struct dataset *ds)
if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
- if (
lex_force_match (lexer, T_LPAREN)
)
+ if (
lex_force_match (lexer, T_LPAREN)
)
{
{
- if (
lex_match_id (lexer, "SCALE"))
+ if (lex_match_id (lexer, "SCALE"))
level = MEASURE_SCALE;
level = MEASURE_SCALE;
- else if (
lex_match_id (lexer, "ORDINAL"))
+ else if (lex_match_id (lexer, "ORDINAL"))
level = MEASURE_ORDINAL;
level = MEASURE_ORDINAL;
- else if (
lex_match_id (lexer, "NOMINAL"))
+ else if (lex_match_id (lexer, "NOMINAL"))
level = MEASURE_NOMINAL;
else
{
level = MEASURE_NOMINAL;
else
{
@@
-163,7
+164,8
@@
cmd_variable_level (struct lexer *lexer, struct dataset *ds)
return CMD_FAILURE;
}
return CMD_FAILURE;
}
- lex_force_match (lexer, T_RPAREN);
+ if (!lex_force_match (lexer, T_RPAREN))
+ return CMD_FAILURE;
}
else
{
}
else
{
@@
-171,7
+173,7
@@
cmd_variable_level (struct lexer *lexer, struct dataset *ds)
return CMD_FAILURE;
}
return CMD_FAILURE;
}
- for(
i = 0 ; i < nv ; ++i
)
+ for(
i = 0 ; i < nv ; ++i
)
var_set_measure (v[i], level);
var_set_measure (v[i], level);
@@
-195,20
+197,23
@@
cmd_variable_role (struct lexer *lexer, struct dataset *ds)
enum var_role role;
size_t i;
enum var_role role;
size_t i;
- if (
lex_match_id (lexer, "INPUT"))
+ if (lex_match_id (lexer, "INPUT"))
role = ROLE_INPUT;
role = ROLE_INPUT;
- else if (
lex_match_id (lexer, "TARGET"))
- role = ROLE_
OUTPU
T;
- else if (
lex_match_id (lexer, "BOTH"))
+ else if (lex_match_id (lexer, "TARGET"))
+ role = ROLE_
TARGE
T;
+ else if (lex_match_id (lexer, "BOTH"))
role = ROLE_BOTH;
role = ROLE_BOTH;
- else if (
lex_match_id (lexer, "NONE"))
+ else if (lex_match_id (lexer, "NONE"))
role = ROLE_NONE;
role = ROLE_NONE;
- else if (
lex_match_id (lexer, "PARTITION"))
+ else if (lex_match_id (lexer, "PARTITION"))
role = ROLE_PARTITION;
role = ROLE_PARTITION;
- else if (
lex_match_id (lexer, "SPLIT"))
+ else if (lex_match_id (lexer, "SPLIT"))
role = ROLE_SPLIT;
else
role = ROLE_SPLIT;
else
- return CMD_FAILURE;
+ {
+ lex_error (lexer, NULL);
+ return CMD_FAILURE;
+ }
if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;