projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
expressions: Fix value of $TIME variable and add a test.
[pspp]
/
src
/
language
/
expressions
/
evaluate.c
diff --git
a/src/language/expressions/evaluate.c
b/src/language/expressions/evaluate.c
index 09f237e0cd4e3664a0a57353ce2b0f0d2292becf..8b47f445ee050df33f112c25a2c85a526d9f7a4d 100644
(file)
--- a/
src/language/expressions/evaluate.c
+++ b/
src/language/expressions/evaluate.c
@@
-24,6
+24,7
@@
#include "libpspp/assertion.h"
#include "libpspp/message.h"
#include "language/expressions/helpers.h"
#include "libpspp/assertion.h"
#include "libpspp/message.h"
#include "language/expressions/helpers.h"
+#include "language/lexer/format-parser.h"
#include "language/lexer/value-parser.h"
#include "libpspp/pool.h"
#include "output/driver.h"
#include "language/lexer/value-parser.h"
#include "libpspp/pool.h"
#include "output/driver.h"
@@
-124,6
+125,8
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
char *name = NULL;
char *title = NULL;
char *name = NULL;
char *title = NULL;
+ struct fmt_spec format;
+ bool has_format = false;
struct expression *expr;
struct expression *expr;
@@
-219,6
+222,15
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
dict_create_vector_assert (d, "V", vars, n);
free (vars);
}
dict_create_vector_assert (d, "V", vars, n);
free (vars);
}
+ else if (lex_match_id (lexer, "FORMAT"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if (!parse_format_specifier (lexer, &format)
+ || !fmt_check_output (&format)
+ || !fmt_check_type_compat (&format, VAL_NUMERIC))
+ goto done;
+ has_format = true;
+ }
else
break;
}
else
break;
}
@@
-258,7
+270,15
@@
cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
case OP_num_vec_elem:
{
double d = expr_evaluate_num (expr, c, 0);
case OP_num_vec_elem:
{
double d = expr_evaluate_num (expr, c, 0);
- if (d == SYSMIS)
+ if (has_format)
+ {
+ char *output = data_out (&(const union value) { .f = d },
+ NULL, &format,
+ settings_get_fmt_settings ());
+ output_log ("%s => %s", title, output);
+ free (output);
+ }
+ else if (d == SYSMIS)
output_log ("%s => sysmis", title);
else
output_log ("%s => %.2f", title, d);
output_log ("%s => sysmis", title);
else
output_log ("%s => %.2f", title, d);