From ba0c52882d67395aec4548ab909868b765f4656a Mon Sep 17 00:00:00 2001
From: Alexandre Bique <bique.alexandre@gmail.com>
Date: Tue, 10 Mar 2009 00:14:19 +0000
Subject: [PATCH] suppressed some warnings

---
 src/ast/generator-ascii-visitor.cc      |  9 +++++----
 src/ast/generator-browse-visitor.cc     |  4 +++-
 src/lang/mugiwara/bison-parser/parser.y | 21 ++++++++++++---------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/ast/generator-ascii-visitor.cc b/src/ast/generator-ascii-visitor.cc
index 87d268b..679c7c0 100644
--- a/src/ast/generator-ascii-visitor.cc
+++ b/src/ast/generator-ascii-visitor.cc
@@ -90,7 +90,6 @@ generateAsciiVisitorSource(const char * working_directory)
   {
     out << "  void AsciiVisitor::visit(const " << node->name << " & node)" NL
         << "  {" NL
-        << "    int i;" NL
         << "    std::string oldName = name_;" NL
         << "    std::string oldPrefix = prefix_;" NL NL
         << "    ++depth_;" NL
@@ -115,8 +114,9 @@ generateAsciiVisitorSource(const char * working_directory)
             << "    }" NL;
       else if (ag::isVectorOfNode(attr->type))
       {
-        out << "    i = 0;" NL
-            << "    if (node." << attr->name << ")" NL
+        out << "    if (node." << attr->name << ")" NL
+            << "    {" NL
+            << "      int i = 0;" NL NL
             << "      BOOST_FOREACH(Node * n, (*node." << attr->name << "))" NL
             << "      {" NL
             << "        std::stringstream ss;" NL
@@ -134,7 +134,8 @@ generateAsciiVisitorSource(const char * working_directory)
               << "          prefix_.append(\"   |\");" NL;
         out << "        n->accept(*this);" NL
             << "        i++;" NL
-            << "      }" NL;
+            << "      }" NL
+            << "    }" NL;
       }
       else if (ag::isPrintable(attr->type))
         out << "    std::cout << oldPrefix << \"   "
diff --git a/src/ast/generator-browse-visitor.cc b/src/ast/generator-browse-visitor.cc
index 8cc9827..60cf87a 100644
--- a/src/ast/generator-browse-visitor.cc
+++ b/src/ast/generator-browse-visitor.cc
@@ -98,13 +98,15 @@ generateBrowseVisitorSource(const char * working_directory)
             << "      node." << attr->name << "->accept(*this);" NL;    \
       else if (ag::isVectorOfNode(attr->type))                          \
         out << "    if (node." << attr->name << ")" NL                  \
+            << "    {" NL                                               \
             << "      BOOST_FOREACH(Node * n, (*node." << attr->name    \
             << ")) {" NL                                                \
             << "        assert(n);" NL                                  \
             << "        parent_ = &node;" NL                            \
             << "        this_ = &n;" NL                                 \
             << "        n->accept(*this);" NL                           \
-            << "      }" NL;                                            \
+            << "      }" NL                                             \
+            << "    }";                                                 \
     }                                                                   \
                                                                         \
     out << "  }" NL NL;                                                 \
diff --git a/src/lang/mugiwara/bison-parser/parser.y b/src/lang/mugiwara/bison-parser/parser.y
index 8e09a18..e9f3e74 100644
--- a/src/lang/mugiwara/bison-parser/parser.y
+++ b/src/lang/mugiwara/bison-parser/parser.y
@@ -21,14 +21,17 @@
 #include "parser.hh"
 #include "lexer.hh"
 
-static void yyerror(YYLTYPE *yyloccp, yyscan_t yyscanner, ast::File *& file, const char *str)
-{
-  if (file)
-    std::cerr << file->path << ":" ;
-  std::cerr << yyloccp->first_line << "." << yyloccp->first_column << "-"
-            << yyloccp->last_line << "." << yyloccp->last_column
-            << ": " << str << std::endl;
-}
+  static void yyerror(YYLTYPE       *yyloccp,
+                      yyscan_t      /*yyscanner*/,
+                      ast::File *&  file,
+                      const char    *str)
+  {
+    if (file)
+      std::cerr << file->path << ":" ;
+    std::cerr << yyloccp->first_line << "." << yyloccp->first_column << "-"
+              << yyloccp->last_line << "." << yyloccp->last_column
+              << ": " << str << std::endl;
+  }
 
 #define MAKE_BINARY_EXP(Type, Out, Left, Right)    \
   do {                                             \
@@ -68,7 +71,7 @@ createType(const char * name)
     { "uint64", false, 64 },
     { "int128", true, 128 },
     { "uint128", false, 128 },
-    { 0 }
+    { 0, false, 0 }
   };
 
   for (int i = 0; integerTypes[i].name; i++)
-- 
2.11.4.GIT