X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fprint.c;h=8cb7b1d432d92f2bac609ad108d9c6a0894ef899;hb=f1696fab032a5ae5c44e3a3dedba343fce9ffd5c;hp=b2ef755cf11bc3fde5f53b158d0e65e0f49604f2;hpb=b321086267ad1014dc5d09886396cde30f094437;p=pspp

diff --git a/src/print.c b/src/print.c
index b2ef755cf1..8cb7b1d432 100644
--- a/src/print.c
+++ b/src/print.c
@@ -27,7 +27,7 @@
 #include "command.h"
 #include "dfm-write.h"
 #include "error.h"
-#include "expr.h"
+#include "expressions/public.h"
 #include "file-handle.h"
 #include "lexer.h"
 #include "misc.h"
@@ -287,7 +287,7 @@ parse_specs (void)
 	  int prev_recno = fx.recno;
 
 	  fx.recno++;
-	  if (token == T_NUM)
+	  if (lex_is_number ())
 	    {
 	      if (!lex_force_int ())
 		return 0;
@@ -349,7 +349,7 @@ parse_string_argument (void)
   lex_get ();
 
   /* Parse the included column range. */
-  if (token == T_NUM)
+  if (lex_is_number ())
     {
       /* Width of column range in characters. */
       int c_len;
@@ -360,7 +360,7 @@ parse_string_argument (void)
       /* 1-based index of last column in range. */
       int lc;
 
-      if (!lex_integer_p () || lex_integer () <= 0)
+      if (!lex_is_integer () || lex_integer () <= 0)
 	{
 	  msg (SE, _("%g is not a valid column location."), tokval);
 	  goto fail;
@@ -371,7 +371,7 @@ parse_string_argument (void)
       lex_negative_to_dash ();
       if (lex_match ('-'))
 	{
-	  if (!lex_integer_p ())
+	  if (!lex_is_integer ())
 	    {
 	      msg (SE, _("Column location expected following `%d-'."),
 		   fx.spec.fc + 1);
@@ -434,7 +434,7 @@ parse_variable_argument (void)
   if (!parse_variables (default_dict, &fx.v, &fx.nv, PV_DUPLICATE))
     return 0;
 
-  if (token == T_NUM)
+  if (lex_is_number ())
     {
       if (!fixed_parse_compatible ())
 	goto fail;
@@ -553,7 +553,7 @@ fixed_parse_compatible (void)
       else
 	fx.spec.u.v.f.type = FMT_F;
 
-      if (token == T_NUM)
+      if (lex_is_number ())
 	{
 	  if (!lex_force_int ())
 	    return 0;
@@ -599,7 +599,7 @@ fixed_parse_compatible (void)
 
   dividend = (fx.lc - fx.fc + 1) / fx.nv;
   fx.spec.u.v.f.w = dividend;
-  if (!check_output_specifier (&fx.spec.u.v.f))
+  if (!check_output_specifier (&fx.spec.u.v.f, 1))
     return 0;
   if ((type == ALPHA) ^ (formats[fx.spec.u.v.f.type].cat & FCAT_STRING))
     {
@@ -727,9 +727,9 @@ fixed_parse_fortran (void)
       else
 	head = fl = xmalloc (sizeof *fl);
 
-      if (token == T_NUM)
+      if (lex_is_number ())
 	{
-	  if (!lex_integer_p ())
+	  if (!lex_is_integer ())
 	    goto fail;
 	  fl->count = lex_integer ();
 	  lex_get ();
@@ -748,8 +748,8 @@ fixed_parse_fortran (void)
 	}
       else if (lex_match ('/'))
 	fl->f.type = FMT_NEWREC;
-      else if (!parse_format_specifier (&fl->f, 1)
-	       || !check_output_specifier (&fl->f))
+      else if (!parse_format_specifier (&fl->f, FMTP_ALLOW_XT)
+	       || !check_output_specifier (&fl->f, 1))
 	goto fail;
 
       lex_match (',');
@@ -977,9 +977,10 @@ print_trns_proc (struct trns_header * trns, struct ccase * c,
 static void
 print_trns_free (struct trns_header * t)
 {
+  struct print_trns *prt = (struct print_trns *) t;
   struct prt_out_spec *i, *n;
 
-  for (i = ((struct print_trns *) t)->spec; i; i = n)
+  for (i = prt->spec; i; i = n)
     {
       switch (i->type)
 	{
@@ -998,7 +999,9 @@ print_trns_free (struct trns_header * t)
       n = i->next;
       free (i);
     }
-  free (((struct print_trns *) t)->line);
+  if (prt->writer != NULL)
+    dfm_close_writer (prt->writer);
+  free (prt->line);
 }
 
 /* PRINT SPACE. */
@@ -1038,7 +1041,7 @@ cmd_print_space (void)
 
   if (token != '.')
     {
-      e = expr_parse (EXPR_NUMERIC);
+      e = expr_parse (default_dict, EXPR_NUMBER);
       if (token != '.')
 	{
 	  expr_free (e);
@@ -1079,25 +1082,18 @@ print_space_trns_proc (struct trns_header * trns, struct ccase * c,
                        int case_num UNUSED)
 {
   struct print_space_trns *t = (struct print_space_trns *) trns;
-  int n;
+  double n = 1.;
 
   if (t->e)
     {
-      union value v;
-
-      expr_evaluate (t->e, c, case_num, &v);
-      n = v.f;
-      if (n < 0)
-	{
-	  msg (SW, _("The expression on PRINT SPACE evaluated to %d.  It's "
-		     "not possible to PRINT SPACE a negative number of "
-		     "lines."),
-	       n);
-	  n = 1;
-	}
+      n = expr_evaluate_num (t->e, c, case_num);
+      if (n == SYSMIS) 
+        msg (SW, _("The expression on PRINT SPACE evaluated to the "
+                   "system-missing value."));
+      else if (n < 0)
+        msg (SW, _("The expression on PRINT SPACE evaluated to %g."), n);
+      n = 1.;
     }
-  else
-    n = 1;
 
   if (t->writer == NULL)
     while (n--)