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

traces: write the "Reading a token" alone on its line

Browse Source 
The Java skeleton displays

    Reading a token:
    Next token is token "number" (1)

while the other display

    Reading a token: Next token is token "number" (1)

When generating logs in the scanner, the first part is separated from
the second, and the end of the scanner logs have the second part
pasted in.  So let's propagate the Java way, but with the colon.

* data/skeletons/glr.c, data/skeletons/lalr1.cc, data/skeletons/lalr1.d,
* data/skeletons/lalr1.java, data/skeletons/yacc.c: Do it.
Adjust test cases and doc.
This commit is contained in:
Akim Demaille
2020-02-04 06:43:45 +01:00
parent fe14fb1c40
commit bba2f0a3a0
11 changed files with 85 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
doc/bison.texi
View File

@@ -10177,7 +10177,8 @@ a valueless (@samp{()}) @code{input} nonterminal (@code{nterm}).
Then the parser calls the scanner.
@example
Reading a token: Next token is token FUN (sin())
Reading a token
Next token is token FUN (sin())
Shifting token FUN (sin())
Entering state 6
@end example
@@ -10189,10 +10190,12 @@ The parser stores (@code{Shifting}) that token, and others, until it can do
something about it.
@example
Reading a token: Next token is token '(' ()
Reading a token
Next token is token '(' ()
Shifting token '(' ()
Entering state 14
Reading a token: Next token is token NUM (1.000000)
Reading a token
Next token is token NUM (1.000000)
Shifting token NUM (1.000000)
Entering state 4
Reducing stack by rule 6 (line 44):
@@ -10208,10 +10211,12 @@ The previous reduction demonstrates the @code{%printer} directive for
@code{exp} have @samp{1} as value.
@example
Reading a token: Next token is token '-' ()
Reading a token
Next token is token '-' ()
Shifting token '-' ()
Entering state 17
Reading a token: Next token is token NUM (1.000000)
Reading a token
Next token is token NUM (1.000000)
Shifting token NUM (1.000000)
Entering state 4
Reducing stack by rule 6 (line 44):
@@ -10219,7 +10224,8 @@ Reducing stack by rule 6 (line 44):
-> $$ = nterm exp (1.000000)
Stack now 0 1 6 14 24 17
Entering state 26
Reading a token: Next token is token ')' ()
Reading a token
Next token is token ')' ()
Reducing stack by rule 11 (line 49):
$1 = nterm exp (1.000000)
$2 = token '-' ()
@@ -10252,7 +10258,8 @@ Finally, the end-of-line allow the parser to complete the computation, and
display its result.
@example
Reading a token: Next token is token '\n' ()
Reading a token
Next token is token '\n' ()
Shifting token '\n' ()
Entering state 22
Reducing stack by rule 4 (line 40):
@@ -10275,7 +10282,8 @@ expression to evaluate, or for the end-of-file token, which causes the
completion of the parsing.
@example
Reading a token: Now at end of input.
Reading a token
Now at end of input.
Shifting token $end ()
Entering state 2
Stack now 0 1 2