projects
/
bison.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/maint'
[bison.git]
/
tests
/
java.at
diff --git
a/tests/java.at
b/tests/java.at
index b6ea163610618df73a408b1926350c637140c996..ec0f4a8e3a6e048682531c59ee9d304ed36f6acb 100644
(file)
--- a/
tests/java.at
+++ b/
tests/java.at
@@
-32,6
+32,7
@@
AT_BANNER([[Java Calculator.]])
m4_define([_AT_DATA_JAVA_CALC_Y],
[m4_if([$1$2$3], $[1]$[2]$[3], [],
[m4_fatal([$0: Invalid arguments: $@])])dnl
m4_define([_AT_DATA_JAVA_CALC_Y],
[m4_if([$1$2$3], $[1]$[2]$[3], [],
[m4_fatal([$0: Invalid arguments: $@])])dnl
+AT_BISON_OPTION_PUSHDEFS([%language "Java" $4])
AT_DATA([Calc.y],
[[/* Infix notation calculator--calc */
%language "Java"
AT_DATA([Calc.y],
[[/* Infix notation calculator--calc */
%language "Java"
@@
-122,20
+123,8
@@
AT_LOCATION_IF([[
public Position getEndPos() {
return yypos;
}
public Position getEndPos() {
return yypos;
}
-
- public void yyerror (Calc.Location l, String s)
- {
- if (l == null)
- System.err.println (s);
- else
- System.err.println (l + ": " + s);
- }
-]], [[
- public void yyerror (String s)
- {
- System.err.println (s);
- }
]])[
]])[
+ ]AT_YYERROR_DEFINE[
Integer yylval;
Integer yylval;
@@
-211,6
+200,7
@@
class Position {
}
]])
}
]])
+AT_BISON_OPTION_POPDEFS
])# _AT_DATA_JAVA_CALC_Y
])# _AT_DATA_JAVA_CALC_Y
@@
-224,7
+214,7
@@
m4_define([AT_DATA_JAVA_CALC_Y],
# _AT_CHECK_JAVA_CALC_ERROR(BISON-OPTIONS, INPUT,
# [VERBOSE-AND-LOCATED-ERROR-MESSAGE])
# _AT_CHECK_JAVA_CALC_ERROR(BISON-OPTIONS, INPUT,
# [VERBOSE-AND-LOCATED-ERROR-MESSAGE])
-# ---------------------------------------------------------
+# ---------------------------------------------------------
-----
# Run `calc' on INPUT, and expect a `syntax error' message.
#
# If INPUT starts with a slash, it is used as absolute input file name,
# Run `calc' on INPUT, and expect a `syntax error' message.
#
# If INPUT starts with a slash, it is used as absolute input file name,