Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-21 02:03:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

traces: don't print the stack before the gotos

Browse Source 
The C, C++ and D skeletons used to show the stack right after popping
the stack during the reduction.  Now that the stack is printed after
reaching a new state, that has become useless:

    Entering state 1
    Stack now 0 1
    Reducing stack by rule 5 (line 83):
       $1 = token "number" (1)
    -> $$ = nterm exp (1)
    Stack now 0
    Entering state 8
    Stack now 0 8

Remove the "Stack now 0" line.

* data/skeletons/lalr1.cc, data/skeletons/lalr1.d,
* data/skeletons/lalr1.java, data/skeletons/yacc.c:
Here.
This commit is contained in:
Akim Demaille
2020-02-05 07:26:42 +01:00
parent 37aeda6fb3
commit d727e0ff23
8 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/skeletons/lalr1.cc
View File

@@ -993,7 +993,6 @@ b4_dollar_popdef])[]dnl
YY_SYMBOL_PRINT ("-> $$ =", yylhs); YY_SYMBOL_PRINT ("-> $$ =", yylhs);
yypop_ (yylen); yypop_ (yylen);
yylen = 0; yylen = 0;
YY_STACK_PRINT ();
// Shift the result of the reduction. // Shift the result of the reduction.
yypush_ (YY_NULLPTR, YY_MOVE (yylhs)); yypush_ (YY_NULLPTR, YY_MOVE (yylhs));

3
data/skeletons/lalr1.d
View File

@@ -344,9 +344,6 @@ b4_user_union_members
yystack.pop (yylen); yystack.pop (yylen);
yylen = 0; yylen = 0;
]b4_parse_trace_if([[
if (0 < yydebug)
yystack.print (yyDebugStream);]])[
/* Shift the result of the reduction. */ /* Shift the result of the reduction. */
yyn = yyr1_[yyn]; yyn = yyr1_[yyn];

1
data/skeletons/lalr1.java
View File

@@ -482,7 +482,6 @@ m4_define([b4_define_state],[[
yystack.pop (yylen); yystack.pop (yylen);
yylen = 0; yylen = 0;
/* Shift the result of the reduction. */ /* Shift the result of the reduction. */
int yystate = yyLRGotoState (yystack.stateAt (0), yyr1_[yyn]); int yystate = yyLRGotoState (yystack.stateAt (0), yyr1_[yyn]);
yystack.push (yystate, yyval]b4_locations_if([, yyloc])[); yystack.push (yystate, yyval]b4_locations_if([, yyloc])[);

1
data/skeletons/yacc.c
View File

@@ -1823,7 +1823,6 @@ yyreduce:
YYPOPSTACK (yylen); YYPOPSTACK (yylen);
yylen = 0; yylen = 0;
YY_STACK_PRINT (yyss, yyssp);
*++yyvsp = yyval;]b4_locations_if([ *++yyvsp = yyval;]b4_locations_if([
*++yylsp = yyloc;])[ *++yylsp = yyloc;])[

5
tests/actions.at
View File

@@ -1385,7 +1385,6 @@ Entering state 0
Stack now 0 Stack now 0
Reducing stack by rule 1 (line 49): Reducing stack by rule 1 (line 49):
-> $$ = nterm start (1.1: <]]kind[[> for 'S' @ 1) -> $$ = nterm start (1.1: <]]kind[[> for 'S' @ 1)
Stack now 0
Entering state 1 Entering state 1
Stack now 0 1 Stack now 0 1
Reading a token Reading a token
@@ -1649,22 +1648,18 @@ Entering state 0
Stack now 0 Stack now 0
Reducing stack by rule 1 (line 30): Reducing stack by rule 1 (line 30):
-> $$ = nterm $@1 (: ) -> $$ = nterm $@1 (: )
Stack now 0
Entering state 2 Entering state 2
Stack now 0 2 Stack now 0 2
Reducing stack by rule 2 (line 31): Reducing stack by rule 2 (line 31):
-> $$ = nterm @2 (: 2) -> $$ = nterm @2 (: 2)
Stack now 0 2
Entering state 4 Entering state 4
Stack now 0 2 4 Stack now 0 2 4
Reducing stack by rule 3 (line 32): Reducing stack by rule 3 (line 32):
-> $$ = nterm @3 (: 3) -> $$ = nterm @3 (: 3)
Stack now 0 2 4
Entering state 5 Entering state 5
Stack now 0 2 4 5 Stack now 0 2 4 5
Reducing stack by rule 4 (line 33): Reducing stack by rule 4 (line 33):
-> $$ = nterm @4 (: 4) -> $$ = nterm @4 (: 4)
Stack now 0 2 4 5
Entering state 6 Entering state 6
Stack now 0 2 4 5 6 Stack now 0 2 4 5 6
Reading a token Reading a token

3
tests/c++.at
View File

@@ -658,14 +658,12 @@ Reducing stack by rule 1 (line 34):
$1 = token NUMBER (1) $1 = token NUMBER (1)
-> $$ = nterm expr (10) -> $$ = nterm expr (10)
destroy: 1 destroy: 1
Stack now 0
Entering state 2 Entering state 2
Stack now 0 2 Stack now 0 2
Reading a token Reading a token
Next token is token NUMBER (30) 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 0 2
Entering state 4 Entering state 4
Stack now 0 2 4 Stack now 0 2 4
Next token is token NUMBER (30) Next token is token NUMBER (30)
@@ -681,7 +679,6 @@ expr: 10 20 30
destroy: 30 destroy: 30
destroy: 20 destroy: 20
destroy: 10 destroy: 10
Stack now 0
Entering state 2 Entering state 2
Stack now 0 2 Stack now 0 2
Reading a token Reading a token

2
tests/calc.at
View File

@@ -922,7 +922,7 @@ _AT_CHECK_CALC([$1],
2^2^3 = 256 2^2^3 = 256
(2^2)^3 = 64], (2^2)^3 = 64],
[[final: 64 12 0]], [[final: 64 12 0]],
[1111]) [1017])
# Some syntax errors. # Some syntax errors.
_AT_CHECK_CALC_ERROR([$1], [1], [1 2], _AT_CHECK_CALC_ERROR([$1], [1], [1 2],

1
tests/regression.at
View File

@@ -963,7 +963,6 @@ Entering state 0
Stack now 0 Stack now 0
Reducing stack by rule 1 (line 20): Reducing stack by rule 1 (line 20):
-> $$ = nterm start () -> $$ = nterm start ()
Stack now 0
Entering state 1 Entering state 1
Stack now 0 1 Stack now 0 1
Reading a token Reading a token