X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fxforms%2Fcompute.c;h=5089d80ded1b13abd40b6e94041ae9d7f4a0873d;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=ec5a15a1f33f2a9d12f53cbd42e7d3c334ebbafe;hpb=9f087e7aa4cdff1d5d46d5e188c0017a9d2d0029;p=pspp-builds.git diff --git a/src/language/xforms/compute.c b/src/language/xforms/compute.c index ec5a15a1..5089d80d 100644 --- a/src/language/xforms/compute.c +++ b/src/language/xforms/compute.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009, 2010, 2011 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 @@ -19,20 +19,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/case.h" +#include "data/dictionary.h" +#include "data/procedure.h" +#include "data/transformations.h" +#include "data/variable.h" +#include "data/vector.h" +#include "language/command.h" +#include "language/expressions/public.h" +#include "language/lexer/lexer.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -90,7 +90,7 @@ cmd_compute (struct lexer *lexer, struct dataset *ds) 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) @@ -112,14 +112,17 @@ cmd_compute (struct lexer *lexer, struct dataset *ds) /* Handle COMPUTE or IF with numeric target variable. */ static int -compute_num (void *compute_, struct ccase *c, casenumber case_num) +compute_num (void *compute_, struct ccase **c, casenumber case_num) { struct compute_trns *compute = compute_; if (compute->test == NULL - || expr_evaluate_num (compute->test, c, case_num) == 1.0) - case_data_rw (c, compute->variable)->f - = expr_evaluate_num (compute->rvalue, c, case_num); + || expr_evaluate_num (compute->test, *c, case_num) == 1.0) + { + *c = case_unshare (*c); + case_data_rw (*c, compute->variable)->f + = expr_evaluate_num (compute->rvalue, *c, case_num); + } return TRNS_CONTINUE; } @@ -127,17 +130,17 @@ compute_num (void *compute_, struct ccase *c, casenumber case_num) /* Handle COMPUTE or IF with numeric vector element target variable. */ static int -compute_num_vec (void *compute_, struct ccase *c, casenumber case_num) +compute_num_vec (void *compute_, struct ccase **c, casenumber case_num) { struct compute_trns *compute = compute_; if (compute->test == NULL - || expr_evaluate_num (compute->test, c, case_num) == 1.0) + || expr_evaluate_num (compute->test, *c, case_num) == 1.0) { double index; /* Index into the vector. */ int rindx; /* Rounded index value. */ - index = expr_evaluate_num (compute->element, c, case_num); + index = expr_evaluate_num (compute->element, *c, case_num); rindx = floor (index + EPSILON); if (index == SYSMIS || rindx < 1 || rindx > vector_get_var_cnt (compute->vector)) @@ -152,8 +155,10 @@ compute_num_vec (void *compute_, struct ccase *c, casenumber case_num) index, vector_get_name (compute->vector)); return TRNS_CONTINUE; } - case_data_rw (c, vector_get_var (compute->vector, rindx - 1))->f - = expr_evaluate_num (compute->rvalue, c, case_num); + + *c = case_unshare (*c); + case_data_rw (*c, vector_get_var (compute->vector, rindx - 1))->f + = expr_evaluate_num (compute->rvalue, *c, case_num); } return TRNS_CONTINUE; @@ -161,14 +166,19 @@ compute_num_vec (void *compute_, struct ccase *c, casenumber case_num) /* Handle COMPUTE or IF with string target variable. */ static int -compute_str (void *compute_, struct ccase *c, casenumber case_num) +compute_str (void *compute_, struct ccase **c, casenumber case_num) { struct compute_trns *compute = compute_; if (compute->test == NULL - || expr_evaluate_num (compute->test, c, case_num) == 1.0) - expr_evaluate_str (compute->rvalue, c, case_num, - case_data_rw (c, compute->variable)->s, compute->width); + || expr_evaluate_num (compute->test, *c, case_num) == 1.0) + { + char *s; + + *c = case_unshare (*c); + 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; } @@ -176,18 +186,18 @@ compute_str (void *compute_, struct ccase *c, casenumber case_num) /* Handle COMPUTE or IF with string vector element target variable. */ static int -compute_str_vec (void *compute_, struct ccase *c, casenumber case_num) +compute_str_vec (void *compute_, struct ccase **c, casenumber case_num) { struct compute_trns *compute = compute_; if (compute->test == NULL - || expr_evaluate_num (compute->test, c, case_num) == 1.0) + || expr_evaluate_num (compute->test, *c, case_num) == 1.0) { double index; /* Index into the vector. */ int rindx; /* Rounded index value. */ struct variable *vr; /* Variable reference by indexed vector. */ - index = expr_evaluate_num (compute->element, c, case_num); + index = expr_evaluate_num (compute->element, *c, case_num); rindx = floor (index + EPSILON); if (index == SYSMIS) { @@ -205,8 +215,9 @@ compute_str_vec (void *compute_, struct ccase *c, casenumber case_num) } vr = vector_get_var (compute->vector, rindx - 1); - expr_evaluate_str (compute->rvalue, c, case_num, - case_data_rw (c, vr)->s, + *c = case_unshare (*c); + expr_evaluate_str (compute->rvalue, *c, case_num, + CHAR_CAST_BUG (char *, case_str_rw (*c, vr)), var_get_width (vr)); } @@ -235,7 +246,7 @@ cmd_if (struct lexer *lexer, struct dataset *ds) 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) @@ -258,7 +269,7 @@ cmd_if (struct lexer *lexer, struct dataset *ds) static trns_proc_func * get_proc_func (const struct lvalue *lvalue) { - bool is_numeric = lvalue_get_type (lvalue) == VAR_NUMERIC; + bool is_numeric = lvalue_get_type (lvalue) == VAL_NUMERIC; bool is_vector = lvalue_is_vector (lvalue); return (is_numeric @@ -272,7 +283,7 @@ static struct expression * parse_rvalue (struct lexer *lexer, const struct lvalue *lvalue, struct dataset *ds) { - bool is_numeric = lvalue_get_type (lvalue) == VAR_NUMERIC; + bool is_numeric = lvalue_get_type (lvalue) == VAL_NUMERIC; return expr_parse (lexer, ds, is_numeric ? EXPR_NUMBER : EXPR_STRING); } @@ -335,30 +346,30 @@ lvalue_parse (struct lexer *lexer, struct dataset *ds) if (!lex_force_id (lexer)) goto lossage; - if (lex_look_ahead (lexer) == '(') + if (lex_look_ahead (lexer) == T_LPAREN) { /* Vector. */ - lvalue->vector = dict_lookup_vector (dict, lex_tokid (lexer)); + lvalue->vector = dict_lookup_vector (dict, lex_tokcstr (lexer)); if (lvalue->vector == NULL) { - msg (SE, _("There is no vector named %s."), lex_tokid (lexer)); + msg (SE, _("There is no vector named %s."), lex_tokcstr (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; - if (!lex_force_match (lexer, ')')) + if (!lex_force_match (lexer, T_RPAREN)) goto lossage; } else { /* Variable name. */ - const char *var_name = lex_tokid (lexer); + const char *var_name = lex_tokcstr (lexer); lvalue->variable = dict_lookup_var (dict, var_name); if (lvalue->variable == NULL) {