Merge remote-tracking branch 'origin/maint'

[bison.git] / data / stack.hh

diff --git a/data/stack.hh b/data/stack.hh
index ddedc79bef7d25e1415f0f4345043fd8a6b98901..bd94eb2da5dded1256f7ed840257ae72d4adebf3 100644 (file)
--- a/data/stack.hh
+++ b/data/stack.hh
@@ -18,24 +18,10 @@
 m4_pushdef([b4_copyright_years],
            [2002-2012])
 
 m4_pushdef([b4_copyright_years],
            [2002-2012])
 

-# We do want M4 expansion after # for CPP macros.
-m4_changecom()
-m4_divert_push(0)dnl
-@output(b4_dir_prefix[]stack.hh@)@
-b4_copyright([Stack handling for Bison parsers in C++],
-             [2002-2012])[
-
-/**
- ** \file ]b4_dir_prefix[stack.hh
- ** Define the ]b4_namespace_ref[::stack class.
- */
-
-]b4_cpp_guard_open([b4_dir_prefix[]stack.hh])[
-
-# include <deque>
-
-]b4_namespace_open[
-  template <class T, class S = std::deque<T> >
+# b4_stack_define
+# ---------------
+m4_define([b4_stack_define],
+[[  template <class T, class S = std::deque<T> >

   class stack
   {
   public:
   class stack
   {
   public:


@@ -43,11 +29,13 @@ b4_copyright([Stack handling for Bison parsers in C++],
     typedef typename S::reverse_iterator iterator;
     typedef typename S::const_reverse_iterator const_iterator;
 
     typedef typename S::reverse_iterator iterator;
     typedef typename S::const_reverse_iterator const_iterator;
 

-    stack () : seq_ ()
+    stack ()
+      : seq_ ()

     {
     }
 
     {
     }
 

-    stack (unsigned int n) : seq_ (n)
+    stack (unsigned int n)
+      : seq_ (n)

     {
     }
 
     {
     }
 


@@ -81,16 +69,28 @@ b4_copyright([Stack handling for Bison parsers in C++],
     }
 
     inline
     }
 
     inline

-    unsigned int
-    height () const
+    typename S::size_type
+    size () const

     {
       return seq_.size ();
     }
 
     {
       return seq_.size ();
     }
 

-    inline const_iterator begin () const { return seq_.rbegin (); }
-    inline const_iterator end () const { return seq_.rend (); }
+    inline
+    const_iterator
+    begin () const
+    {
+      return seq_.rbegin ();
+    }
+
+    inline
+    const_iterator
+    end () const
+    {
+      return seq_.rend ();
+    }

 
   private:
 
   private:

+    /// The wrapped container.

     S seq_;
   };
 
     S seq_;
   };
 


@@ -116,9 +116,30 @@ b4_copyright([Stack handling for Bison parsers in C++],
     const S& stack_;
     unsigned int range_;
   };
     const S& stack_;
     unsigned int range_;
   };

+]])
+
+b4_defines_if(
+[# We do want M4 expansion after # for CPP macros.
+m4_changecom()
+m4_divert_push(0)dnl
+@output(b4_dir_prefix[]stack.hh@)@
+b4_copyright([Stack handling for Bison parsers in C++])[
+
+/**
+ ** \file ]b4_dir_prefix[stack.hh
+ ** Define the ]b4_namespace_ref[::stack class.
+ */
+
+]b4_cpp_guard_open([b4_dir_prefix[]stack.hh])[
+
+# include <deque>
+
+]b4_namespace_open[
+]b4_stack_define[

 ]b4_namespace_close[
 
 ]b4_cpp_guard_close([b4_dir_prefix[]stack.hh])
 m4_divert_pop(0)
 m4_popdef([b4_copyright_years])dnl
 m4_changecom([#])
 ]b4_namespace_close[
 
 ]b4_cpp_guard_close([b4_dir_prefix[]stack.hh])
 m4_divert_pop(0)
 m4_popdef([b4_copyright_years])dnl
 m4_changecom([#])

+])