X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/03f1b545b94c6699ee637b517c4941afb76eb0d9..f6df83b4e80b2a53c08b5dc654e247076a3b9b03:/data/stack.hh?ds=sidebyside

diff --git a/data/stack.hh b/data/stack.hh
index 52933774..22d89fbb 100644
--- a/data/stack.hh
+++ b/data/stack.hh
@@ -18,25 +18,10 @@
 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.
- */
-
-#ifndef BISON_STACK_HH
-# define BISON_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:
@@ -44,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;
 
-    stack () : seq_ ()
+    stack ()
+      : seq_ ()
     {
     }
 
-    stack (unsigned int n) : seq_ (n)
+    stack (unsigned int n)
+      : seq_ (n)
     {
     }
 
@@ -56,21 +43,21 @@ b4_copyright([Stack handling for Bison parsers in C++],
     T&
     operator [] (unsigned int i)
     {
-      return seq_[i];
+      return seq_[seq_.size () - 1 - i];
     }
 
     inline
     const T&
     operator [] (unsigned int i) const
     {
-      return seq_[i];
+      return seq_[seq_.size () - 1 - i];
     }
 
     inline
     void
     push (const T& t)
     {
-      seq_.push_front (t);
+      seq_.push_back (t);
     }
 
     inline
@@ -78,20 +65,32 @@ b4_copyright([Stack handling for Bison parsers in C++],
     pop (unsigned int n = 1)
     {
       for (; n; --n)
-        seq_.pop_front ();
+        seq_.pop_back ();
     }
 
     inline
-    unsigned int
-    height () const
+    typename S::size_type
+    size () const
     {
       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:
+    /// The wrapped container.
     S seq_;
   };
 
@@ -117,10 +116,27 @@ b4_copyright([Stack handling for Bison parsers in C++],
     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[
 
-#endif // not BISON_STACK_HH[]dnl
-]
-m4_divert_pop(0)
-m4_popdef([b4_copyright_years])dnl
-m4_changecom([#])
+]b4_cpp_guard_close([b4_dir_prefix[]stack.hh])
+b4_output_end()
+])
+
+m4_popdef([b4_copyright_years])