X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0906b12cd56f9777fb684b8a257a0e56c090a93c..94a6225578b43a47bf7b6ce139aeb59380c33302:/tests/java.at diff --git a/tests/java.at b/tests/java.at index 1c9bd50d..968b47f3 100644 --- a/tests/java.at +++ b/tests/java.at @@ -1,6 +1,6 @@ # Java tests for simple calculator. -*- Autotest -*- -# Copyright (C) 2007-2012 Free Software Foundation, Inc. +# Copyright (C) 2007-2013 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,8 +25,8 @@ AT_BANNER([[Java Calculator.]]) # _AT_DATA_JAVA_CALC_Y($1, $2, $3, [BISON-DIRECTIVES]) # ---------------------------------------------------- -# Produce `calc.y'. Don't call this macro directly, because it contains -# some occurrences of `$1' etc. which will be interpreted by m4. So +# Produce 'calc.y'. Don't call this macro directly, because it contains +# some occurrences of '$1' etc. which will be interpreted by m4. So # you should call it with $1, $2, and $3 as arguments, which is what # AT_DATA_JAVA_CALC_Y does. m4_define([_AT_DATA_JAVA_CALC_Y], @@ -37,7 +37,7 @@ AT_DATA([Calc.y], [[/* Infix notation calculator--calc */ %language "Java" %name-prefix "Calc" -%define parser_class_name "Calc" +%define parser_class_name {Calc} %define public ]$4[ @@ -54,11 +54,11 @@ AT_DATA([Calc.y], %token NUM "number" %type exp -%nonassoc '=' /* comparison */ +%nonassoc '=' /* comparison */ %left '-' '+' %left '*' '/' -%left NEG /* negation--unary minus */ -%right '^' /* exponentiation */ +%precedence NEG /* negation--unary minus */ +%right '^' /* exponentiation */ /* Grammar follows */ %% @@ -206,7 +206,7 @@ AT_BISON_OPTION_POPDEFS # AT_DATA_CALC_Y([BISON-OPTIONS]) # ------------------------------- -# Produce `calc.y'. +# Produce 'calc.y'. m4_define([AT_DATA_JAVA_CALC_Y], [_AT_DATA_JAVA_CALC_Y($[1], $[2], $[3], [$1]) ]) @@ -215,7 +215,7 @@ m4_define([AT_DATA_JAVA_CALC_Y], # _AT_CHECK_JAVA_CALC_ERROR(BISON-OPTIONS, INPUT, # [VERBOSE-AND-LOCATED-ERROR-MESSAGE]) # -------------------------------------------------------------- -# Run `calc' on INPUT, and expect a `syntax 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, # otherwise as contents. @@ -240,7 +240,7 @@ AT_DATA([[expout]], AT_YYERROR_SEES_LOC_IF([], [[sed 's/^[-0-9.]*: //' expout >at-expout mv at-expout expout]]) -# 3. If error-verbose is not used, strip the`, unexpected....' part. +# 3. If error-verbose is not used, strip the', unexpected....' part. m4_bmatch([$1], [%error-verbose], [], [[sed 's/syntax error, .*$/syntax error/' expout >at-expout mv at-expout expout]]) @@ -250,7 +250,7 @@ AT_CHECK([cat stderr], 0, [expout]) # _AT_CHECK_JAVA_CALC([BISON-DIRECTIVES], [BISON-CODE]) # ----------------------------------------------------- -# Start a testing chunk which compiles `calc' grammar with +# Start a testing chunk which compiles 'calc' grammar with # BISON-DIRECTIVES, and performs several tests over the parser. m4_define([_AT_CHECK_JAVA_CALC], [# We use integers to avoid dependencies upon the precision of doubles. @@ -310,7 +310,7 @@ _AT_CHECK_JAVA_CALC_ERROR([$1], [/dev/null], # - (* * *): nothing to pop, a lot to discard # - (1 + 2 * *): some to pop and discard # -# - test the action associated to `error' +# - test the action associated to 'error' # # - check the lookahead that triggers an error is not discarded # when we enter error recovery. Below, the lookahead causing the @@ -342,7 +342,7 @@ AT_CLEANUP # AT_CHECK_JAVA_CALC([BISON-DIRECTIVES]) # -------------------------------------- -# Start a testing chunk which compiles `calc' grammar with +# Start a testing chunk which compiles 'calc' grammar with # BISON-DIRECTIVES, and performs several tests over the parser. # Run the test with and without %error-verbose. m4_define([AT_CHECK_JAVA_CALC], @@ -408,7 +408,7 @@ AT_JAVA_COMPILE([[YYParser.java]]) # AT_CHECK_JAVA_MINIMAL_W_LEXER([1:DIRECTIVES], [2:LEX_THROWS], -# [3:YYLEX_ACTION], [4:LEXER_BODY], [5:PARSER_ACTION], [6:STYPE], +# [3:YYLEX_ACTION], [4:LEXER_BODY], [5:PARSER_ACTION], [6:VALUE_TYPE], # [7:POSITION_TYPE], [8:LOCATION_TYPE]) # --------------------------------------------------------------------- # Check that a mininal parser with DIRECTIVES and a "%code lexer". @@ -461,13 +461,13 @@ AT_CHECK_JAVA_GREP([[class YYParser]]) AT_CHECK_JAVA_MINIMAL([[%name-prefix "Prefix"]]) AT_CHECK_JAVA_GREP([[class PrefixParser]]) -AT_CHECK_JAVA_MINIMAL([[%define api.token.prefix "TOK_"]]) +AT_CHECK_JAVA_MINIMAL([[%define api.token.prefix {TOK_}]]) AT_CHECK_JAVA_GREP([[.*TOK_END.*]]) -AT_CHECK_JAVA_MINIMAL([[%define parser_class_name "ParserClassName"]]) +AT_CHECK_JAVA_MINIMAL([[%define parser_class_name {ParserClassName}]]) AT_CHECK_JAVA_GREP([[class ParserClassName]]) -AT_CHECK_JAVA_MINIMAL([[%define package "user_java_package"]]) +AT_CHECK_JAVA_MINIMAL([[%define package {user_java_package}]]) AT_CHECK_JAVA_GREP([[package user_java_package;]]) AT_CLEANUP @@ -530,7 +530,7 @@ AT_CHECK_JAVA_GREP([[public final strictfp class YYParser]]) # FIXME: Can't do a Java compile because javacomp.sh is configured for 1.3 AT_CHECK_JAVA_MINIMAL([[ -%define annotations "/*@Deprecated @SupressWarnings(\"unchecked\") @SupressWarnings({\"unchecked\", \"deprecation\"}) @SupressWarnings(value={\"unchecked\", \"deprecation\"})*/" +%define annotations {/*@Deprecated @SupressWarnings("unchecked") @SupressWarnings({"unchecked", "deprecation"}) @SupressWarnings(value={"unchecked", "deprecation"})*/} %define public]]) AT_CHECK_JAVA_GREP([[/\*@Deprecated @SupressWarnings("unchecked") @SupressWarnings({"unchecked", "deprecation"}) @SupressWarnings(value={"unchecked", "deprecation"})\*/ public class YYParser]]) @@ -543,15 +543,15 @@ AT_CLEANUP AT_SETUP([Java parser class extends and implements]) -AT_CHECK_JAVA_MINIMAL([[%define extends "Thread"]]) +AT_CHECK_JAVA_MINIMAL([[%define extends {Thread}]]) AT_CHECK_JAVA_GREP([[class YYParser extends Thread]]) -AT_CHECK_JAVA_MINIMAL([[%define implements "Cloneable"]]) +AT_CHECK_JAVA_MINIMAL([[%define implements {Cloneable}]]) AT_CHECK_JAVA_GREP([[class YYParser implements Cloneable]]) AT_CHECK_JAVA_MINIMAL([[ -%define extends "Thread" -%define implements "Cloneable"]]) +%define extends {Thread} +%define implements {Cloneable}]]) AT_CHECK_JAVA_GREP([[class YYParser extends Thread implements Cloneable]]) AT_CLEANUP @@ -643,9 +643,9 @@ AT_SETUP([Java throws specifications]) m4_define([AT_JT_lex_throws_define], [m4_case(AT_JT_lex_throws, -1, [], - 0, [[%define lex_throws ""]], - 1, [[%define lex_throws "InterruptedException"]], - 2, [[%define lex_throws "InterruptedException, IllegalAccessException"]])]) + 0, [[%define lex_throws {}]], + 1, [[%define lex_throws {InterruptedException}]], + 2, [[%define lex_throws {InterruptedException, IllegalAccessException}]])]) m4_define([AT_JT_yylex_throws], [m4_case(AT_JT_lex_throws, -1, [[ throws java.io.IOException]], @@ -662,9 +662,9 @@ m4_define([AT_JT_yylex_action], [m4_case(AT_JT_lex_throws, m4_define([AT_JT_throws_define], [m4_case(AT_JT_throws, -1, [], - 0, [[%define throws ""]], - 1, [[%define throws "ClassNotFoundException"]], - 2, [[%define throws "ClassNotFoundException, InstantiationException"]])]) + 0, [[%define throws {}]], + 1, [[%define throws {ClassNotFoundException}]], + 2, [[%define throws {ClassNotFoundException, InstantiationException}]])]) m4_define([AT_JT_yyaction_throws], [m4_case(AT_JT_throws, -1, [], @@ -727,42 +727,42 @@ AT_CLEANUP AT_SETUP([Java constructor init and init_throws]) AT_CHECK_JAVA_MINIMAL([[ -%define extends "Thread" +%define extends {Thread} %code init { super("Test Thread"); if (true) throw new InterruptedException(); } -%define init_throws "InterruptedException" +%define init_throws {InterruptedException} %lex-param {int lex_param}]]) AT_CHECK([[grep -q 'super("Test Thread"); if (true) throw new InterruptedException();' YYParser.java]]) AT_CHECK_JAVA_MINIMAL_W_LEXER([[ -%define extends "Thread" +%define extends {Thread} %code init { super("Test Thread"); if (true) throw new InterruptedException(); } -%define init_throws "InterruptedException"]], [], [[return EOF;]]) +%define init_throws {InterruptedException}]], [], [[return EOF;]]) AT_CHECK([[grep -q 'super("Test Thread"); if (true) throw new InterruptedException();' YYParser.java]]) AT_CLEANUP -# --------------------------------------------- # -# Java stype, position_class and location_class # -# --------------------------------------------- # +# ------------------------------------------ # +# Java value, position, and location types. # +# ------------------------------------------ # -AT_SETUP([Java stype, position_class and location_class]) +AT_SETUP([Java value, position, and location types]) AT_CHECK_JAVA_MINIMAL([[ -%define stype "java.awt.Color" +%define api.value.type {java.awt.Color} %type start; -%define api.location.type "MyLoc" -%define api.position.type "MyPos" +%define api.location.type {MyLoc} +%define api.position.type {MyPos} %code { class MyPos {} }]], [[$$ = $1;]], [[MyPos]]) AT_CHECK([[grep 'java.awt.Color' YYParser.java]], [0], [ignore]) AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Position']], [1], [ignore]) AT_CHECK([[$EGREP -v ' */?\*' YYParser.java | grep 'Location']], [1], [ignore]) AT_CHECK_JAVA_MINIMAL_W_LEXER([[ -%define stype "java.awt.Color" +%define api.value.type {java.awt.Color} %type start; -%define api.location.type "MyLoc" -%define api.position.type "MyPos" +%define api.location.type {MyLoc} +%define api.position.type {MyPos} %code { class MyPos {} }]], [], [[return EOF;]], [], [[$$ = $1;]], [[java.awt.Color]], [[MyPos]], [[MyLoc]])