c++: coding style fixes

* data/lalr1.cc, tests/c++.at: Formatting changes.

diff --git a/data/lalr1.cc b/data/lalr1.cc
index d6ea50b73382cd9475162a3a6794f2c86703a3de..75eaf571e6c82afaa021c4245ac3b7fdcfa3d0e5 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -721,20 +721,20 @@ b4_dollar_popdef])[]dnl
       {
         YYCDEBUG << "Reading a token: ";
         try
       {
         YYCDEBUG << "Reading a token: ";
         try

-        {
+          {

 ]b4_lex_symbol_if(
 ]b4_lex_symbol_if(

-[          yyla = b4_function_call([yylex], [symbol_type],
+[            yyla = b4_function_call([yylex], [symbol_type],

                                      m4_ifdef([b4_lex_param], b4_lex_param));],
                                      m4_ifdef([b4_lex_param], b4_lex_param));],

-[          yyla.type = yytranslate_ (b4_function_call([yylex], [int],
+[            yyla.type = yytranslate_ (b4_function_call([yylex], [int],

                                      [b4_api_PREFIX[STYPE*], [&yyla.value]][]dnl
 b4_locations_if([, [[location*], [&yyla.location]]])dnl
 m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
                                      [b4_api_PREFIX[STYPE*], [&yyla.value]][]dnl
 b4_locations_if([, [[location*], [&yyla.location]]])dnl
 m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[

-        }
+          }

         catch (const syntax_error& yyexc)
         catch (const syntax_error& yyexc)

-        {
-          error (yyexc);
-          goto yyerrlab1;
-        }
+          {
+            error (yyexc);
+            goto yyerrlab1;
+          }

         yyempty = false;
       }
     YY_SYMBOL_PRINT ("Next token is", yyla);
         yyempty = false;
       }
     YY_SYMBOL_PRINT ("Next token is", yyla);


@@ -807,19 +807,19 @@ m4_ifdef([b4_lex_param], [, ]b4_lex_param)));])[
     // Perform the reduction.
     YY_REDUCE_PRINT (yyn);
     try
     // Perform the reduction.
     YY_REDUCE_PRINT (yyn);
     try

-    {
-      switch (yyn)

       {
       {

+        switch (yyn)
+          {

 ]b4_user_actions[
 ]b4_user_actions[

-        default:
-          break;
+          default:
+            break;
+          }

       }
       }

-    }

     catch (const syntax_error& yyexc)
     catch (const syntax_error& yyexc)

-    {
-      error (yyexc);
-      YYERROR;
-    }
+      {
+        error (yyexc);
+        YYERROR;
+      }

     YY_SYMBOL_PRINT ("-> $$ =", yylhs);
 ]b4_variant_if([[
     // Destroy the rhs symbols.
     YY_SYMBOL_PRINT ("-> $$ =", yylhs);
 ]b4_variant_if([[
     // Destroy the rhs symbols.

diff --git a/tests/c++.at b/tests/c++.at
index 155f2de602c9c71a09274124926d9c40207fa402..288ff8651e8b7761643ea9832457bc424493de67 100644 (file)
--- a/tests/c++.at
+++ b/tests/c++.at
@@ -66,7 +66,7 @@ typedef std::list<std::string> strings_type;
     operator<<(std::ostream& o, const strings_type& s)
     {
       o << '(';
     operator<<(std::ostream& o, const strings_type& s)
     {
       o << '(';

-      for (strings_type::const_iterator i = s.begin(); i != s.end (); ++i)
+      for (strings_type::const_iterator i = s.begin (); i != s.end (); ++i)

         {
           if (i != s.begin ())
             o << ", ";
         {
           if (i != s.begin ())
             o << ", ";


@@ -84,7 +84,7 @@ typedef std::list<std::string> strings_type;
   {
     std::ostringstream o;
     o << t;
   {
     std::ostringstream o;
     o << t;

-    return o.str();
+    return o.str ();

   }
 }
 
   }
 }
 


@@ -98,7 +98,7 @@ typedef std::list<std::string> strings_type;
 // digraph for the left square bracket.
 %type <::std::list<std::string>> list result;
 
 // digraph for the left square bracket.
 %type <::std::list<std::string>> list result;
 

-%printer { debug_stream() << $][$; }
+%printer { yyo << $][$; }

   <int> <::std::string> <::std::list<std::string>>;
 %%
 
   <int> <::std::string> <::std::list<std::string>>;
 %%
 


@@ -108,23 +108,23 @@ result:
 
 list:
   /* nothing */ { /* Generates an empty string list */ }
 
 list:
   /* nothing */ { /* Generates an empty string list */ }

-| list item     { std::swap($][$,$][1); $$.push_back($][2); }
-| list error    { std::swap($][$,$][1); }
+| list item     { std::swap ($][$,$][1); $$.push_back ($][2); }
+| list error    { std::swap ($][$,$][1); }

 ;
 
 item:
 ;
 
 item:

-  TEXT          { std::swap($][$,$][1); }
-| NUMBER        { if ($][1 == 3) YYERROR; else $][$ = string_cast($][1); }
+  TEXT          { std::swap ($][$,$][1); }
+| NUMBER        { if ($][1 == 3) YYERROR; else $][$ = string_cast ($][1); }

 ;
 %%
 
 #define STAGE_MAX 5
 static
 #if defined USE_LEX_SYMBOL
 ;
 %%
 
 #define STAGE_MAX 5
 static
 #if defined USE_LEX_SYMBOL

-yy::parser::symbol_type yylex()
+yy::parser::symbol_type yylex ()

 #else
 #else

-yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
-                             yy::parser::location_type* yylloc)
+yy::parser::token_type yylex (yy::parser::semantic_type* yylval,
+                              yy::parser::location_type* yylloc)

 #endif
 {
 #ifndef USE_LEX_SYMBOL
 #endif
 {
 #ifndef USE_LEX_SYMBOL


@@ -148,7 +148,7 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
       return yy::parser::make_NUMBER (stage, location_type ());
 #else
 # if defined ONE_STAGE_BUILD
       return yy::parser::make_NUMBER (stage, location_type ());
 #else
 # if defined ONE_STAGE_BUILD

-      yylval->build(stage);
+      yylval->build (stage);

 # else
       yylval->build<int>() = stage;
 # endif
 # else
       yylval->build<int>() = stage;
 # endif


@@ -170,12 +170,12 @@ yy::parser::token_type yylex(yy::parser::semantic_type* yylval,
       return token::TEXT;
 #endif
     }
       return token::TEXT;
 #endif
     }

-  abort();
+  abort ();

 }
 
 void
 }
 
 void

-yy::parser::error(const yy::parser::location_type&,
-                  const std::string& message)
+yy::parser::error (const yy::parser::location_type&,
+                   const std::string& message)

 {
   std::cerr << message << std::endl;
 }
 {
   std::cerr << message << std::endl;
 }


@@ -184,8 +184,8 @@ int
 main ()
 {
   yy::parser p;
 main ()
 {
   yy::parser p;

-  p.set_debug_level(!!getenv("YYDEBUG"));
-  return p.parse();
+  p.set_debug_level (!!getenv ("YYDEBUG"));
+  return p.parse ();

 }
 ]])
 
 }
 ]])
 


@@ -487,7 +487,7 @@ item:
   'a'
 | 's'
   {
   'a'
 | 's'
   {

-    throw yy::parser::syntax_error("invalid expression");
+    throw yy::parser::syntax_error ("invalid expression");

   }
 
 %%
   }
 
 %%


@@ -500,7 +500,7 @@ yylex (yy::parser::semantic_type *)
   switch (int res = *input++)
   {
     case 'l':
   switch (int res = *input++)
   {
     case 'l':

-      throw yy::parser::syntax_error("invalid character");
+      throw yy::parser::syntax_error ("invalid character");

     default:
       return res;
   }
     default:
       return res;
   }


@@ -516,7 +516,7 @@ int
 main ()
 {
   yy::parser parser;
 main ()
 {
   yy::parser parser;

-  parser.set_debug_level(!!getenv("YYDEBUG"));
+  parser.set_debug_level (!!getenv ("YYDEBUG"));

   return parser.parse ();
 }
 ]])
   return parser.parse ();
 }
 ]])