projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Change the functions for retrieving token strings.
[pspp]
/
src
/
language
/
expressions
/
evaluate.c
diff --git
a/src/language/expressions/evaluate.c
b/src/language/expressions/evaluate.c
index ec12452a18788a7ac85bc39166c518323b10a821..79b52159528d020d065034f1ef5c0a3f6dc59ec6 100644
(file)
--- a/
src/language/expressions/evaluate.c
+++ b/
src/language/expressions/evaluate.c
@@
-1,32
+1,32
@@
-/* PSPP -
computes sample statistic
s.
- Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc.
+/* PSPP -
a program for statistical analysi
s.
+ Copyright (C) 1997-9, 2000, 2006, 2007
, 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 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
+ G
NU G
eneral Public License for more details.
You should have received a copy of the GNU General Public License
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 <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <config.h>
-#include "
priv
ate.h"
+#include "
evalu
ate.h"
#include <ctype.h>
#include <ctype.h>
-#include <libpspp/alloc.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <libpspp/assertion.h>
#include <libpspp/message.h>
-#include "helpers.h"
-#include "evaluate.h"
+#include <language/expressions/helpers.h>
+#include <language/expressions/private.h>
+#include <language/lexer/value-parser.h>
#include <libpspp/pool.h>
#include <libpspp/pool.h>
+#include "xalloc.h"
+
static void
expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
void *result)
static void
expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
void *result)
@@
-64,7
+64,7
@@
expr_evaluate (struct expression *e, const struct ccase *c, int case_idx,
break;
case OP_return_number:
break;
case OP_return_number:
- *(double *) result = finite (ns[-1]) ? ns[-1] : SYSMIS;
+ *(double *) result =
is
finite (ns[-1]) ? ns[-1] : SYSMIS;
return;
case OP_return_string:
return;
case OP_return_string:
@@
-99,7
+99,7
@@
expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx,
assert ((dst == NULL) == (dst_size == 0));
expr_evaluate (e, c, case_idx, &s);
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
, ' '
);
}
\f
#include <language/lexer/lexer.h>
}
\f
#include <language/lexer/lexer.h>
@@
-125,31
+125,25
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
optimize = 0;
else if (lex_match_id (lexer, "POSTFIX"))
dump_postfix = 1;
optimize = 0;
else if (lex_match_id (lexer, "POSTFIX"))
dump_postfix = 1;
- else if (lex_match (lexer,
'('
))
+ else if (lex_match (lexer,
T_LPAREN
))
{
{
- 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 (lexer))
goto done;
struct variable *v;
size_t old_value_cnt;
int width;
if (!lex_force_id (lexer))
goto done;
- strcpy (name, lex_tok
id
(lexer));
+ strcpy (name, lex_tok
cstr
(lexer));
lex_get (lexer);
lex_get (lexer);
- if (!lex_force_match (lexer,
'='
))
+ if (!lex_force_match (lexer,
T_EQUALS
))
goto done;
if (lex_is_number (lexer))
goto done;
if (lex_is_number (lexer))
- {
- width = 0;
- fprintf (stderr, "(%s = %.2f)", name, lex_tokval (lexer));
- }
- else if (lex_token (lexer) == T_STRING)
- {
- width = ds_length (lex_tokstr (lexer));
- fprintf (stderr, "(%s = \"%.2s\")", name, ds_cstr (lex_tokstr (lexer)));
- }
+ width = 0;
+ else if (lex_is_string (lexer))
+ width = ss_length (lex_tokss (lexer));
else
{
lex_error (lexer, _("expecting number or string"));
else
{
lex_error (lexer, _("expecting number or string"));
@@
-158,7
+152,7
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
if ( ds == NULL )
{
if ( ds == NULL )
{
- ds = create_dataset (
NULL, NULL
);
+ ds = create_dataset ();
d = dataset_dict (ds);
}
d = dataset_dict (ds);
}
@@
-171,35
+165,25
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
}
if (c == NULL)
}
if (c == NULL)
- {
- c = xmalloc (sizeof *c);
- case_create (c, dict_get_next_value_idx (d));
- }
+ c = case_create (dict_get_proto (d));
else
else
- c
ase_resize (c, dict_get_next_value_idx
(d));
+ c
= case_unshare_and_resize (c, dict_get_proto
(d));
- if (lex_is_number (lexer))
- case_data_rw (c, v)->f = lex_tokval (lexer);
- else
- memcpy (case_data_rw (c, v)->s, ds_data (lex_tokstr (lexer)),
- var_get_width (v));
- lex_get (lexer);
+ if (!parse_value (lexer, case_data_rw (c, v), var_get_width (v)))
+ NOT_REACHED ();
- if (!lex_force_match (lexer,
')'
))
+ if (!lex_force_match (lexer,
T_RPAREN
))
goto done;
}
else
break;
}
goto done;
}
else
break;
}
- if (lex_token (lexer) !=
'/'
)
+ if (lex_token (lexer) !=
T_SLASH
)
{
{
- lex_force_match (lexer,
'/'
);
+ lex_force_match (lexer,
T_SLASH
);
goto done;
}
goto done;
}
- if ( ds != NULL )
- fprintf(stderr, "; ");
- fprintf (stderr, "%s => ", lex_rest_of_line (lexer));
lex_get (lexer);
expr = expr_parse_any (lexer, ds, optimize);
lex_get (lexer);
expr = expr_parse_any (lexer, ds, optimize);
@@
-207,7
+191,7
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
{
if (expr != NULL)
expr_free (expr);
{
if (expr != NULL)
expr_free (expr);
-
fprintf (stderr,
"error\n");
+
printf (
"error\n");
goto done;
}
goto done;
}
@@
-220,16
+204,16
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
{
double d = expr_evaluate_num (expr, c, 0);
if (d == SYSMIS)
{
double d = expr_evaluate_num (expr, c, 0);
if (d == SYSMIS)
-
fprintf (stderr,
"sysmis\n");
+
printf (
"sysmis\n");
else
else
-
fprintf (stderr,
"%.2f\n", d);
+
printf (
"%.2f\n", d);
}
break;
case OP_boolean:
{
double b = expr_evaluate_num (expr, c, 0);
}
break;
case OP_boolean:
{
double b = expr_evaluate_num (expr, c, 0);
-
fprintf (stderr,
"%s\n",
+
printf (
"%s\n",
b == SYSMIS ? "sysmis" : b == 0.0 ? "false" : "true");
}
break;
b == SYSMIS ? "sysmis" : b == 0.0 ? "false" : "true");
}
break;
@@
-239,9
+223,9
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
struct substring s;
expr_evaluate (expr, c, 0, &s);
struct substring s;
expr_evaluate (expr, c, 0, &s);
-
fputc ('"', stderr
);
- fwrite (s.string, s.length, 1, std
err
);
-
fputs ("\"\n", stderr
);
+
putchar ('"'
);
+ fwrite (s.string, s.length, 1, std
out
);
+
puts ("\""
);
break;
}
break;
}
@@
-256,11
+240,7
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
if (ds)
destroy_dataset (ds);
if (ds)
destroy_dataset (ds);
- if (c != NULL)
- {
- case_destroy (c);
- free (c);
- }
+ case_unref (c);
return retval;
}
return retval;
}
@@
-279,24
+259,24
@@
expr_debug_print_postfix (const struct expression *e)
{
case OP_operation:
if (op->operation == OP_return_number)
{
case OP_operation:
if (op->operation == OP_return_number)
-
fprintf (stderr,
"return_number");
+
printf (
"return_number");
else if (op->operation == OP_return_string)
else if (op->operation == OP_return_string)
-
fprintf (stderr,
"return_string");
+
printf (
"return_string");
else if (is_function (op->operation))
else if (is_function (op->operation))
-
fprintf (stderr,
"%s", operations[op->operation].prototype);
+
printf (
"%s", operations[op->operation].prototype);
else if (is_composite (op->operation))
else if (is_composite (op->operation))
-
fprintf (stderr,
"%s", operations[op->operation].name);
+
printf (
"%s", operations[op->operation].name);
else
else
-
fprintf (stderr,
"%s:", operations[op->operation].name);
+
printf (
"%s:", operations[op->operation].name);
break;
case OP_number:
if (op->number != SYSMIS)
break;
case OP_number:
if (op->number != SYSMIS)
-
fprintf (stderr,
"n<%g>", op->number);
+
printf (
"n<%g>", op->number);
else
else
-
fprintf (stderr,
"n<SYSMIS>");
+
printf (
"n<SYSMIS>");
break;
case OP_string:
break;
case OP_string:
-
fprintf (stderr,
"s<%.*s>",
+
printf (
"s<%.*s>",
(int) op->string.length,
op->string.string != NULL ? op->string.string : "");
break;
(int) op->string.length,
op->string.string != NULL ? op->string.string : "");
break;
@@
-304,21
+284,21
@@
expr_debug_print_postfix (const struct expression *e)
{
char str[FMT_STRING_LEN_MAX + 1];
fmt_to_string (op->format, str);
{
char str[FMT_STRING_LEN_MAX + 1];
fmt_to_string (op->format, str);
-
fprintf (stderr,
"f<%s>", str);
+
printf (
"f<%s>", str);
}
break;
case OP_variable:
}
break;
case OP_variable:
-
fprintf (stderr,
"v<%s>", var_get_name (op->variable));
+
printf (
"v<%s>", var_get_name (op->variable));
break;
case OP_vector:
break;
case OP_vector:
-
fprintf (stderr,
"vec<%s>", vector_get_name (op->vector));
+
printf (
"vec<%s>", vector_get_name (op->vector));
break;
case OP_integer:
break;
case OP_integer:
-
fprintf (stderr,
"i<%d>", op->integer);
+
printf (
"i<%d>", op->integer);
break;
default:
NOT_REACHED ();
}
}
break;
default:
NOT_REACHED ();
}
}
-
fprintf (stderr,
"\n");
+
printf (
"\n");
}
}