q2c: Use new subc_list_error() to report too many subcommands.

This removes one string from q2c.c that needs translation but
cannot currently be translated.

diff --git a/src/language/lexer/q2c.c b/src/language/lexer/q2c.c
index 5473e1120946c1ed14a5ae95f89c5c2e21edfd37..e38be02a605c9861e8c015847b7c692abb190136 100644 (file)
--- a/src/language/lexer/q2c.c
+++ b/src/language/lexer/q2c.c
@@ -1745,7 +1745,8 @@ dump_subcommand (const subcommand *sbc)
     {
       dump (0, "if ( p->sbc_%s > MAXLISTS)",st_lower(sbc->name));
       dump (1, "{");
-      dump (0, "msg (SE, \"No more than %%d %s subcommands allowed\",MAXLISTS);",st_lower(sbc->name));
+      dump (0, "subc_list_error (lexer, \"%s\", MAXLISTS);",
+            st_lower(sbc->name));
       dump (0, "goto lossage;");
       dump (-1,"}");
 

diff --git a/src/language/lexer/subcommand-list.c b/src/language/lexer/subcommand-list.c
index 5cec533c965756a80782eff1ae753ffe99fa33fd..289179b239eef2029662eb1060ecaf7153420ae2 100644 (file)
--- a/src/language/lexer/subcommand-list.c
+++ b/src/language/lexer/subcommand-list.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 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
@@ -16,9 +16,13 @@
 
 
 #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 */
 
@@ -107,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);
+}

diff --git a/src/language/lexer/subcommand-list.h b/src/language/lexer/subcommand-list.h
index 74c53da2913f9f0299048042f2c5868b3322412b..8d664f5665de749fdaf294c0a2f95917743aab6f 100644 (file)
--- a/src/language/lexer/subcommand-list.h
+++ b/src/language/lexer/subcommand-list.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 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
@@ -24,6 +24,7 @@
    It is intended for use by the command line parser for list subcommands
 */
 
+struct lexer;
 
 struct subc_list_double {
   double *data ;
@@ -61,5 +62,6 @@ int subc_list_int_count(const subc_list_int *l);
 void subc_list_double_destroy(subc_list_double *l) ;
 void subc_list_int_destroy(subc_list_int *l) ;
 
+void subc_list_error (struct lexer *, const char *sbc, int max_list);
 
 #endif