X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e254a580b550c8cbaff1709527cd896d972df010..326e5cf81eada2ebd9007fa5fe9903a27a8bd067:/tests/java.at?ds=sidebyside diff --git a/tests/java.at b/tests/java.at index a3e1a0ed..8912f289 100644 --- a/tests/java.at +++ b/tests/java.at @@ -1,6 +1,6 @@ # Java tests for simple calculator. -*- Autotest -*- -# Copyright (C) 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2007-2010 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 @@ -24,7 +24,7 @@ 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 # you should call it with $1, $2, and $3 as arguments, which is what @@ -134,7 +134,7 @@ AT_LOCATION_IF([[ ]], [[ public void yyerror (String s) { - System.err.println (s); + System.err.println (s); } ]])[ @@ -148,7 +148,7 @@ AT_LOCATION_IF([[ int ttype = st.nextToken (); ]AT_LOCATION_IF([[yystartpos = yyendpos;]])[ if (ttype == st.TT_EOF) - return Calc.EOF; + return EOF; else if (ttype == st.TT_EOL) { @@ -159,7 +159,7 @@ AT_LOCATION_IF([[ else if (ttype == st.TT_WORD) { yylval = new Integer (st.sval); - return Calc.NUM; + return NUM; } else @@ -212,7 +212,7 @@ class Position { # AT_DATA_CALC_Y([BISON-OPTIONS]) -# ------------------------------------------------- +# ------------------------------- # Produce `calc.y'. m4_define([AT_DATA_JAVA_CALC_Y], [_AT_DATA_JAVA_CALC_Y($[1], $[2], $[3], [$1]) @@ -225,7 +225,8 @@ m4_define([AT_DATA_JAVA_CALC_Y], # Compile SOURCES into Java class files. Skip the test if java or javac is # not installed. m4_define([AT_JAVA_COMPILE], -[AT_CHECK([test -n "$CONF_JAVA" || exit 77 +[AT_KEYWORDS(java) +AT_CHECK([test -n "$CONF_JAVA" || exit 77 test -n "$CONF_JAVAC" || exit 77]) AT_CHECK([$SHELL ../../../javacomp.sh $1], 0, [ignore], [ignore])]) @@ -274,7 +275,7 @@ AT_CHECK([cat stderr], 0, [expout]) ]) # _AT_CHECK_JAVA_CALC([BISON-DIRECTIVES], [BISON-CODE]) -# ----------------------------------------------------------------------- +# ----------------------------------------------------- # Start a testing chunk which compiles `calc' grammar with # BISON-DIRECTIVES, and performs several tests over the parser. m4_define([_AT_CHECK_JAVA_CALC], @@ -342,7 +343,7 @@ _AT_CHECK_JAVA_CALC_ERROR([$1], [/dev/null], # first error is ")", which is needed to recover from the error and # produce the "0" that triggers the "0 != 1" error. # -_AT_CHECK_JAVA_CALC_ERROR([$1], +_AT_CHECK_JAVA_CALC_ERROR([$1], [() + (1 + 1 + 1 +) + (* * *) + (1 * 2 * *) = 1], [1: syntax error, unexpected ')', expecting number or '-' or '(' or '!' 1: syntax error, unexpected ')', expecting number or '-' or '(' or '!' @@ -366,7 +367,7 @@ AT_CLEANUP # AT_CHECK_JAVA_CALC([BISON-DIRECTIVES]) -# -------------------------------------------------------- +# -------------------------------------- # 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. @@ -419,14 +420,15 @@ AT_DATA([[YYParser.y]], [ %debug %error-verbose %token-table +%token END "end" $1 %% -start: "end" {$2}; +start: END {$2}; %% class m4_default([$3], [Position]) {} ]) AT_BISON_CHECK([[YYParser.y]]) -AT_CHECK([[grep -q '[mb]4_' YYParser.y]], [1]) +AT_CHECK([[grep '[mb]4_' YYParser.y]], [1], [ignore]) AT_JAVA_COMPILE([[YYParser.java]]) ]) @@ -458,7 +460,7 @@ m4_define([AT_CHECK_JAVA_MINIMAL_W_LEXER], { $3 } - + $4 }], [$5], [$7])]) @@ -473,9 +475,9 @@ m4_define([AT_CHECK_JAVA_GREP], ]) -# ----------------------------------- # -# Java parser class and package names # -# ----------------------------------- # +# ------------------------------------- # +# Java parser class and package names. # +# ------------------------------------- # AT_SETUP([Java parser class and package names]) @@ -485,6 +487,9 @@ 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.tokens.prefix "TOK_"]]) +AT_CHECK_JAVA_GREP([[.*TOK_END.*]]) + AT_CHECK_JAVA_MINIMAL([[%define parser_class_name "ParserClassName"]]) AT_CHECK_JAVA_GREP([[class ParserClassName]]) @@ -494,9 +499,9 @@ AT_CHECK_JAVA_GREP([[package user_java_package;]]) AT_CLEANUP -# --------------------------- # -# Java parser class modifiers # -# --------------------------- # +# ----------------------------- # +# Java parser class modifiers. # +# ----------------------------- # AT_SETUP([Java parser class modifiers]) @@ -549,6 +554,12 @@ AT_CHECK_JAVA_MINIMAL([[ %define strictfp]]) 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 public]]) +AT_CHECK_JAVA_GREP([[/\*@Deprecated @SupressWarnings("unchecked") @SupressWarnings({"unchecked", "deprecation"}) @SupressWarnings(value={"unchecked", "deprecation"})\*/ public class YYParser]]) + AT_CLEANUP @@ -579,54 +590,54 @@ AT_CLEANUP AT_SETUP([Java %parse-param and %lex-param]) AT_CHECK_JAVA_MINIMAL([]) -AT_CHECK_JAVA_GREP([[ *public YYParser (Lexer yylexer) {]]) +AT_CHECK_JAVA_GREP([[ *public YYParser (Lexer yylexer) *]]) AT_CHECK_JAVA_MINIMAL([[%parse-param {int parse_param1}]]) AT_CHECK_JAVA_GREP([[ *protected final int parse_param1;]]) -AT_CHECK_JAVA_GREP([[ *public YYParser (Lexer yylexer, *int parse_param1) {]]) -AT_CHECK_JAVA_GREP([[[ ]*this.parse_param1 = parse_param1;]]) +AT_CHECK_JAVA_GREP([[ *public YYParser (Lexer yylexer, *int parse_param1) *]]) +AT_CHECK_JAVA_GREP([[ *this.parse_param1 = parse_param1;]]) AT_CHECK_JAVA_MINIMAL([[ %parse-param {int parse_param1} %parse-param {long parse_param2}]]) AT_CHECK_JAVA_GREP([[ *protected final int parse_param1;]]) AT_CHECK_JAVA_GREP([[ *protected final long parse_param2;]]) -AT_CHECK_JAVA_GREP([[ *public YYParser (Lexer yylexer, *int parse_param1, *long parse_param2) {]]) -AT_CHECK_JAVA_GREP([[[ ]*this.parse_param1 = parse_param1;]]) -AT_CHECK_JAVA_GREP([[[ ]*this.parse_param2 = parse_param2;]]) +AT_CHECK_JAVA_GREP([[ *public YYParser (Lexer yylexer, *int parse_param1, *long parse_param2) *]]) +AT_CHECK_JAVA_GREP([[ *this.parse_param1 = parse_param1;]]) +AT_CHECK_JAVA_GREP([[ *this.parse_param2 = parse_param2;]]) AT_CHECK_JAVA_MINIMAL_W_LEXER([], [], [[return EOF;]]) -AT_CHECK_JAVA_GREP([[ *public YYParser () {]]) -AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer) {]]) +AT_CHECK_JAVA_GREP([[ *public YYParser () *]]) +AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer) *]]) AT_CHECK_JAVA_MINIMAL_W_LEXER([[%parse-param {int parse_param1}]], - [], [[return EOF;]]) + [], [[return EOF;]]) AT_CHECK_JAVA_GREP([[ *protected final int parse_param1;]]) -AT_CHECK_JAVA_GREP([[ *public YYParser (int parse_param1) {]]) -AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer, *int parse_param1) {]]) -AT_CHECK_JAVA_GREP([[[ ]*this.parse_param1 = parse_param1;]], [2]) +AT_CHECK_JAVA_GREP([[ *public YYParser (int parse_param1) *]]) +AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer, *int parse_param1) *]]) +AT_CHECK_JAVA_GREP([[ *this.parse_param1 = parse_param1;]], [2]) AT_CHECK_JAVA_MINIMAL_W_LEXER([[ %parse-param {int parse_param1} %parse-param {long parse_param2}]], - [], [[return EOF;]]) + [], [[return EOF;]]) AT_CHECK_JAVA_GREP([[ *protected final int parse_param1;]]) AT_CHECK_JAVA_GREP([[ *protected final long parse_param2;]]) -AT_CHECK_JAVA_GREP([[ *public YYParser (int parse_param1, *long parse_param2) {]]) -AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer, *int parse_param1, *long parse_param2) {]]) -AT_CHECK_JAVA_GREP([[[ ]*this.parse_param1 = parse_param1;]], [2]) -AT_CHECK_JAVA_GREP([[[ ]*this.parse_param2 = parse_param2;]], [2]) +AT_CHECK_JAVA_GREP([[ *public YYParser (int parse_param1, *long parse_param2) *]]) +AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer, *int parse_param1, *long parse_param2) *]]) +AT_CHECK_JAVA_GREP([[ *this.parse_param1 = parse_param1;]], [2]) +AT_CHECK_JAVA_GREP([[ *this.parse_param2 = parse_param2;]], [2]) AT_CHECK_JAVA_MINIMAL_W_LEXER([[%lex-param {char lex_param1}]], - [], [[return EOF;]], [[YYLexer (char lex_param1) {}]]) -AT_CHECK_JAVA_GREP([[ *public YYParser (char lex_param1) {]]) + [], [[return EOF;]], [[YYLexer (char lex_param1) {}]]) +AT_CHECK_JAVA_GREP([[ *public YYParser (char lex_param1) *]]) AT_CHECK_JAVA_GREP([[.* = new YYLexer *(lex_param1);]]) AT_CHECK_JAVA_MINIMAL_W_LEXER([[ %lex-param {char lex_param1} %lex-param {short lex_param2}]], - [], [[return EOF;]], [[YYLexer (char lex_param1, short lex_param2) {}]]) -AT_CHECK_JAVA_GREP([[ *public YYParser (char lex_param1, *short lex_param2) {]]) + [], [[return EOF;]], [[YYLexer (char lex_param1, short lex_param2) {}]]) +AT_CHECK_JAVA_GREP([[ *public YYParser (char lex_param1, *short lex_param2) *]]) AT_CHECK_JAVA_GREP([[.* = new YYLexer *(lex_param1, *lex_param2);]]) AT_CHECK_JAVA_MINIMAL_W_LEXER([[ @@ -634,14 +645,14 @@ AT_CHECK_JAVA_MINIMAL_W_LEXER([[ %parse-param {long parse_param2} %lex-param {char lex_param1} %lex-param {short lex_param2}]], - [], [[return EOF;]], [[YYLexer (char lex_param1, short lex_param2) {}]]) + [], [[return EOF;]], [[YYLexer (char lex_param1, short lex_param2) {}]]) AT_CHECK_JAVA_GREP([[ *protected final int parse_param1;]]) AT_CHECK_JAVA_GREP([[ *protected final long parse_param2;]]) -AT_CHECK_JAVA_GREP([[ *public YYParser (char lex_param1, *short lex_param2, *int parse_param1, *long parse_param2) {]]) +AT_CHECK_JAVA_GREP([[ *public YYParser (char lex_param1, *short lex_param2, *int parse_param1, *long parse_param2) *]]) AT_CHECK_JAVA_GREP([[.* = new YYLexer *(lex_param1, *lex_param2);]]) -AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer, *int parse_param1, *long parse_param2) {]]) -AT_CHECK_JAVA_GREP([[[ ]*this.parse_param1 = parse_param1;]], [2]) -AT_CHECK_JAVA_GREP([[[ ]*this.parse_param2 = parse_param2;]], [2]) +AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer, *int parse_param1, *long parse_param2) *]]) +AT_CHECK_JAVA_GREP([[ *this.parse_param1 = parse_param1;]], [2]) +AT_CHECK_JAVA_GREP([[ *this.parse_param2 = parse_param2;]], [2]) AT_CLEANUP @@ -735,6 +746,28 @@ AT_CHECK_JAVA_GREP([[ *public boolean parse ()]AT_JT_parse_throws[ *]]) AT_CLEANUP +# ------------------------------------- # +# Java constructor init and init_throws # +# ------------------------------------- # + +AT_SETUP([Java constructor init and init_throws]) + +AT_CHECK_JAVA_MINIMAL([[ +%define extends "Thread" +%code init { super("Test Thread"); if (true) throw new 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" +%code init { super("Test Thread"); if (true) throw new InterruptedException(); } +%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 # # --------------------------------------------- # @@ -747,9 +780,9 @@ AT_CHECK_JAVA_MINIMAL([[ %define location_type "MyLoc" %define position_type "MyPos" %code { class MyPos {} }]], [[$$ = $1;]], [[MyPos]]) -AT_CHECK([[grep -q 'java.awt.Color' YYParser.java]]) -AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Position']], [1]) -AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Location']], [1]) +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" @@ -759,8 +792,8 @@ AT_CHECK_JAVA_MINIMAL_W_LEXER([[ %code { class MyPos {} }]], [], [[return EOF;]], [], [[$$ = $1;]], [[java.awt.Color]], [[MyPos]], [[MyLoc]]) -AT_CHECK([[grep -q 'java.awt.Color' YYParser.java]]) -AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Position']], [1]) -AT_CHECK([[egrep -v ' */?\*' YYParser.java | grep -q 'Location']], [1]) +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_CLEANUP