lexer: Check that 'read' function in lex_source returns valid value.

[pspp] / src / language / stats / descriptives.c

diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c
index 935ca9b37349f2f2ee85c4d2841bde86df0468cc..32a979d205fa413853c447c848f851f78b5f9752 100644 (file)
--- a/src/language/stats/descriptives.c
+++ b/src/language/stats/descriptives.c
@@ -578,7 +578,7 @@ dump_z_table (struct dsc_proc *dsc)
     for (i = 0, y = 1; i < dsc->var_cnt; i++)
       if (dsc->vars[i].z_name != NULL)
        {
-         tab_text (t, 0, y, TAB_LEFT, var_get_name (dsc->vars[i].v));
+         tab_text (t, 0, y, TAB_LEFT, var_to_string (dsc->vars[i].v));
          tab_text (t, 1, y++, TAB_LEFT, dsc->vars[i].z_name);
        }
   }
@@ -680,9 +680,9 @@ setup_z_trns (struct dsc_proc *dsc, struct dataset *ds)
          struct variable *dst_var;
 
          dst_var = dict_create_var_assert (dataset_dict (ds), dv->z_name, 0);
-          var_set_label (dst_var, xasprintf (_("Z-score of %s"),
-                                             var_to_string (dv->v)),
-                         dict_get_encoding (dataset_dict (ds)), false);
+          var_set_label (dst_var,
+                         xasprintf (_("Z-score of %s"),var_to_string (dv->v)),
+                         false);
 
           z = &t->z_scores[cnt++];
           z->src_var = dv->v;
@@ -914,7 +914,7 @@ display (struct dsc_proc *dsc)
       size_t j;
 
       nc = 0;
-      tab_text (t, nc++, i + 1, TAB_LEFT, var_get_name (dv->v));
+      tab_text (t, nc++, i + 1, TAB_LEFT, var_to_string (dv->v));
       tab_text_format (t, nc++, i + 1, 0, "%g", dv->valid);
       if (dsc->format == DSC_SERIAL)
        tab_text_format (t, nc++, i + 1, 0, "%g", dv->missing);