X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/51bacae6b58fd5c6cce861f00440dc917384625e..9e87ff54729e4d16d61b00b8338a516124ff094d:/data/stack.hh?ds=sidebyside
diff --git a/data/stack.hh b/data/stack.hh
index cb8e6964..aa64d63d 100644
--- a/data/stack.hh
+++ b/data/stack.hh
@@ -1,7 +1,6 @@
# C++ skeleton for Bison
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# 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
@@ -17,21 +16,12 @@
# along with this program. If not, see .
m4_pushdef([b4_copyright_years],
- [2002, 2003, 2004, 2005, 2006, 2007, 2008])
+ [2002-2013])
-# 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++])[
-
-#ifndef BISON_STACK_HH
-# define BISON_STACK_HH
-
-#include
-
-]b4_namespace_open[
- template >
+# b4_stack_define
+# ---------------
+m4_define([b4_stack_define],
+[[ template >
class stack
{
public:
@@ -51,23 +41,27 @@ b4_copyright([Stack handling for Bison parsers in C++])[
inline
T&
- operator [] (unsigned int i)
+ operator[] (unsigned int i)
{
- return seq_[i];
+ return seq_[seq_.size () - 1 - i];
}
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
- push (const T& t)
+ push (T& t)
{
- seq_.push_front (t);
+ seq_.push_back (T());
+ operator[](0).move (t);
}
inline
@@ -75,7 +69,13 @@ b4_copyright([Stack handling for Bison parsers in C++])[
pop (unsigned int n = 1)
{
for (; n; --n)
- seq_.pop_front ();
+ seq_.pop_back ();
+ }
+
+ void
+ clear ()
+ {
+ seq_.clear ();
}
inline
@@ -100,6 +100,8 @@ b4_copyright([Stack handling for Bison parsers in C++])[
}
private:
+ stack (const stack&);
+ stack& operator= (const stack&);
/// The wrapped container.
S seq_;
};
@@ -110,8 +112,8 @@ b4_copyright([Stack handling for Bison parsers in C++])[
{
public:
slice (const S& stack, unsigned int range)
- : stack_ (stack),
- range_ (range)
+ : stack_ (stack)
+ , range_ (range)
{
}
@@ -126,10 +128,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
+
+]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])