lexer: New function lex_force_int_range().

[pspp] / src / language / xforms / sample.c

diff --git a/src/language/xforms/sample.c b/src/language/xforms/sample.c
index 693f84477e51476f41770299d4207cd1a8b5478a..7184562ef2943fd060357450adee5f600658c529 100644 (file)
--- a/src/language/xforms/sample.c
+++ b/src/language/xforms/sample.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009-2011 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
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "data/procedure.h"
+#include "data/dataset.h"
 #include "data/variable.h"
 #include "language/command.h"
 #include "language/lexer/lexer.h"
@@ -88,17 +88,9 @@ cmd_sample (struct lexer *lexer, struct dataset *ds)
       lex_get (lexer);
       if (!lex_force_match_id (lexer, "FROM"))
        return CMD_FAILURE;
-      if (!lex_force_int (lexer))
+      if (!lex_force_int_range (lexer, "FROM", a + 1, INT_MAX))
        return CMD_FAILURE;
       b = lex_integer (lexer);
-      if (a >= b)
-       {
-         msg (SE, _("Cannot sample %d observations from a population of "
-                    "%d."),
-              a, b);
-         return CMD_FAILURE;
-       }
-
       frac = 0;
     }
   lex_get (lexer);
@@ -111,7 +103,7 @@ cmd_sample (struct lexer *lexer, struct dataset *ds)
   trns->frac = frac;
   add_transformation (ds, sample_trns_proc, sample_trns_free, trns);
 
-  return lex_end_of_command (lexer);
+  return CMD_SUCCESS;
 }
 
 /* Executes a SAMPLE transformation. */