[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] Changes to pspp/src/print.c
From: |
Ben Pfaff |
Subject: |
[Pspp-cvs] Changes to pspp/src/print.c |
Date: |
Sun, 06 Mar 2005 22:04:54 -0500 |
Index: pspp/src/print.c
diff -u pspp/src/print.c:1.17 pspp/src/print.c:1.18
--- pspp/src/print.c:1.17 Tue Mar 1 08:16:15 2005
+++ pspp/src/print.c Mon Mar 7 03:04:50 2005
@@ -287,7 +287,7 @@
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 @@
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 @@
/* 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 @@
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 @@
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 @@
else
fx.spec.u.v.f.type = FMT_F;
- if (token == T_NUM)
+ if (lex_is_number ())
{
if (!lex_force_int ())
return 0;
@@ -727,9 +727,9 @@
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 ();