projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
data-out: Make each converter responsible for storing null terminator.
[pspp-builds.git]
/
src
/
language
/
xforms
/
compute.c
diff --git
a/src/language/xforms/compute.c
b/src/language/xforms/compute.c
index 09fc2155abc82c0a678364301b1ea0de6b3fa9c9..442c15a4964d7118bf5d125bb6a640053c722d6d 100644
(file)
--- a/
src/language/xforms/compute.c
+++ b/
src/language/xforms/compute.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009
, 2010
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
@@
-90,7
+90,7
@@
cmd_compute (struct lexer *lexer, struct dataset *ds)
if (lvalue == NULL)
goto fail;
if (lvalue == NULL)
goto fail;
- if (!lex_force_match (lexer,
'='
))
+ if (!lex_force_match (lexer,
T_EQUALS
))
goto fail;
compute->rvalue = parse_rvalue (lexer, lvalue, ds);
if (compute->rvalue == NULL)
goto fail;
compute->rvalue = parse_rvalue (lexer, lvalue, ds);
if (compute->rvalue == NULL)
@@
-173,10
+173,11
@@
compute_str (void *compute_, struct ccase **c, casenumber case_num)
if (compute->test == NULL
|| expr_evaluate_num (compute->test, *c, case_num) == 1.0)
{
if (compute->test == NULL
|| expr_evaluate_num (compute->test, *c, case_num) == 1.0)
{
+ char *s;
+
*c = case_unshare (*c);
*c = case_unshare (*c);
- expr_evaluate_str (compute->rvalue, *c, case_num,
- case_str_rw (*c, compute->variable),
- compute->width);
+ s = CHAR_CAST_BUG (char *, case_str_rw (*c, compute->variable));
+ expr_evaluate_str (compute->rvalue, *c, case_num, s, compute->width);
}
return TRNS_CONTINUE;
}
return TRNS_CONTINUE;
@@
-216,7
+217,8
@@
compute_str_vec (void *compute_, struct ccase **c, casenumber case_num)
vr = vector_get_var (compute->vector, rindx - 1);
*c = case_unshare (*c);
expr_evaluate_str (compute->rvalue, *c, case_num,
vr = vector_get_var (compute->vector, rindx - 1);
*c = case_unshare (*c);
expr_evaluate_str (compute->rvalue, *c, case_num,
- case_str_rw (*c, vr), var_get_width (vr));
+ CHAR_CAST_BUG (char *, case_str_rw (*c, vr)),
+ var_get_width (vr));
}
return TRNS_CONTINUE;
}
return TRNS_CONTINUE;
@@
-244,7
+246,7
@@
cmd_if (struct lexer *lexer, struct dataset *ds)
goto fail;
/* Rvalue expression. */
goto fail;
/* Rvalue expression. */
- if (!lex_force_match (lexer,
'='
))
+ if (!lex_force_match (lexer,
T_EQUALS
))
goto fail;
compute->rvalue = parse_rvalue (lexer, lvalue, ds);
if (compute->rvalue == NULL)
goto fail;
compute->rvalue = parse_rvalue (lexer, lvalue, ds);
if (compute->rvalue == NULL)
@@
-344,30
+346,30
@@
lvalue_parse (struct lexer *lexer, struct dataset *ds)
if (!lex_force_id (lexer))
goto lossage;
if (!lex_force_id (lexer))
goto lossage;
- if (lex_look_ahead (lexer) ==
'('
)
+ if (lex_look_ahead (lexer) ==
T_LPAREN
)
{
/* Vector. */
{
/* Vector. */
- lvalue->vector = dict_lookup_vector (dict, lex_tok
id
(lexer));
+ lvalue->vector = dict_lookup_vector (dict, lex_tok
cstr
(lexer));
if (lvalue->vector == NULL)
{
if (lvalue->vector == NULL)
{
- msg (SE, _("There is no vector named %s."), lex_tok
id
(lexer));
+ msg (SE, _("There is no vector named %s."), lex_tok
cstr
(lexer));
goto lossage;
}
/* Vector element. */
lex_get (lexer);
goto lossage;
}
/* Vector element. */
lex_get (lexer);
- if (!lex_force_match (lexer,
'('
))
+ if (!lex_force_match (lexer,
T_LPAREN
))
goto lossage;
lvalue->element = expr_parse (lexer, ds, EXPR_NUMBER);
if (lvalue->element == NULL)
goto lossage;
goto lossage;
lvalue->element = expr_parse (lexer, ds, EXPR_NUMBER);
if (lvalue->element == NULL)
goto lossage;
- if (!lex_force_match (lexer,
')'
))
+ if (!lex_force_match (lexer,
T_RPAREN
))
goto lossage;
}
else
{
/* Variable name. */
goto lossage;
}
else
{
/* Variable name. */
- const char *var_name = lex_tok
id
(lexer);
+ const char *var_name = lex_tok
cstr
(lexer);
lvalue->variable = dict_lookup_var (dict, var_name);
if (lvalue->variable == NULL)
{
lvalue->variable = dict_lookup_var (dict, var_name);
if (lvalue->variable == NULL)
{