X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmis-val.c;h=68d642a09c2ed3f9c355a061d168d5c4cf0d46f4;hb=4fdeb2145d081ff1b84e3f6c99f9d1c048c0d64a;hp=f388583a33483d73f35d4366ece8b3b44ffbc5e7;hpb=92bfefccd465052e492f669ce561aa25b0110283;p=pspp diff --git a/src/mis-val.c b/src/mis-val.c index f388583a33..68d642a09c 100644 --- a/src/mis-val.c +++ b/src/mis-val.c @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ #include #include "error.h" @@ -29,10 +29,6 @@ #include "debug-print.h" -#if DEBUGGING -static void debug_print (); -#endif - /* Variables on MIS VAL. */ static struct variable **v; static int nv; @@ -86,10 +82,6 @@ cmd_missing_values (void) free (v); } -#if 0 && DEBUGGING - debug_print (); -#endif - return lex_end_of_command (); fail: @@ -161,7 +153,7 @@ parse_num_or_range (struct num_or_range * nor) nor->d[0] = LOWEST; nor->d[1] = tokval; } - else if (token == T_NUM) + else if (lex_is_number ()) { nor->d[0] = tokval; lex_get (); @@ -351,51 +343,3 @@ copy_missing_values (struct variable *dest, const struct variable *src) memcpy (dest->missing[i].s, src->missing[i].s, src->width); } } - - -/* Debug output. */ - -#if 0 && DEBUGGING -static void -debug_print (void) -{ - int i, j; - - puts (_("Missing value:")); - for (i = 0; i < nvar; i++) - { - printf (" %8s: ", var[i]->name); - if (var[i]->type == ALPHA && var[i]->nv > 1) - puts (_("(long string variable)")); - else - switch (var[i]->miss_type) - { - case MISSING_NONE: - printf (_("(no missing values)\n")); - break; - case MISSING_1: - case MISSING_2: - case MISSING_3: - printf ("(MISSING_%d)", var[i]->miss_type); - for (j = 0; j < var[i]->miss_type; j++) - if (var[i]->type == ALPHA) - printf (" \"%.*s\"", var[i]->width, var[i]->missing[j].s); - else - printf (" %.2g", var[i]->missing[j].f); - printf ("\n"); - break; - case MISSING_RANGE: - printf ("(MISSING_RANGE) %.2g THRU %.2g\n", - var[i]->missing[0].f, var[i]->missing[1].f); - break; - case MISSING_RANGE_1: - printf ("(MISSING_RANGE_1) %.2g THRU %.2g, %.2g\n", - var[i]->missing[0].f, var[i]->missing[1].f, - var[i]->missing[2].f); - break; - default: - printf (_("(!!!INTERNAL ERROR--%d!!!)\n"), var[i]->miss_type); - } - } -} -#endif /* DEBUGGING */