From: Akim Demaille <akim@lrde.epita.fr>
Date: Tue, 11 Aug 2015 09:18:46 +0000 (+0200)
Subject: c++: style: remove useless "inline" and fix space issues
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/b809770efbf7987e7ed9bf9e8a4ee924ce532e76

c++: style: remove useless "inline" and fix space issues

* data/lalr1.cc, data/c++.m4: Formatting changes.
* data/stack.hh: Remove useless "inline".
Add documentation.
* data/location.cc: Prefer {} for empty bodies.
---

diff --git a/data/c++.m4 b/data/c++.m4
index d176e1a2..19bfcd2d 100644
--- a/data/c++.m4
+++ b/data/c++.m4
@@ -304,7 +304,6 @@ m4_define([b4_public_types_define],
                    [value = other.value;])[
   }
 
-
   template <typename Base>
   inline
   ]b4_parser_class_name[::basic_symbol<Base>::basic_symbol (]b4_join(
diff --git a/data/lalr1.cc b/data/lalr1.cc
index 3773257c..57a24649 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -827,7 +827,7 @@ b4_dollar_popdef])[]dnl
     yylen = yyr2_[yyn];
     {
       stack_symbol_type yylhs;
-      yylhs.state = yy_lr_goto_state_(yystack_[yylen].state, yyr1_[yyn]);]b4_variant_if([
+      yylhs.state = yy_lr_goto_state_ (yystack_[yylen].state, yyr1_[yyn]);]b4_variant_if([
       /* Variants are always initialized to an empty instance of the
          correct type. The default '$$ = $1' action is NOT applied
          when using variants.  */
@@ -1091,12 +1091,12 @@ b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
         case N:                               \
           yyformat = S;                       \
         break
-        YYCASE_(0, YY_("syntax error"));
-        YYCASE_(1, YY_("syntax error, unexpected %s"));
-        YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-        YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-        YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-        YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+        YYCASE_ (0, YY_("syntax error"));
+        YYCASE_ (1, YY_("syntax error, unexpected %s"));
+        YYCASE_ (2, YY_("syntax error, unexpected %s, expecting %s"));
+        YYCASE_ (3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+        YYCASE_ (4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+        YYCASE_ (5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
 #undef YYCASE_
       }
 
diff --git a/data/location.cc b/data/location.cc
index 53fddd48..9f453d75 100644
--- a/data/location.cc
+++ b/data/location.cc
@@ -33,8 +33,7 @@ m4_define([b4_position_define],
       : filename (f)
       , line (l)
       , column (c)
-    {
-    }
+    {}
 
 ]])[
     /// Initialization.
@@ -157,15 +156,13 @@ m4_define([b4_location_define],
     location (const position& b, const position& e)
       : begin (b)
       , end (e)
-    {
-    }
+    {}
 
     /// Construct a 0-width location in \a p.
     explicit location (const position& p = position ())
       : begin (p)
       , end (p)
-    {
-    }
+    {}
 
     /// Construct a 0-width location in \a f, \a l, \a c.
     explicit location (]b4_percent_define_get([[filename_type]])[* f,
@@ -173,8 +170,7 @@ m4_define([b4_location_define],
                        unsigned int c = ]b4_location_initial_column[u)
       : begin (f, l, c)
       , end (f, l, c)
-    {
-    }
+    {}
 
 ])[
     /// Initialization.
diff --git a/data/stack.hh b/data/stack.hh
index a56e6c74..6f3258be 100644
--- a/data/stack.hh
+++ b/data/stack.hh
@@ -21,7 +21,8 @@ m4_pushdef([b4_copyright_years],
 # b4_stack_define
 # ---------------
 m4_define([b4_stack_define],
-[[  template <class T, class S = std::vector<T> >
+[[  /// A stack with random access from its top.
+  template <class T, class S = std::vector<T> >
   class stack
   {
   public:
@@ -39,14 +40,18 @@ m4_define([b4_stack_define],
       : seq_ (n)
     {}
 
-    inline
+    /// Random access.
+    ///
+    /// Index 0 returns the topmost element.
     T&
     operator[] (unsigned int i)
     {
       return seq_[seq_.size () - 1 - i];
     }
 
-    inline
+    /// Random access.
+    ///
+    /// Index 0 returns the topmost element.
     const T&
     operator[] (unsigned int i) const
     {
@@ -56,7 +61,6 @@ m4_define([b4_stack_define],
     /// Steal the contents of \a t.
     ///
     /// Close to move-semantics.
-    inline
     void
     push (T& t)
     {
@@ -64,7 +68,6 @@ m4_define([b4_stack_define],
       operator[](0).move (t);
     }
 
-    inline
     void
     pop (unsigned int n = 1)
     {
@@ -78,21 +81,18 @@ m4_define([b4_stack_define],
       seq_.clear ();
     }
 
-    inline
     typename S::size_type
     size () const
     {
       return seq_.size ();
     }
 
-    inline
     const_iterator
     begin () const
     {
       return seq_.rbegin ();
     }
 
-    inline
     const_iterator
     end () const
     {
@@ -116,7 +116,6 @@ m4_define([b4_stack_define],
       , range_ (range)
     {}
 
-    inline
     const T&
     operator [] (unsigned int i) const
     {