X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7aaaad6c6dc0fae412d608dcf20a3977d8902cd1..f6df83b4e80b2a53c08b5dc654e247076a3b9b03:/data/stack.hh

diff --git a/data/stack.hh b/data/stack.hh
index cea7b41a..22d89fbb 100644
--- a/data/stack.hh
+++ b/data/stack.hh
@@ -18,23 +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++])[
-
-/**
- ** \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:
@@ -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,7 +65,7 @@ b4_copyright([Stack handling for Bison parsers in C++])[
     pop (unsigned int n = 1)
     {
       for (; n; --n)
-        seq_.pop_front ();
+        seq_.pop_back ();
     }
 
     inline
@@ -129,9 +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[
 
 ]b4_cpp_guard_close([b4_dir_prefix[]stack.hh])
-m4_divert_pop(0)
-m4_popdef([b4_copyright_years])dnl
-m4_changecom([#])
+b4_output_end()
+])
+
+m4_popdef([b4_copyright_years])