java: rename YYMORE as YYPUSH_MORE for consistency with C

[bison.git] / data / stack.hh

diff --git a/data/stack.hh b/data/stack.hh
index ab1049c184d4f111513e6bb33ecb00f8b888bab9..aa64d63d842cce563540a8254251dc1135ba9e5c 100644 (file)
--- a/data/stack.hh
+++ b/data/stack.hh
@@ -1,6 +1,6 @@
 # C++ skeleton for Bison
 
 # C++ skeleton for Bison
 

-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.

 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -16,23 +16,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],

-           [2002-2012])
+           [2002-2013])

 
 

-b4_output_begin([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::vector<T> >

   class stack
   {
   public:
   class stack
   {
   public:


@@ -40,33 +29,39 @@ 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)

     {
     }
 
     inline
     T&
     {
     }
 
     inline
     T&

-    operator [] (unsigned int i)
+    operator[] (unsigned int i)

     {
     {

-      return seq_[i];
+      return seq_[seq_.size () - 1 - i];

     }
 
     inline
     const T&
     }
 
     inline
     const T&

-    operator [] (unsigned int i) const
+    operator[] (unsigned int i) const

     {
     {

-      return seq_[i];
+      return seq_[seq_.size () - 1 - i];

     }
 
     }
 

+    /// Steal the contents of \a t.
+    ///
+    /// Close to move-semantics.

     inline
     void
     inline
     void

-    push (const T& t)
+    push (T& t)

     {
     {

-      seq_.push_front (t);
+      seq_.push_back (T());
+      operator[](0).move (t);

     }
 
     inline
     }
 
     inline


@@ -74,20 +69,40 @@ b4_copyright([Stack handling for Bison parsers in C++],
     pop (unsigned int n = 1)
     {
       for (; n; --n)
     pop (unsigned int n = 1)
     {
       for (; n; --n)

-        seq_.pop_front ();
+        seq_.pop_back ();
+    }
+
+    void
+    clear ()
+    {
+      seq_.clear ();

     }
 
     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:

+    stack (const stack&);
+    stack& operator= (const stack&);
+    /// The wrapped container.

     S seq_;
   };
 
     S seq_;
   };
 


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

+]])
+
+b4_defines_if(
+[b4_output_begin([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 <vector>
+
+]b4_namespace_open[
+]b4_stack_define[

 ]b4_namespace_close[
 
 ]b4_cpp_guard_close([b4_dir_prefix[]stack.hh])
 b4_output_end()
 ]b4_namespace_close[
 
 ]b4_cpp_guard_close([b4_dir_prefix[]stack.hh])
 b4_output_end()

+])

 
 m4_popdef([b4_copyright_years])
 
 m4_popdef([b4_copyright_years])