maint: address some syntax-issues remaining after cherry-picking from master.

	* cfg.mk: Skip bison generated files, 2.5 is generating trailing
	blanks.  This is already fixed in master.
	* tests/conflicts.at, tests/java.at: Fix white space issues.

diff --git a/cfg.mk b/cfg.mk
index f2e9f0ab17ecc5aeaf1f8c90787a15733d099f81..f90f287b618862a64c47518f11abb4c360a2914a 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -66,4 +66,5 @@ exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^src/parse-gram.[ch]$
 exclude_file_name_regexp--sc_require_config_h_first = \
   ^(lib/yyerror|data/(glr|yacc))\.c$$
 exclude_file_name_regexp--sc_space_tab = ^tests/(input|c\+\+)\.at$$
 exclude_file_name_regexp--sc_require_config_h_first = \
   ^(lib/yyerror|data/(glr|yacc))\.c$$
 exclude_file_name_regexp--sc_space_tab = ^tests/(input|c\+\+)\.at$$

+exclude_file_name_regexp--sc_trailing_blank = ^src/parse-gram.[ch]$$

 exclude_file_name_regexp--sc_unmarked_diagnostics = ^djgpp/
 exclude_file_name_regexp--sc_unmarked_diagnostics = ^djgpp/

diff --git a/tests/conflicts.at b/tests/conflicts.at
index cf89981b0330cc958e267d34c58448c92dac30f1..76cb6aa9f11ed733978e0570425b45c7c608a8fb 100644 (file)
--- a/tests/conflicts.at
+++ b/tests/conflicts.at
@@ -1343,7 +1343,7 @@ AT_CHECK([[cat input.output | sed -n '/^state 0$/,/^state 1$/p']], 0,
    13 empty_c3: .  ['c']
 
     'b'  shift, and go to state 1
    13 empty_c3: .  ['c']
 
     'b'  shift, and go to state 1

- 
+

     'c'       reduce using rule 13 (empty_c3)
     $default  reduce using rule 9 (empty_a)
 
     'c'       reduce using rule 13 (empty_c3)
     $default  reduce using rule 9 (empty_a)
 

diff --git a/tests/java.at b/tests/java.at
index fd35cfd58eb3f16aa388b02c5b9f20932d4ddce5..e16701df07b4f765036fc9c10f9bf8510b723841 100644 (file)
--- a/tests/java.at
+++ b/tests/java.at
@@ -417,8 +417,8 @@ AT_JAVA_COMPILE([[YYParser.java]])
 
 
 # AT_CHECK_JAVA_MINIMAL_W_LEXER([1:DIRECTIVES], [2:LEX_THROWS],
 
 
 # AT_CHECK_JAVA_MINIMAL_W_LEXER([1:DIRECTIVES], [2:LEX_THROWS],

-#      [3:YYLEX_ACTION], [4:LEXER_BODY], [5:PARSER_ACTION], [6:STYPE],
-#      [7:POSITION_TYPE], [8:LOCATION_TYPE])
+#       [3:YYLEX_ACTION], [4:LEXER_BODY], [5:PARSER_ACTION], [6:STYPE],
+#       [7:POSITION_TYPE], [8:LOCATION_TYPE])

 # ---------------------------------------------------------------------
 # Check that a mininal parser with DIRECTIVES and a "%code lexer".
 # YYLEX is the body of yylex () which throws LEX_THROW.
 # ---------------------------------------------------------------------
 # Check that a mininal parser with DIRECTIVES and a "%code lexer".
 # YYLEX is the body of yylex () which throws LEX_THROW.


@@ -569,7 +569,7 @@ 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_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([[[  ]*this.parse_param1 = parse_param1;]])

 
 AT_CHECK_JAVA_MINIMAL([[
 %parse-param {int parse_param1}
 
 AT_CHECK_JAVA_MINIMAL([[
 %parse-param {int parse_param1}


@@ -577,8 +577,8 @@ AT_CHECK_JAVA_MINIMAL([[
 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([[ *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([[[  ]*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_MINIMAL_W_LEXER([], [], [[return EOF;]])
 AT_CHECK_JAVA_GREP([[ *public YYParser () {]])


@@ -589,7 +589,7 @@ AT_CHECK_JAVA_MINIMAL_W_LEXER([[%parse-param {int parse_param1}]],
 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([[ *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([[[  ]*this.parse_param1 = parse_param1;]], [2])

 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([[
 %parse-param {int parse_param1}
 
 AT_CHECK_JAVA_MINIMAL_W_LEXER([[
 %parse-param {int parse_param1}


@@ -599,8 +599,8 @@ 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([[ *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([[[  ]*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_MINIMAL_W_LEXER([[%lex-param {char lex_param1}]],
        [], [[return EOF;]], [[YYLexer (char lex_param1) {}]])


@@ -625,8 +625,8 @@ 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([[.* = new YYLexer *(lex_param1, *lex_param2);]])
 AT_CHECK_JAVA_GREP([[ *protected YYParser (Lexer yylexer, *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([[[  ]*this.parse_param1 = parse_param1;]], [2])
+AT_CHECK_JAVA_GREP([[[  ]*this.parse_param2 = parse_param2;]], [2])

 
 AT_CLEANUP
 
 
 AT_CLEANUP