[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/3] lalr1.cc: use a vector for the symbol stack
From: |
Theophile Ranquet |
Subject: |
[PATCH 3/3] lalr1.cc: use a vector for the symbol stack |
Date: |
Fri, 4 Jan 2013 13:55:24 +0100 |
* data/lalr1.cc: Adjust includes.
* data/stack.hh (push, pop): Use push_back and pop_back.
(operator []): Access vector from the end.
diff --git a/data/lalr1.cc b/data/lalr1.cc
index 930119f..40446b7 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -146,7 +146,7 @@ b4_variant_if([m4_include(b4_pkgdatadir/[variant.hh])])
m4_define([b4_shared_declarations],
[b4_percent_code_get([[requires]])[
]b4_parse_assert_if([# include <cassert>])[
-# include <deque>
+# include <vector>
# include <iostream>
# include <stdexcept>
# include <string>]b4_defines_if([[
diff --git a/data/stack.hh b/data/stack.hh
index 4fd136f..22d89fb 100644
--- a/data/stack.hh
+++ b/data/stack.hh
@@ -21,7 +21,7 @@ m4_pushdef([b4_copyright_years],
# 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:
@@ -43,21 +43,21 @@ m4_define([b4_stack_define],
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
@@ -65,7 +65,7 @@ m4_define([b4_stack_define],
pop (unsigned int n = 1)
{
for (; n; --n)
- seq_.pop_front ();
+ seq_.pop_back ();
}
inline
@@ -129,7 +129,7 @@ b4_copyright([Stack handling for Bison parsers in C++])[
]b4_cpp_guard_open([b4_dir_prefix[]stack.hh])[
-# include <deque>
+# include <vector>
]b4_namespace_open[
]b4_stack_define[
--
1.8.1