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

java: test and document previous bug fix.

Browse Source 
* NEWS (2.5): Document it.
* tests/java.at (_AT_DATA_JAVA_CALC_Y): To one of the yyerror
invocations, pass a location that spans multiple tokens.  Change
yyerror to report all of a location rather than just the begin
position.  Extend yylex and Position to count tokens on a line.
Remove getHashCode as it's unused.  Update all expected output.
(cherry picked from commit 7776816565)
This commit is contained in:
Joel E. Denny
2011-02-19 19:36:33 -05:00
parent aa3bcdf35e
commit 6771a463cd
3 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2011-02-19 Joel E. Denny <joeldenny@joeldenny.org>
java: test and document previous bug fix.
* NEWS (2.5): Document it.
* tests/java.at (_AT_DATA_JAVA_CALC_Y): To one of the yyerror
invocations, pass a location that spans multiple tokens. Change
yyerror to report all of a location rather than just the begin
position. Extend yylex and Position to count tokens on a line.
Remove getHashCode as it's unused. Update all expected output.
2011-02-19 Bernd Kiefer <kiefer@dfki.de> (tiny change) 2011-02-19 Bernd Kiefer <kiefer@dfki.de> (tiny change)
java: fix location handling bug. java: fix location handling bug.

2
NEWS
View File

@@ -350,6 +350,8 @@ Bison News
canonical LR. However, LAC is still experimental and is disabled canonical LR. However, LAC is still experimental and is disabled
by default. by default.
** A location handling bug in the Java skeleton has been fixed.
* Changes in version 2.4.3 (2010-08-05): * Changes in version 2.4.3 (2010-08-05):
** Bison now obeys -Werror and --warnings=error for warnings about ** Bison now obeys -Werror and --warnings=error for warnings about

67
tests/java.at
View File

@@ -77,7 +77,7 @@ exp:
| exp '=' exp | exp '=' exp
{ {
if ($1.intValue () != $3.intValue ()) if ($1.intValue () != $3.intValue ())
yyerror ("calc: error: " + $1 + " != " + $3); yyerror (]AT_LOCATION_IF([[@$,]])[ "calc: error: " + $1 + " != " + $3);
} }
| exp '+' exp { $$ = new Integer ($1.intValue () + $3.intValue ()); } | exp '+' exp { $$ = new Integer ($1.intValue () + $3.intValue ()); }
| exp '-' exp { $$ = new Integer ($1.intValue () - $3.intValue ()); } | exp '-' exp { $$ = new Integer ($1.intValue () - $3.intValue ()); }
@@ -113,15 +113,14 @@ class CalcLexer implements Calc.Lexer {
} }
AT_LOCATION_IF([[ AT_LOCATION_IF([[
Position yystartpos; Position yypos = new Position (1, 0);
Position yyendpos = new Position (1);
public Position getStartPos() { public Position getStartPos() {
return yystartpos; return yypos;
} }
public Position getEndPos() { public Position getEndPos() {
return yyendpos; return yypos;
} }
public void yyerror (Calc.Location l, String s) public void yyerror (Calc.Location l, String s)
@@ -129,7 +128,7 @@ AT_LOCATION_IF([[
if (l == null) if (l == null)
System.err.println (s); System.err.println (s);
else else
System.err.println (l.begin + ": " + s); System.err.println (l + ": " + s);
} }
]], [[ ]], [[
public void yyerror (String s) public void yyerror (String s)
@@ -146,13 +145,14 @@ AT_LOCATION_IF([[
public int yylex () throws IOException { public int yylex () throws IOException {
int ttype = st.nextToken (); int ttype = st.nextToken ();
]AT_LOCATION_IF([[yystartpos = yyendpos;]])[ ]AT_LOCATION_IF([[yypos = new Position (yypos.lineno (),
yypos.token () + 1);]])[
if (ttype == st.TT_EOF) if (ttype == st.TT_EOF)
return EOF; return EOF;
else if (ttype == st.TT_EOL) else if (ttype == st.TT_EOL)
{ {
]AT_LOCATION_IF([[yyendpos = new Position (yyendpos.lineno () + 1);]])[ ]AT_LOCATION_IF([[yypos = new Position (yypos.lineno () + 1, 0);]])[
return (int) '\n'; return (int) '\n';
} }
@@ -175,36 +175,39 @@ AT_LOCATION_IF([[
[ [
class Position { class Position {
public int line; public int line;
public int token;
public Position () public Position ()
{ {
line = 0; line = 0;
token = 0;
} }
public Position (int l) public Position (int l, int t)
{ {
line = l; line = l;
} token = t;
public long getHashCode ()
{
return line;
} }
public boolean equals (Position l) public boolean equals (Position l)
{ {
return l.line == line; return l.line == line && l.token == token;
} }
public String toString () public String toString ()
{ {
return Integer.toString (line); return Integer.toString (line) + "." + Integer.toString(token);
} }
public int lineno () public int lineno ()
{ {
return line; return line;
} }
public int token ()
{
return token;
}
} }
]]) ]])
@@ -294,19 +297,19 @@ AT_JAVA_PARSER_CHECK([Calc < input], 0, [], [stderr])
# Some syntax errors. # Some syntax errors.
_AT_CHECK_JAVA_CALC_ERROR([$1], [0 0], _AT_CHECK_JAVA_CALC_ERROR([$1], [0 0],
[1: syntax error, unexpected number]) [1.2: syntax error, unexpected number])
_AT_CHECK_JAVA_CALC_ERROR([$1], [1//2], _AT_CHECK_JAVA_CALC_ERROR([$1], [1//2],
[1: syntax error, unexpected '/', expecting number or '-' or '(' or '!']) [1.3: syntax error, unexpected '/', expecting number or '-' or '(' or '!'])
_AT_CHECK_JAVA_CALC_ERROR([$1], [error], _AT_CHECK_JAVA_CALC_ERROR([$1], [error],
[1: syntax error, unexpected $undefined]) [1.1: syntax error, unexpected $undefined])
_AT_CHECK_JAVA_CALC_ERROR([$1], [1 = 2 = 3], _AT_CHECK_JAVA_CALC_ERROR([$1], [1 = 2 = 3],
[1: syntax error, unexpected '=']) [1.4: syntax error, unexpected '='])
_AT_CHECK_JAVA_CALC_ERROR([$1], [ _AT_CHECK_JAVA_CALC_ERROR([$1], [
+1], +1],
[2: syntax error, unexpected '+']) [2.1: syntax error, unexpected '+'])
# Exercise error messages with EOF: work on an empty file. # Exercise error messages with EOF: work on an empty file.
_AT_CHECK_JAVA_CALC_ERROR([$1], [/dev/null], _AT_CHECK_JAVA_CALC_ERROR([$1], [/dev/null],
[1: syntax error, unexpected end of input]) [1.1: syntax error, unexpected end of input])
# Exercise the error token: without it, we die at the first error, # Exercise the error token: without it, we die at the first error,
# hence be sure to # hence be sure to
@@ -326,21 +329,21 @@ _AT_CHECK_JAVA_CALC_ERROR([$1], [/dev/null],
# #
_AT_CHECK_JAVA_CALC_ERROR([$1], _AT_CHECK_JAVA_CALC_ERROR([$1],
[() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1], [() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1],
[1: syntax error, unexpected ')', expecting number or '-' or '(' or '!' [1.2: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
1: syntax error, unexpected ')', expecting number or '-' or '(' or '!' 1.11: syntax error, unexpected ')', expecting number or '-' or '(' or '!'
1: syntax error, unexpected '*', expecting number or '-' or '(' or '!' 1.14: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
1: syntax error, unexpected '*', expecting number or '-' or '(' or '!' 1.24: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
calc: error: 4444 != 1]) 1.1-1.27: calc: error: 4444 != 1])
# The same, but this time exercising explicitly triggered syntax errors. # The same, but this time exercising explicitly triggered syntax errors.
# POSIX says the lookahead causing the error should not be discarded. # POSIX says the lookahead causing the error should not be discarded.
_AT_CHECK_JAVA_CALC_ERROR([$1], [(!) + (0 0) = 1], _AT_CHECK_JAVA_CALC_ERROR([$1], [(!) + (0 0) = 1],
[1: syntax error, unexpected number [1.7: syntax error, unexpected number
calc: error: 2222 != 1]) 1.1-1.10: calc: error: 2222 != 1])
_AT_CHECK_JAVA_CALC_ERROR([$1], [(- *) + (0 0) = 1], _AT_CHECK_JAVA_CALC_ERROR([$1], [(- *) + (0 0) = 1],
[1: syntax error, unexpected '*', expecting number or '-' or '(' or '!' [1.3: syntax error, unexpected '*', expecting number or '-' or '(' or '!'
1: syntax error, unexpected number 1.8: syntax error, unexpected number
calc: error: 2222 != 1]) 1.1-1.11: calc: error: 2222 != 1])
AT_BISON_OPTION_POPDEFS AT_BISON_OPTION_POPDEFS
AT_CLEANUP AT_CLEANUP