Pass command line location to skeleton_arg and language_argmatch.

	* src/getargs.h, src/getargs.c (skeleton_arg, language_argmatch):
	The location argument is now mandatory.
	Adjust all dependencies.
	(getargs): Use command_line_location.

diff --git a/ChangeLog b/ChangeLog
index e7fb5418239d1c02ad6426580dc62a0f36ab5450..e7b3f1c3272918f3fecf2ac1f8b3492f59a48a30 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-07  Akim Demaille  <demaille@gostai.com>
+
+       Pass command line location to skeleton_arg and language_argmatch.
+       * src/getargs.h, src/getargs.c (skeleton_arg, language_argmatch):
+       The location argument is now mandatory.
+       Adjust all dependencies.
+       (getargs): Use command_line_location.
+
 2008-11-07  Akim Demaille  <demaille@gostai.com>
 
        -D, --define.

diff --git a/src/getargs.c b/src/getargs.c
index ae54f81c050f6e69e233722a216aca9fd3453743..a8d1c5480ddb519257ff353e05b673daea27fc44 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -361,7 +361,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 `--------------------------------------*/
 
 void
-skeleton_arg (char const *arg, int prio, location const *loc)
+skeleton_arg (char const *arg, int prio, location loc)
 {
   if (prio < skeleton_prio)
     {
@@ -372,15 +372,12 @@ skeleton_arg (char const *arg, int prio, location const *loc)
     {
       char const *msg =
        _("multiple skeleton declarations are invalid");
-      if (loc)
-       complain_at (*loc, msg);
-      else
-       complain (msg);
+      complain_at (loc, msg);
     }
 }
 
 void
-language_argmatch (char const *arg, int prio, location const *loc)
+language_argmatch (char const *arg, int prio, location loc)
 {
   char const *msg;
 
@@ -401,10 +398,7 @@ language_argmatch (char const *arg, int prio, location const *loc)
   else
     return;
 
-  if (loc)
-    complain_at (*loc, msg, arg);
-  else
-    complain (msg, arg);
+  complain_at (loc, msg, arg);
 }
 
 /*----------------------.
@@ -546,11 +540,13 @@ getargs (int argc, char *argv[])
        break;
 
       case 'L':
-       language_argmatch (optarg, command_line_prio, NULL);
+       language_argmatch (optarg, command_line_prio,
+                          command_line_location ());
        break;
 
       case 'S':
-       skeleton_arg (AS_FILE_NAME (optarg), command_line_prio, NULL);
+       skeleton_arg (AS_FILE_NAME (optarg), command_line_prio,
+                     command_line_location ());
        break;
 
       case 'T':

diff --git a/src/getargs.h b/src/getargs.h
index eb7f448e2f0b56c1000076a9cf12fe8cf196c262..8d27e7175d12317a5fc974955ea1a75b09e1a8fe 100644 (file)
--- a/src/getargs.h
+++ b/src/getargs.h
@@ -135,7 +135,7 @@ extern int warnings_flag;
 void getargs (int argc, char *argv[]);
 
 /* Used by parse-gram.y.  */
-void language_argmatch (char const *arg, int prio, location const *loc);
-void skeleton_arg (const char *arg, int prio, location const *loc);
+void language_argmatch (char const *arg, int prio, location loc);
+void skeleton_arg (const char *arg, int prio, location loc);
 
 #endif /* !GETARGS_H_ */

diff --git a/src/parse-gram.c b/src/parse-gram.c
index b7938dcd98a0a1cfeb58f84c8923da933847fd3d..516e4f4baba666f2bdd687f8d547c4cf839e7a71 100644 (file)
--- a/src/parse-gram.c
+++ b/src/parse-gram.c
@@ -1994,7 +1994,10 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 257 "parse-gram.y"
-    { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, &(yylsp[(1) - (2)])); }
+    { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
+
+/* Line 1457 of yacc.c  */
+#line 2036 "../../../src/parse-gram.c"
     break;
 
   case 19:
@@ -2110,7 +2113,7 @@ yyreduce:
           skeleton_user = uniqstr_new (skeleton_build);
           free (skeleton_build);
         }
-      skeleton_arg (skeleton_user, grammar_prio, &(yylsp[(1) - (2)]));
+      skeleton_arg (skeleton_user, grammar_prio, (yylsp[(1) - (2)]));
     }
     break;
 

diff --git a/src/parse-gram.y b/src/parse-gram.y
index a8526b24ed0badb03ba9f621397447dd00cb6d1b..83b02e36b630e9c477cc11dcc3711629299fbadc 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -254,7 +254,7 @@ prologue_declaration:
       muscle_code_grow ("initial_action", action.code, @2);
       code_scanner_last_string_free ();
     }
-| "%language" STRING           { language_argmatch ($2, grammar_prio, &@1); }
+| "%language" STRING           { language_argmatch ($2, grammar_prio, @1); }
 | "%lex-param" "{...}"         { add_param ("lex_param", $2, @2); }
 | "%locations"                  { locations_flag = true; }
 | "%name-prefix" STRING         { spec_name_prefix = $2; }
@@ -300,7 +300,7 @@ prologue_declaration:
           skeleton_user = uniqstr_new (skeleton_build);
           free (skeleton_build);
         }
-      skeleton_arg (skeleton_user, grammar_prio, &@1);
+      skeleton_arg (skeleton_user, grammar_prio, @1);
     }
 | "%token-table"                { token_table_flag = true; }
 | "%verbose"                    { report_flag |= report_states; }