X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fmissing-values.c;h=950abc1528115c0b123fa40568c85f60a770b2ac;hb=d4fdb8d1a601d45340fc29f0af38f0aef151fb0b;hp=6a5864a57c89f6dab9d2af348a6e9c3e375c113d;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp
diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c
index 6a5864a57c..950abc1528 100644
--- a/src/language/dictionary/missing-values.c
+++ b/src/language/dictionary/missing-values.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000, 2006 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
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., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
@@ -25,11 +23,11 @@
#include
#include
#include
+#include
#include
#include
#include
#include
-#include
#include
#include
#include
@@ -50,7 +48,7 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
{
size_t i;
- if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
+ if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
goto done;
if (!lex_match (lexer, '('))
@@ -62,7 +60,7 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
for (i = 0; i < nv; i++)
var_clear_missing_values (v[i]);
- if (!lex_match (lexer, ')'))
+ if (!lex_match (lexer, ')'))
{
struct missing_values mv;
@@ -77,7 +75,7 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
goto done;
}
- if (var_is_numeric (v[0]))
+ if (var_is_numeric (v[0]))
{
mv_init (&mv, 0);
while (!lex_match (lexer, ')'))
@@ -88,32 +86,32 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
if (!parse_num_range (lexer, &x, &y, &type))
goto done;
-
+
ok = (x == y
? mv_add_num (&mv, x)
- : mv_add_num_range (&mv, x, y));
+ : mv_add_range (&mv, x, y));
if (!ok)
deferred_errors = true;
lex_match (lexer, ',');
}
}
- else
+ else
{
struct string value;
mv_init (&mv, MAX_SHORT_STRING);
- while (!lex_match (lexer, ')'))
+ while (!lex_match (lexer, ')'))
{
if (!lex_force_string (lexer))
{
deferred_errors = true;
break;
}
-
+
ds_init_string (&value, lex_tokstr (lexer));
- if (ds_length (&value) > MAX_SHORT_STRING)
+ if (ds_length (&value) > MAX_SHORT_STRING)
{
ds_truncate (&value, MAX_SHORT_STRING);
msg (SE, _("Truncating missing value to short string "
@@ -131,12 +129,12 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
lex_match (lexer, ',');
}
}
-
- for (i = 0; i < nv; i++)
+
+ for (i = 0; i < nv; i++)
{
- if (mv_is_resizable (&mv, var_get_width (v[i])))
+ if (mv_is_resizable (&mv, var_get_width (v[i])))
var_set_missing_values (v[i], &mv);
- else
+ else
{
msg (SE, _("Missing values provided are too long to assign "
"to variable of width %d."),
@@ -151,7 +149,7 @@ cmd_missing_values (struct lexer *lexer, struct dataset *ds)
v = NULL;
}
retval = lex_end_of_command (lexer);
-
+
done:
free (v);
if (deferred_errors)