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

tests: java: factor the definition of Position

Browse Source 
* tests/local.at (AT_JAVA_POSITION_DEFINE): New.
* tests/java.at, tests/javapush.at: Use it.
This commit is contained in:
Akim Demaille
2019-02-20 07:08:31 +01:00
parent 948f3decb4
commit 4848092bf8
3 changed files with 43 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/java.at
View File

@@ -158,43 +158,7 @@ AT_LOCATION_IF([[
}; };
%%]], [[ %%]], [[
}]])[ }]])[
]AT_JAVA_POSITION_DEFINE[
class Position {
public int line;
public int token;
public Position ()
{
line = 0;
token = 0;
}
public Position (int l, int t)
{
line = l;
token = t;
}
public boolean equals (Position l)
{
return l.line == line && l.token == token;
}
public String toString ()
{
return Integer.toString (line) + "." + Integer.toString(token);
}
public int lineno ()
{
return line;
}
public int token ()
{
return token;
}
}
]]) ]])
AT_BISON_OPTION_POPDEFS AT_BISON_OPTION_POPDEFS

25
tests/javapush.at
View File

@@ -673,30 +673,7 @@ AT_DATA([Calc.y],[[/* Infix notation calculator--calc. */
} }
} }
%code { %code { ]AT_JAVA_POSITION_DEFINE[ }
class Position {
public int line;
public int token;
public Position () { line = 0; token = 0; }
public Position (int l, int t) { line = l; token = t; }
public boolean equals (Position l)
{
return l.line == line && l.token == token;
}
public String toString ()
{
return Integer.toString(line) + "." + Integer.toString(token);
}
public int lineno () { return line; }
public int token () { return token; }
}//Class Position
}
%code { %code {
public static void main (String[] argv) public static void main (String[] argv)

41
tests/local.at
View File

@@ -643,6 +643,47 @@ CXXFLAGS=$at_for_each_std_CXXFLAGS_save
m4_copy([AT_DATA], [AT_DATA_GRAMMAR(java)]) m4_copy([AT_DATA], [AT_DATA_GRAMMAR(java)])
# AT_JAVA_POSITION_DEFINE
# -----------------------
m4_define([AT_JAVA_POSITION_DEFINE],
[[class Position {
public int line;
public int token;
public Position ()
{
line = 0;
token = 0;
}
public Position (int l, int t)
{
line = l;
token = t;
}
public boolean equals (Position l)
{
return l.line == line && l.token == token;
}
public String toString ()
{
return Integer.toString (line) + "." + Integer.toString(token);
}
public int lineno ()
{
return line;
}
public int token ()
{
return token;
}
}]])
m4_define([AT_YYERROR_DEFINE(java)], m4_define([AT_YYERROR_DEFINE(java)],
[AT_LOCATION_IF([[public void yyerror (Calc.Location l, String s) [AT_LOCATION_IF([[public void yyerror (Calc.Location l, String s)
{ {