mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 04:13:03 +00:00
c++: display the stack in the same order as in C
Currently the C and C++ parse traces differ in the order in which the stack is displayed: bottom up in C, top down in C++. Let's stick to the C order. * data/skeletons/stack.hh (stack::iterator, stack::const_iterator) (begin, end): Be forward, not backward.
This commit is contained in:
@@ -1425,7 +1425,6 @@ b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
|
|||||||
]b4_token_table_if([[#if ]b4_api_PREFIX[DEBUG]])[
|
]b4_token_table_if([[#if ]b4_api_PREFIX[DEBUG]])[
|
||||||
]b4_integral_parser_table_define([rline], [b4_rline])[
|
]b4_integral_parser_table_define([rline], [b4_rline])[
|
||||||
|
|
||||||
// Print the state stack on the debug stream.
|
|
||||||
void
|
void
|
||||||
]b4_parser_class[::yystack_print_ ()
|
]b4_parser_class[::yystack_print_ ()
|
||||||
{
|
{
|
||||||
@@ -1438,7 +1437,6 @@ b4_error_verbose_if([state_type yystate, const symbol_type& yyla],
|
|||||||
*yycdebug_ << '\n';
|
*yycdebug_ << '\n';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Report on the debug stream that the rule \a yyrule is going to be reduced.
|
|
||||||
void
|
void
|
||||||
]b4_parser_class[::yy_reduce_print_ (int yyrule)
|
]b4_parser_class[::yy_reduce_print_ (int yyrule)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -32,8 +32,8 @@ m4_define([b4_stack_define],
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
// Hide our reversed order.
|
// Hide our reversed order.
|
||||||
typedef typename S::reverse_iterator iterator;
|
typedef typename S::iterator iterator;
|
||||||
typedef typename S::const_reverse_iterator const_iterator;
|
typedef typename S::const_iterator const_iterator;
|
||||||
typedef typename S::size_type size_type;
|
typedef typename S::size_type size_type;
|
||||||
typedef typename std::ptrdiff_t index_type;
|
typedef typename std::ptrdiff_t index_type;
|
||||||
|
|
||||||
@@ -101,14 +101,14 @@ m4_define([b4_stack_define],
|
|||||||
const_iterator
|
const_iterator
|
||||||
begin () const YY_NOEXCEPT
|
begin () const YY_NOEXCEPT
|
||||||
{
|
{
|
||||||
return seq_.rbegin ();
|
return seq_.begin ();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Bottom of the stack.
|
/// Bottom of the stack.
|
||||||
const_iterator
|
const_iterator
|
||||||
end () const YY_NOEXCEPT
|
end () const YY_NOEXCEPT
|
||||||
{
|
{
|
||||||
return seq_.rend ();
|
return seq_.end ();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Present a slice of the top of a stack.
|
/// Present a slice of the top of a stack.
|
||||||
|
|||||||
@@ -660,7 +660,7 @@ Entering state 2
|
|||||||
Reading a token: Next token is token NUMBER (30)
|
Reading a token: Next token is token NUMBER (30)
|
||||||
Reducing stack by rule 2 (line 35):
|
Reducing stack by rule 2 (line 35):
|
||||||
-> $$ = nterm @1 (20)
|
-> $$ = nterm @1 (20)
|
||||||
Stack now 2 0
|
Stack now 0 2
|
||||||
Entering state 4
|
Entering state 4
|
||||||
Next token is token NUMBER (30)
|
Next token is token NUMBER (30)
|
||||||
Shifting token NUMBER (30)
|
Shifting token NUMBER (30)
|
||||||
|
|||||||
Reference in New Issue
Block a user