variants: remove the 'built' assertions

[bison.git] / data / stack.hh

diff --git a/data/stack.hh b/data/stack.hh
index bd94eb2da5dded1256f7ed840257ae72d4adebf3..037c212fc6a549462f8a480d5982495ce1eed8bd 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,12 +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_stack_define
 # ---------------
 m4_define([b4_stack_define],
 
 # b4_stack_define
 # ---------------
 m4_define([b4_stack_define],

-[[  template <class T, class S = std::deque<T> >
+[[  template <class T, class S = std::vector<T> >

   class stack
   {
   public:
   class stack
   {
   public:


@@ -41,23 +41,27 @@ m4_define([b4_stack_define],
 
     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


@@ -65,7 +69,7 @@ m4_define([b4_stack_define],
     pop (unsigned int n = 1)
     {
       for (; n; --n)
     pop (unsigned int n = 1)
     {
       for (; n; --n)

-        seq_.pop_front ();
+        seq_.pop_back ();

     }
 
     inline
     }
 
     inline


@@ -119,10 +123,7 @@ m4_define([b4_stack_define],
 ]])
 
 b4_defines_if(
 ]])
 
 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_output_begin([b4_dir_prefix[]stack.hh])

 b4_copyright([Stack handling for Bison parsers in C++])[
 
 /**
 b4_copyright([Stack handling for Bison parsers in C++])[
 
 /**


@@ -132,14 +133,14 @@ b4_copyright([Stack handling for Bison parsers in C++])[
 
 ]b4_cpp_guard_open([b4_dir_prefix[]stack.hh])[
 
 
 ]b4_cpp_guard_open([b4_dir_prefix[]stack.hh])[
 

-# include <deque>
+# include <vector>

 
 ]b4_namespace_open[
 ]b4_stack_define[
 ]b4_namespace_close[
 
 ]b4_cpp_guard_close([b4_dir_prefix[]stack.hh])
 
 ]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])