tests/automake.mk: Fix building of test runners

[pspp] / src / language / lexer / subcommand-list.c

diff --git a/src/language/lexer/subcommand-list.c b/src/language/lexer/subcommand-list.c
index 4efadf79635e3d02f24f0ab36283cc0e48d43972..33deac0bb69c97d2277586752c17d8236790674d 100644 (file)
--- a/src/language/lexer/subcommand-list.c
+++ b/src/language/lexer/subcommand-list.c
@@ -1,29 +1,28 @@
-/* subclist - lists for PSPP subcommands
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2004, 2011 Free Software Foundation, Inc.
 
-Copyright (C) 2004 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 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 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 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. */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 
 #include <config.h>
-#include "subcommand-list.h"
+#include "language/lexer/subcommand-list.h"
 #include <stdlib.h>
-#include "xalloc.h"
+#include "language/lexer/lexer.h"
+#include "gl/xalloc.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
 
 /* I call these objects `lists' but they are in fact simple dynamic arrays */
 
@@ -52,7 +51,7 @@ subc_list_double_push(subc_list_double *l, double d)
 {
   l->data[l->n_data++] = d;
 
-  if (l->n_data >= l->sz ) 
+  if (l->n_data >= l->sz)
     {
       l->sz += CHUNKSIZE;
       l->data = xnrealloc (l->data, l->sz, sizeof *l->data);
@@ -65,7 +64,7 @@ subc_list_int_push(subc_list_int *l, int d)
 {
   l->data[l->n_data++] = d;
 
-  if (l->n_data >= l->sz ) 
+  if (l->n_data >= l->sz)
     {
       l->sz += CHUNKSIZE;
       l->data = xnrealloc (l->data, l->sz, sizeof *l->data);
@@ -74,13 +73,13 @@ subc_list_int_push(subc_list_int *l, int d)
 }
 
 /* Return the number of items in the list */
-int 
+int
 subc_list_double_count(const subc_list_double *l)
 {
   return l->n_data;
 }
 
-int 
+int
 subc_list_int_count(const subc_list_int *l)
 {
   return l->n_data;
@@ -112,3 +111,10 @@ subc_list_int_destroy(subc_list_int *l)
 {
   free(l->data);
 }
+
+void
+subc_list_error (struct lexer *lexer, const char *sbc, int max_list)
+{
+  lex_error (lexer, _("No more than %d %s subcommands allowed."),
+             max_list, sbc);
+}