lexer: Use lex_is_string() more consistently.

[pspp] / src / language / expressions / evaluate.c

diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c
index 91b9c84249b76c0e7d799ad7dc089f66874c314a..65404b43e4d4d6a725a57794811291881890d4c7 100644 (file)
--- a/src/language/expressions/evaluate.c
+++ b/src/language/expressions/evaluate.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2007, 2009 Free Software Foundation, Inc.
+   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
@@ -15,13 +15,14 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "private.h"
+#include "evaluate.h"
 
 #include <ctype.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 "xalloc.h"
@@ -98,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);
 
-  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>
@@ -140,15 +141,9 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
             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 = ds_length (lex_tokstr (lexer));
           else
             {
               lex_error (lexer, _("expecting number or string"));
@@ -170,16 +165,12 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
             }
 
           if (c == NULL)
-            c = case_create (dict_get_next_value_idx (d));
+            c = case_create (dict_get_proto (d));
           else
-            c = case_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, ')'))
             goto done;
@@ -193,9 +184,6 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
       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);
@@ -203,7 +191,7 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
     {
       if (expr != NULL)
         expr_free (expr);
-      fprintf (stderr, "error\n");
+      printf ("error\n");
       goto done;
     }
 
@@ -216,16 +204,16 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
         {
           double d = expr_evaluate_num (expr, c, 0);
           if (d == SYSMIS)
-            fprintf (stderr, "sysmis\n");
+            printf ("sysmis\n");
           else
-            fprintf (stderr, "%.2f\n", d);
+            printf ("%.2f\n", d);
         }
         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;
@@ -235,9 +223,9 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
           struct substring s;
           expr_evaluate (expr, c, 0, &s);
 
-          fputc ('"', stderr);
-          fwrite (s.string, s.length, 1, stderr);
-          fputs ("\"\n", stderr);
+          putchar ('"');
+          fwrite (s.string, s.length, 1, stdout);
+          puts ("\"");
           break;
         }
 
@@ -271,24 +259,24 @@ expr_debug_print_postfix (const struct expression *e)
         {
         case OP_operation:
           if (op->operation == OP_return_number)
-            fprintf (stderr, "return_number");
+            printf ("return_number");
           else if (op->operation == OP_return_string)
-            fprintf (stderr, "return_string");
+            printf ("return_string");
           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))
-            fprintf (stderr, "%s", operations[op->operation].name);
+            printf ("%s", operations[op->operation].name);
           else
-            fprintf (stderr, "%s:", operations[op->operation].name);
+            printf ("%s:", operations[op->operation].name);
           break;
         case OP_number:
           if (op->number != SYSMIS)
-            fprintf (stderr, "n<%g>", op->number);
+            printf ("n<%g>", op->number);
           else
-            fprintf (stderr, "n<SYSMIS>");
+            printf ("n<SYSMIS>");
           break;
         case OP_string:
-          fprintf (stderr, "s<%.*s>",
+          printf ("s<%.*s>",
                    (int) op->string.length,
                    op->string.string != NULL ? op->string.string : "");
           break;
@@ -296,21 +284,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);
+            printf ("f<%s>", str);
           }
           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:
-          fprintf (stderr, "vec<%s>", vector_get_name (op->vector));
+          printf ("vec<%s>", vector_get_name (op->vector));
           break;
         case OP_integer:
-          fprintf (stderr, "i<%d>", op->integer);
+          printf ("i<%d>", op->integer);
           break;
         default:
           NOT_REACHED ();
         }
     }
-  fprintf (stderr, "\n");
+  printf ("\n");
 }