diff --git a/gcc/cobol/UAT/testsuite.src/syn_definition.at b/gcc/cobol/UAT/testsuite.src/syn_definition.at
index e42d7a3f370f2f5ec52494969e40bd4521b86fad..cb6d30fab8fc5c0698ad83971f04ef27a383e244 100644
--- a/gcc/cobol/UAT/testsuite.src/syn_definition.at
+++ b/gcc/cobol/UAT/testsuite.src/syn_definition.at
@@ -157,9 +157,9 @@ AT_DATA([prog.cob], [
# better: prog.cob:8: error: 'X IN X' is not defined
AT_CHECK([$COMPILE_ONLY prog.cob], [1], [],
-[prog.cob:8:26: error: symbol 'X' not found
+[prog.cob:8:25: error: DATA-ITEM 'X' not found
8 | DISPLAY X IN X
- | ^
+ | ^
cobol1: error: failed compiling prog.cob
])
@@ -224,25 +224,25 @@ AT_DATA([prog.cob], [
])
AT_CHECK([$COMPILE_ONLY prog.cob], [1], [],
-[prog.cob:11:28: error: syntax error, unexpected NAME, expecting CLASS_NAME or OMITTED
+[prog.cob:11:28: error: syntax error, unexpected NAME, expecting class name or OMITTED
11 | WHEN TESTME IS NOT-DEFINED
| ^
-prog.cob:16:32: error: syntax error, unexpected NAME, expecting CLASS_NAME or OMITTED
+prog.cob:16:32: error: syntax error, unexpected NAME, expecting class name or OMITTED
16 | IF NOT TESTME IS NOT-DEFINED
| ^
-prog.cob:24:28: error: syntax error, unexpected LITERAL, expecting CLASS_NAME or OMITTED
+prog.cob:24:28: error: syntax error, unexpected LITERAL, expecting class name or OMITTED
24 | WHEN TESTME IS 'ABC'
| ^
-prog.cob:30:28: error: syntax error, unexpected NAME, expecting CLASS_NAME or OMITTED
+prog.cob:30:28: error: syntax error, unexpected NAME, expecting class name or OMITTED
30 | WHEN TESTME IS TESTME
| ^
-prog.cob:36:31: error: symbol 'NOT-DEFINED' not found
+prog.cob:36:31: error: DATA-ITEM 'NOT-DEFINED' not found
36 | WHEN TESTME NOT = NOT-DEFINED
| ^
-prog.cob:42:18: error: ELSE not valid in WHEN
+prog.cob:42:25: error: ELSE not valid in WHEN
42 | WHEN TESTME ELSE NOT-DEFINED
- | ^
-prog.cob:47:20: error: symbol 'broken' not found
+ | ^
+prog.cob:47:20: error: DATA-ITEM 'broken' not found
47 | EVALUATE broken
| ^
cobol1: error: failed compiling prog.cob
@@ -260,7 +260,9 @@ AT_DATA([prog.cob], [
GOBACK.
])
AT_CHECK([$COMPILE prog.cob], [1], [],
-[prog.cob:4: syntax error at 'OMITTED'
+[prog.cob:4:44: error: syntax error, unexpected OMITTED
+ 4 | PROCEDURE DIVISION RETURNING OMITTED.
+ | ^
cobol1: error: failed compiling prog.cob
])
AT_CLEANUP
@@ -289,7 +291,7 @@ AT_CHECK([$COMPILE_ONLY prog.cob], [1], [],
[prog.cob:12:12: error: X is not unique, first defined on line 7
12 | END-DISPLAY.
| ^
-prog.cob:11:20: error: symbol 'X' not found
+prog.cob:11:20: error: DATA-ITEM 'X' not found
11 | DISPLAY X
| ^
cobol1: error: failed compiling prog.cob
@@ -318,7 +320,7 @@ AT_CHECK([$COMPILE_ONLY prog.cob], [1], [],
[prog.cob:11:12: error: X is not unique, first defined on line 7
11 | END-DISPLAY.
| ^
-prog.cob:10:20: error: symbol 'X' not found
+prog.cob:10:20: error: DATA-ITEM 'X' not found
10 | DISPLAY X
| ^
cobol1: error: failed compiling prog.cob
@@ -367,7 +369,9 @@ AT_DATA([prog.cob], [
])
AT_CHECK([$COMPILE_ONLY prog.cob], [1], [],
-[prog.cob:5: syntax error at 'IDENTIFICATION'
+[prog.cob:5:8: error: syntax error, unexpected IDENTIFICATION DIVISION, expecting end of file
+ 5 | IDENTIFICATION DIVISION.
+ | ^
cobol1: error: failed compiling prog.cob
])
AT_CLEANUP
@@ -474,51 +478,114 @@ AT_DATA([prog.cob], [
])
AT_CHECK([$COMPILE_ONLY prog.cob], [1], [],
-[prog.cob:7: syntax error at 'PIC'
-prog.cob:8: PICTURE exceeds maximum size of 63 bytes at 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
-prog.cob:10: PICTURE exceeds maximum size of 63 bytes at 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
-prog.cob:18: invalid picture for Alphanumeric-edited at 'SS99S'
-prog.cob:19: error: unrecognized character '.' (0x2e) in PICTURE
-prog.cob:19: syntax error
-prog.cob:24: error: invalid PICTURE character 'K' at offset 1 in '9K' at '9K'
-prog.cob:25: invalid picture for Alphanumeric-edited at '999C'
-prog.cob:26: invalid picture for Alphanumeric-edited at '999D'
-prog.cob:28: error: too-many-digits limited to capacity of 37 (would need 50)
-prog.cob:29: error: too-long-number-in-parens limited to capacity of 37 (would need 30716359)
-prog.cob:29: error: invalid repeat-count in PICTURE at '9((100))'
-prog.cob:30: error: invalid repeat-count in PICTURE at '9[(]'
-prog.cob:32: error: invalid repeat-count in PICTURE at '9()'
-prog.cob:36: error: Z and * are mutually exclusive at 'Z*'
-prog.cob:40: invalid picture for Alphanumeric-edited at 'NX'
-prog.cob:41: invalid picture for Alphanumeric-edited at 'AN'
-prog.cob:42: invalid picture for Alphanumeric-edited at 'AZ(3)'
-prog.cob:44: invalid picture for Alphanumeric-edited at 'SA'
-prog.cob:67: error: PICTURE '(str-constant)' requires a CONSTANT value at ')'
-prog.cob:69: error: invalid PICTURE count '(-1.00000000000000000000000000000000E+00)' at ')'
-prog.cob:69: error: invalid PICTURE count '(signed-constant)' at ')'
-prog.cob:69: error: PICTURE count '(-1)' is negative at ')'
-prog.cob:70: error: PICTURE '(unseen-constant)' requires a CONSTANT value at ')'
-prog.cob:80: invalid picture for Alphanumeric-edited at '$(integer-constant)'
-prog.cob:81: invalid picture for Alphanumeric-edited at '$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$(integer-constant)'
-prog.cob:86: error: unimplemented USAGE type: BIT at 'BIT'
-prog.cob:86: syntax error at 'BIT'
-prog.cob:87: error: unimplemented USAGE type: BIT at 'BIT'
-prog.cob:87: syntax error at 'BIT'
-prog.cob:88: error: unimplemented USAGE type: BIT at 'BIT'
-prog.cob:88: syntax error at 'BIT'
-prog.cob:89: error: unimplemented USAGE type: BIT at 'BIT'
-prog.cob:89: syntax error at 'BIT'
-prog.cob:90: error: unimplemented USAGE type: BIT at 'BIT'
-prog.cob:90: syntax error at 'BIT'
-prog.cob:91: error: unimplemented USAGE type: BIT at 'BIT'
-prog.cob:91: syntax error at 'BIT'
-prog.cob:92: error: unimplemented USAGE type: BIT at 'BIT'
-prog.cob:92: syntax error at 'BIT'
-prog.cob:93: error: unimplemented USAGE type: BIT at 'BIT'
-prog.cob:93: syntax error at 'BIT'
-prog.cob:96: error: unimplemented USAGE type: BIT at 'BIT'
-prog.cob:96: syntax error at 'BIT'
-:97: 44 errors in DATA DIVISION, compilation ceases detected at end of file
+[prog.cob:7:22: error: syntax error, unexpected NAME
+ 7 | 01 empty-pic PIC.
+ | ^
+prog.cob:8:29: error: PICTURE exceeds maximum size of 63 bytes
+ 8 | 01 too-long-pic PIC XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ | ^
+prog.cob:10:30: error: PICTURE exceeds maximum size of 63 bytes
+ 10 | 01 too-long-pic2 PIC XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ | ^
+prog.cob:18:20: error: invalid picture for Alphanumeric-edited
+ 18 | 03 PIC SS99S.
+ | ^
+prog.cob:19:22: error: syntax error, unexpected invalid token
+ 19 | 03 PIC 99..9.
+ | ^
+prog.cob:24:20: error: invalid PICTURE character 'K' at offset 1 in '9K'
+ 24 | 03 PIC 9K.
+ | ^
+prog.cob:25:20: error: invalid picture for Alphanumeric-edited
+ 25 | 03 PIC 999C.
+ | ^
+prog.cob:26:20: error: invalid picture for Alphanumeric-edited
+ 26 | 03 PIC 999D.
+ | ^
+prog.cob:27:32: error: too-many-digits limited to capacity of 37 (would need 50)
+ 27 | 01 too-many-digits PIC 9(50).
+ | ^
+prog.cob:28:42: error: too-long-number-in-parens limited to capacity of 37 (would need 30716359)
+ 28 | 01 too-long-number-in-parens PIC 9(11111111111111).
+ | ^
+prog.cob:29:30: error: invalid repeat-count in PICTURE
+ 29 | 01 nested-parens PIC 9((100)).
+ | ^
+prog.cob:30:34: error: invalid repeat-count in PICTURE
+ 30 | 01 unbalanced-parens PIC 9(.
+ | ^
+prog.cob:32:35: error: invalid repeat-count in PICTURE
+ 32 | 01 no-digit-in-parens PIC 9().
+ | ^
+prog.cob:36:20: error: Z and * are mutually exclusive
+ 36 | 03 PIC Z*.
+ | ^
+prog.cob:40:20: error: invalid picture for Alphanumeric-edited
+ 40 | 03 PIC NX.
+ | ^
+prog.cob:41:20: error: invalid picture for Alphanumeric-edited
+ 41 | 03 PIC AN.
+ | ^
+prog.cob:42:20: error: invalid picture for Alphanumeric-edited
+ 42 | 03 PIC AZ(3).
+ | ^
+prog.cob:44:20: error: invalid picture for Alphanumeric-edited
+ 44 | 03 PIC SA.
+ | ^
+prog.cob:67:22: error: PICTURE '(str-constant)' requires a CONSTANT value
+ 67 | 03 PIC X(str-constant).
+ | ^
+prog.cob:69:22: error: invalid PICTURE count '(-1.00000000000000000000000000000000E+00)'
+ 69 | 03 PIC X(signed-constant).
+ | ^
+prog.cob:69:21: error: PICTURE count '(-1)' is negative
+ 69 | 03 PIC X(signed-constant).
+ | ^
+prog.cob:70:22: error: PICTURE '(unseen-constant)' requires a CONSTANT value
+ 70 | 03 PIC X(unseen-constant).
+ | ^
+prog.cob:80:20: error: invalid picture for Alphanumeric-edited
+ 80 | 03 PIC $(integer-constant).
+ | ^
+prog.cob:81:20: error: invalid picture for Alphanumeric-edited
+ 81 | 03 PIC $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
+ | ^
+prog.cob:86:51: sorry, unimplemented: USAGE type: BIT
+ 86 | 05 BIT-BACKGROUND-BLACK PIC 1(8) BIT VALUE B"00000000".
+ | ^
+prog.cob:86:51: error: syntax error, unexpected BIT
+prog.cob:87:51: sorry, unimplemented: USAGE type: BIT
+ 87 | 05 BIT-BACKGROUND-BLUE PIC 1(8) BIT VALUE B"00010000".
+ | ^
+prog.cob:87:51: error: syntax error, unexpected BIT
+prog.cob:88:51: sorry, unimplemented: USAGE type: BIT
+ 88 | 05 BIT-BACKGROUND-GREEN PIC 1(8) BIT VALUE B"00100000".
+ | ^
+prog.cob:88:51: error: syntax error, unexpected BIT
+prog.cob:89:51: sorry, unimplemented: USAGE type: BIT
+ 89 | 05 BIT-BACKGROUND-CYAN PIC 1(8) BIT VALUE B"00110000".
+ | ^
+prog.cob:89:51: error: syntax error, unexpected BIT
+prog.cob:90:51: sorry, unimplemented: USAGE type: BIT
+ 90 | 05 BIT-BACKGROUND-RED PIC 1(8) BIT VALUE B"01000000".
+ | ^
+prog.cob:90:51: error: syntax error, unexpected BIT
+prog.cob:91:51: sorry, unimplemented: USAGE type: BIT
+ 91 | 05 BIT-BACKGROUND-MAGENTA PIC 1(8) BIT VALUE B"01010000".
+ | ^
+prog.cob:91:51: error: syntax error, unexpected BIT
+prog.cob:92:51: sorry, unimplemented: USAGE type: BIT
+ 92 | 05 BIT-BACKGROUND-BROWN PIC 1(8) BIT VALUE B"01100000".
+ | ^
+prog.cob:92:51: error: syntax error, unexpected BIT
+prog.cob:93:51: sorry, unimplemented: USAGE type: BIT
+ 93 | 05 BIT-BACKGROUND-LIGHT-GRAY PIC 1(8) BIT VALUE B"01110000".
+ | ^
+prog.cob:93:51: error: syntax error, unexpected BIT
+prog.cob:96:51: sorry, unimplemented: USAGE type: BIT
+ 96 | OCCURS 8 TIMES PIC 1(8) BIT.
+ | ^
+prog.cob:96:51: error: syntax error, unexpected BIT
cobol1: error: failed compiling prog.cob
])
AT_CLEANUP