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

java: comment changes

Browse Source 
* data/skeletons/lalr1.java, examples/java/calc/Calc.y: here.
This commit is contained in:
Akim Demaille
2020-04-30 08:34:15 +02:00
parent 0c0e778bd1
commit 0407acbc59
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
data/skeletons/lalr1.java
View File

@@ -211,11 +211,10 @@ import java.text.MessageFormat;
int yylex ()]b4_maybe_throws([b4_lex_throws])[; int yylex ()]b4_maybe_throws([b4_lex_throws])[;
/** /**
* Entry point for error reporting. Emits an error * Emit an error]b4_locations_if([ referring to the given location])[in a user-defined way.
* ]b4_locations_if([referring to the given location ])[in a user-defined way.
* *
*]b4_locations_if([[ @@param loc The location of the element to which the *]b4_locations_if([[ @@param loc The location of the element to which the
* error message is related]])[ * error message is related.]])[
* @@param msg The string for the error message. * @@param msg The string for the error message.
*/ */
void yyerror (]b4_locations_if([b4_location_type[ loc, ]])[String msg); void yyerror (]b4_locations_if([b4_location_type[ loc, ]])[String msg);
@@ -223,9 +222,11 @@ import java.text.MessageFormat;
]b4_parse_error_bmatch( ]b4_parse_error_bmatch(
[custom], [[ [custom], [[
/** /**
* Build and emit a syntax error message. * Build and emit a "syntax error" message in a user-defined way.
*
* @@param ctx The context of the error.
*/ */
void reportSyntaxError (][Context yyctx); void reportSyntaxError (][Context ctx);
]])[ ]])[
} }
@@ -996,8 +997,10 @@ b4_dollar_popdef[]dnl
} }
]])[ ]])[
/** /**
* Report a syntax error. * Build and emit a "syntax error" message in a user-defined way.
*
* @@param ctx The context of the error.
*/ */
private void yyreportSyntaxError (Context yyctx) private void yyreportSyntaxError (Context yyctx)
{]b4_parse_error_bmatch( {]b4_parse_error_bmatch(

25
examples/java/calc/Calc.y
View File

@@ -113,6 +113,9 @@ class CalcLexer implements Calc.Lexer {
return new Position(end); return new Position(end);
} }
/**
* Build and emit a syntax error message.
*/
public void reportSyntaxError(Calc.Context ctx) { public void reportSyntaxError(Calc.Context ctx) {
System.err.print(ctx.getLocation() + ": syntax error"); System.err.print(ctx.getLocation() + ": syntax error");
{ {
@@ -131,11 +134,18 @@ class CalcLexer implements Calc.Lexer {
System.err.println(""); System.err.println("");
} }
public void yyerror(Calc.Location l, String s) { /**
if (l == null) * Emit an error referring to the given location in a user-defined way.
System.err.println(s); *
* @@param loc The location of the element to which the
* error message is related.
* @@param msg The string for the error message.
*/
public void yyerror(Calc.Location loc, String msg) {
if (loc == null)
System.err.println(msg);
else else
System.err.println(l + ": " + s); System.err.println(loc + ": " + msg);
} }
Integer yylval; Integer yylval;
@@ -185,7 +195,9 @@ class CalcLexer implements Calc.Lexer {
} }
} }
/**
* A class defining a point in the input.
*/
class Position { class Position {
public int line = 1; public int line = 1;
public int column = 1; public int column = 1;
@@ -227,6 +239,9 @@ class Position {
} }
} }
/**
* A Stream reader that keeps track of the current Position.
*/
class PositionReader extends BufferedReader { class PositionReader extends BufferedReader {
private Position position = new Position(); private Position position = new Position();