X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fevaluate.c;h=ad108f5a60f151ac678609ef104f82bb88a7e1ac;hb=e588208caf725f595d63a07ddd2116331173e81d;hp=c38075410cb6c3733b079e237a7ec4efcfb373e0;hpb=3a61659a8fc11c51ad5af02b20f5613dcde50382;p=pspp-builds.git diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c index c3807541..ad108f5a 100644 --- a/src/language/expressions/evaluate.c +++ b/src/language/expressions/evaluate.c @@ -1,33 +1,32 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 2006, 2007, 2009 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include -#include "private.h" +#include "evaluate.h" #include -#include #include #include -#include "helpers.h" -#include "evaluate.h" +#include +#include +#include #include +#include "xalloc.h" + static void expr_evaluate (struct expression *e, const struct ccase *c, int case_idx, void *result) @@ -38,7 +37,7 @@ expr_evaluate (struct expression *e, const struct ccase *c, int case_idx, double *ns = e->number_stack; struct substring *ss = e->string_stack; - /* Without a dictionary/dataset, the expression can't refer to variables, + /* Without a dictionary/dataset, the expression can't refer to variables, and you don't need to specify a case when you evaluate the expression. With a dictionary/dataset, the expression can refer to variables, so you must specify a case when you evaluate the @@ -65,7 +64,7 @@ expr_evaluate (struct expression *e, const struct ccase *c, int case_idx, break; case OP_return_number: - *(double *) result = finite (ns[-1]) ? ns[-1] : SYSMIS; + *(double *) result = isfinite (ns[-1]) ? ns[-1] : SYSMIS; return; case OP_return_string: @@ -73,7 +72,7 @@ expr_evaluate (struct expression *e, const struct ccase *c, int case_idx, return; #include "evaluate.inc" - + default: NOT_REACHED (); } @@ -90,26 +89,24 @@ expr_evaluate_num (struct expression *e, const struct ccase *c, int case_idx) return d; } - - void expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx, - char *dst, size_t dst_size) + char *dst, size_t dst_size) { struct substring s; assert (e->type == OP_string); assert ((dst == NULL) == (dst_size == 0)); expr_evaluate (e, c, case_idx, &s); - - buf_copy_rpad (dst, dst_size, s.string, s.length); + + buf_copy_rpad (dst, dst_size, s.string, s.length, ' '); } #include #include int -cmd_debug_evaluate (struct dataset *dsother UNUSED) +cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED) { bool optimize = true; int retval = CMD_FAILURE; @@ -121,50 +118,50 @@ cmd_debug_evaluate (struct dataset *dsother UNUSED) struct expression *expr; - for (;;) + for (;;) { struct dictionary *d = NULL; - if (lex_match_id ("NOOPTIMIZE")) + if (lex_match_id (lexer, "NOOPTIMIZE")) optimize = 0; - else if (lex_match_id ("POSTFIX")) + else if (lex_match_id (lexer, "POSTFIX")) dump_postfix = 1; - else if (lex_match ('(')) + else if (lex_match (lexer, '(')) { - char name[LONG_NAME_LEN + 1]; + char name[VAR_NAME_LEN + 1]; struct variable *v; size_t old_value_cnt; int width; - if (!lex_force_id ()) + if (!lex_force_id (lexer)) goto done; - strcpy (name, tokid); + strcpy (name, lex_tokid (lexer)); - lex_get (); - if (!lex_force_match ('=')) + lex_get (lexer); + if (!lex_force_match (lexer, '=')) goto done; - if (lex_is_number ()) + if (lex_is_number (lexer)) { width = 0; - fprintf (stderr, "(%s = %.2f)", name, tokval); + fprintf (stderr, "(%s = %.2f)", name, lex_tokval (lexer)); } - else if (token == T_STRING) + else if (lex_token (lexer) == T_STRING) { - width = ds_length (&tokstr); - fprintf (stderr, "(%s = \"%.2s\")", name, ds_cstr (&tokstr)); + width = ds_length (lex_tokstr (lexer)); + fprintf (stderr, "(%s = \"%.2s\")", name, ds_cstr (lex_tokstr (lexer))); } else { - lex_error (_("expecting number or string")); + lex_error (lexer, _("expecting number or string")); goto done; } - - if ( ds == NULL ) + + if ( ds == NULL ) { ds = create_dataset (); d = dataset_dict (ds); } - + old_value_cnt = dict_get_next_value_idx (d); v = dict_create_var (d, name, width); if (v == NULL) @@ -173,40 +170,34 @@ cmd_debug_evaluate (struct dataset *dsother UNUSED) goto done; } - if (c == NULL) - { - c = xmalloc (sizeof *c); - case_create (c, dict_get_next_value_idx (d)); - } + if (c == NULL) + c = case_create (dict_get_proto (d)); else - case_resize (c, old_value_cnt, dict_get_next_value_idx (d)); + c = case_unshare_and_resize (c, dict_get_proto (d)); - if (lex_is_number ()) - case_data_rw (c, v->fv)->f = tokval; - else - memcpy (case_data_rw (c, v->fv)->s, ds_data (&tokstr), - v->width); - lex_get (); + if (!parse_value (lexer, case_data_rw (c, v), var_get_width (v))) + NOT_REACHED (); + lex_get (lexer); - if (!lex_force_match (')')) + if (!lex_force_match (lexer, ')')) goto done; } - else + else break; } - if (token != '/') + if (lex_token (lexer) != '/') { - lex_force_match ('/'); + lex_force_match (lexer, '/'); goto done; } - if ( ds != NULL ) + if ( ds != NULL ) fprintf(stderr, "; "); - fprintf (stderr, "%s => ", lex_rest_of_line (NULL)); - lex_get (); + fprintf (stderr, "%s => ", lex_rest_of_line (lexer)); + lex_get (lexer); - expr = expr_parse_any (ds, optimize); - if (!expr || lex_end_of_command () != CMD_SUCCESS) + expr = expr_parse_any (lexer, ds, optimize); + if (!expr || lex_end_of_command (lexer) != CMD_SUCCESS) { if (expr != NULL) expr_free (expr); @@ -214,30 +205,30 @@ cmd_debug_evaluate (struct dataset *dsother UNUSED) goto done; } - if (dump_postfix) + if (dump_postfix) expr_debug_print_postfix (expr); - else - switch (expr->type) + else + switch (expr->type) { - case OP_number: + case OP_number: { double d = expr_evaluate_num (expr, c, 0); if (d == SYSMIS) fprintf (stderr, "sysmis\n"); else - fprintf (stderr, "%.2f\n", d); + fprintf (stderr, "%.2f\n", d); } break; - - case OP_boolean: + + case OP_boolean: { double b = expr_evaluate_num (expr, c, 0); fprintf (stderr, "%s\n", - b == SYSMIS ? "sysmis" : b == 0.0 ? "false" : "true"); + b == SYSMIS ? "sysmis" : b == 0.0 ? "false" : "true"); } break; - case OP_string: + case OP_string: { struct substring s; expr_evaluate (expr, c, 0, &s); @@ -245,7 +236,7 @@ cmd_debug_evaluate (struct dataset *dsother UNUSED) fputc ('"', stderr); fwrite (s.string, s.length, 1, stderr); fputs ("\"\n", stderr); - break; + break; } default: @@ -259,35 +250,31 @@ cmd_debug_evaluate (struct dataset *dsother UNUSED) if (ds) destroy_dataset (ds); - if (c != NULL) - { - case_destroy (c); - free (c); - } + case_unref (c); return retval; } void -expr_debug_print_postfix (const struct expression *e) +expr_debug_print_postfix (const struct expression *e) { size_t i; - for (i = 0; i < e->op_cnt; i++) + for (i = 0; i < e->op_cnt; i++) { union operation_data *op = &e->ops[i]; if (i > 0) putc (' ', stderr); - switch (e->op_types[i]) + switch (e->op_types[i]) { case OP_operation: if (op->operation == OP_return_number) fprintf (stderr, "return_number"); else if (op->operation == OP_return_string) fprintf (stderr, "return_string"); - else if (is_function (op->operation)) + else if (is_function (op->operation)) fprintf (stderr, "%s", operations[op->operation].prototype); - else if (is_composite (op->operation)) + else if (is_composite (op->operation)) fprintf (stderr, "%s", operations[op->operation].name); else fprintf (stderr, "%s:", operations[op->operation].name); @@ -307,21 +294,21 @@ expr_debug_print_postfix (const struct expression *e) { char str[FMT_STRING_LEN_MAX + 1]; fmt_to_string (op->format, str); - fprintf (stderr, "f<%s>", str); + fprintf (stderr, "f<%s>", str); } break; case OP_variable: - fprintf (stderr, "v<%s>", op->variable->name); + fprintf (stderr, "v<%s>", var_get_name (op->variable)); break; case OP_vector: - fprintf (stderr, "vec<%s>", op->vector->name); + fprintf (stderr, "vec<%s>", vector_get_name (op->vector)); break; case OP_integer: fprintf (stderr, "i<%d>", op->integer); break; default: NOT_REACHED (); - } + } } fprintf (stderr, "\n"); }