Get Bison to build again when configured with --enable-gcc-warnings.

* src/location.c, src/location.h, src/main.c, src/scan-code.l: Add some
missing #include's.
* src/scan-code.l (handle_action_dollar, handle_action_at): Rename
loc argument as it shadows a global.
* src/scan-gram.l: Remove stray comma that prevents boundary_set
invocation.

* src/.cvsignore: Add scan-code.c.

diff --git a/ChangeLog b/ChangeLog
index 5934557006e81e3b96ce303779b948929ffc1a05..a90a8a2780dcdeb79a54565eb0968351392029cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-06-07  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Get Bison to build again when configured with --enable-gcc-warnings.
+       * src/location.c, src/location.h, src/main.c, src/scan-code.l: Add some
+       missing #include's.
+       * src/scan-code.l (handle_action_dollar, handle_action_at): Rename
+       loc argument as it shadows a global.
+       * src/scan-gram.l: Remove stray comma that prevents boundary_set
+       invocation.
+
+       * src/.cvsignore: Add scan-code.c.
+
 2006-06-07  Akim Demaille  <akim@epita.fr>
 
        * src/scan-gram.l: Move the "add a trailing ; to actions" code

diff --git a/src/.cvsignore b/src/.cvsignore
index 2fa6d0ea316f25d6bb3b5c90421d674a705e9c07..3592ff017ff38042ac3b78e120cb522b69530226 100644 (file)
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -6,6 +6,7 @@ Makefile
 Makefile.in
 bison
 revision.c
+scan-code.c
 scan-gram.c
 scan-skel.c
 yacc

diff --git a/src/location.c b/src/location.c
index 2213f8104875c3504d0052a85920db53957f9f1c..4773163ff4346c999f85b56177b95b273ba773d1 100644 (file)
--- a/src/location.c
+++ b/src/location.c
@@ -21,8 +21,10 @@
 #include <config.h>
 #include "system.h"
 
+#include <mbswidth.h>
 #include <quotearg.h>
 
+#include "complain.h"
 #include "location.h"
 
 location const empty_location;

diff --git a/src/location.h b/src/location.h
index 542c632057276b29dd646fc40db7efd85ca47247..150b842f6db80e93c021d7f83d1f3cc5edf27e6d 100644 (file)
--- a/src/location.h
+++ b/src/location.h
@@ -21,6 +21,7 @@
 #ifndef LOCATION_H_
 # define LOCATION_H_
 
+# include <stdbool.h>
 # include "uniqstr.h"
 
 /* A boundary between two characters.  */

diff --git a/src/main.c b/src/main.c
index 4d7fd3319085bdf3c1d1f477393482c3d6511f22..acf139d2b553322bbed887f2d3496e667150f7c3 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -43,6 +43,7 @@
 #include "print_graph.h"
 #include "reader.h"
 #include "reduce.h"
+#include "scan-gram.h"
 #include "symtab.h"
 #include "tables.h"
 #include "uniqstr.h"

diff --git a/src/scan-code.l b/src/scan-code.l
index a24eecec0f6a362abd6eb551e859d13fff3ac9b3..2d128bfc749cadfd1987c2d15d29f55260b6663b 100644 (file)
--- a/src/scan-code.l
+++ b/src/scan-code.l
@@ -30,6 +30,7 @@
 #define code_wrap() 1
 
 #define FLEX_PREFIX(Id) code_ ## Id
+#include "complain.h"
 #include "flex-scanner.h"
 #include "reader.h"
 #include "getargs.h"
@@ -46,8 +47,8 @@ YY_DECL;
 
 #define YY_USER_ACTION  location_compute (loc, &loc->end, yytext, yyleng);
 
-static void handle_action_dollar (char *cp, location loc);
-static void handle_action_at (char *cp, location loc);
+static void handle_action_dollar (char *cp, location dollar_loc);
+static void handle_action_at (char *cp, location at_loc);
 static location the_location;
 static location *loc = &the_location;
 
@@ -234,7 +235,7 @@ int max_left_semantic_context = 0;
 `------------------------------------------------------------------*/
 
 static void
-handle_action_dollar (char *text, location loc)
+handle_action_dollar (char *text, location dollar_loc)
 {
   const char *type_name = NULL;
   char *cp = text + 1;
@@ -253,9 +254,9 @@ handle_action_dollar (char *text, location loc)
   if (*cp == '$')
     {
       if (!type_name)
-       type_name = symbol_list_n_type_name_get (current_rule, loc, 0);
+       type_name = symbol_list_n_type_name_get (current_rule, dollar_loc, 0);
       if (!type_name && typed)
-       complain_at (loc, _("$$ of `%s' has no declared type"),
+       complain_at (dollar_loc, _("$$ of `%s' has no declared type"),
                     current_rule->sym->tag);
       if (!type_name)
        type_name = "";
@@ -274,9 +275,10 @@ handle_action_dollar (char *text, location loc)
          if (1-n > max_left_semantic_context)
            max_left_semantic_context = 1-n;
          if (!type_name && n > 0)
-           type_name = symbol_list_n_type_name_get (current_rule, loc, n);
+           type_name =
+             symbol_list_n_type_name_get (current_rule, dollar_loc, n);
          if (!type_name && typed)
-           complain_at (loc, _("$%d of `%s' has no declared type"),
+           complain_at (dollar_loc, _("$%d of `%s' has no declared type"),
                         n, current_rule->sym->tag);
          if (!type_name)
            type_name = "";
@@ -286,7 +288,7 @@ handle_action_dollar (char *text, location loc)
          symbol_list_n_used_set (current_rule, n, true);
        }
       else
-       complain_at (loc, _("integer out of range: %s"), quote (text));
+       complain_at (dollar_loc, _("integer out of range: %s"), quote (text));
     }
 }
 
@@ -297,7 +299,7 @@ handle_action_dollar (char *text, location loc)
 `------------------------------------------------------*/
 
 static void
-handle_action_at (char *text, location loc)
+handle_action_at (char *text, location at_loc)
 {
   char *cp = text + 1;
   int rule_length = symbol_list_length (current_rule->next);
@@ -318,7 +320,7 @@ handle_action_at (char *text, location loc)
                          rule_length, n);
        }
       else
-       complain_at (loc, _("integer out of range: %s"), quote (text));
+       complain_at (at_loc, _("integer out of range: %s"), quote (text));
     }
 }
 

diff --git a/src/scan-gram.l b/src/scan-gram.l
index dbe40b9c13bc8ba6c81cf587037c8fb72c54b97a..36673c4671d4494faa88416398bfc48785c48158 100644 (file)
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -751,7 +751,7 @@ handle_syncline (char *args, location loc)
       lineno = INT_MAX;
     }
   current_file = uniqstr_new (file);
-  boundary_set, (&scanner_cursor, current_file, lineno, 1);
+  boundary_set (&scanner_cursor, current_file, lineno, 1);
 }