UAT tests pass

gcc/cobol/UAT/testsuite.src/run_functions.at

@@ -5269,43 +5269,43 @@ AT_CHECK([$COMPILE prog.cob], [1], [],
 [prog.cob:12:29: error: syntax error, unexpected NAME, expecting datetime format
    12 |                            (invalid-date-format) <> SPACES
       |                             ^
-prog.cob:16:12: error: syntax error, unexpected END_IF
+prog.cob:16:12: error: syntax error, unexpected END-IF
    16 |            END-IF
       |            ^
 prog.cob:18:40: error: syntax error, unexpected NAME, expecting date format
    18 |            IF FUNCTION FORMATTED-DATE (invalid-date-format, 1) <> SPACES
       |                                        ^
-prog.cob:22:12: error: syntax error, unexpected END_IF
+prog.cob:22:12: error: syntax error, unexpected END-IF
    22 |            END-IF
       |            ^
 prog.cob:25:29: error: syntax error, unexpected NAME, expecting datetime format
    25 |                            (invalid-datetime-format, 1, 1) <> SPACES
       |                             ^
-prog.cob:29:12: error: syntax error, unexpected END_IF
+prog.cob:29:12: error: syntax error, unexpected END-IF
    29 |            END-IF
       |            ^
 prog.cob:31:40: error: syntax error, unexpected NAME, expecting time format
    31 |            IF FUNCTION FORMATTED-TIME (invalid-time-format, 1) <> SPACES
       |                                        ^
-prog.cob:35:12: error: syntax error, unexpected END_IF
+prog.cob:35:12: error: syntax error, unexpected END-IF
    35 |            END-IF
       |            ^
 prog.cob:38:29: error: syntax error, unexpected NAME, expecting date format or datetime format
    38 |                            (invalid-date-format, 1) <> ZERO
       |                             ^
-prog.cob:42:12: error: syntax error, unexpected END_IF
+prog.cob:42:12: error: syntax error, unexpected END-IF
    42 |            END-IF
       |            ^
 prog.cob:45:29: error: syntax error, unexpected NAME, expecting time format or datetime format
    45 |                            (invalid-time-format, 1) <> ZERO
       |                             ^
-prog.cob:49:12: error: syntax error, unexpected END_IF
+prog.cob:49:12: error: syntax error, unexpected END-IF
    49 |            END-IF
       |            ^
 prog.cob:52:29: error: syntax error, unexpected NAME, expecting date format or time format or datetime format
    52 |                            (invalid-datetime-format, 1) <> ZERO
       |                             ^
-prog.cob:56:12: error: syntax error, unexpected END_IF
+prog.cob:56:12: error: syntax error, unexpected END-IF
    56 |            END-IF
       |            ^
 cobol1: error: failed compiling prog.cob

gcc/cobol/UAT/testsuite.src/syn_definition.at

@@ -599,7 +599,7 @@ AT_DATA([prog.cob], [
 ])
 
 AT_CHECK([$COMPILE_ONLY prog.cob], [1], [],
-[prog.cob:2:8: error: syntax error, unexpected PIC, expecting IDENTIFICATION DIVISION or PROGRAM_ID
+[prog.cob:2:8: error: syntax error, unexpected PIC, expecting IDENTIFICATION DIVISION or PROGRAM-ID
     2 |        PIC
(P)
       |        ^
 cobol1: error: failed compiling prog.cob

gcc/cobol/UAT/testsuite.src/syn_move.at

@@ -1239,7 +1239,7 @@ prog.cob:16:24: error: DATA-ITEM 'repo-prog' not found
    16 |            MOVE 'C' TO repo-prog.
       |                        ^
 prog.cob:16:24: error: invalid receiving operand
-prog.cob:17:24: error: syntax error, unexpected QUOTES
+prog.cob:17:24: error: syntax error, unexpected QUOTE
    17 |            MOVE 'D' TO QUOTE.
       |                        ^
 prog.cob:17:24: error: invalid receiving operand

gcc/cobol/token_names.h.gen

@@ -31,6 +31,7 @@ BEGIN {
   gsub( /^THRU/, "THROUGH", $2 )
 
   gsub(/_/, "-")
+  upper = $2
   name = tolower($2)
   print "\t{ \"" name "\",", orig, "}, //", $3
 
@@ -49,11 +50,11 @@ BEGIN {
   }   
   if( name == "zero" ) {
     print "\t{ \"" name "s\",", orig, "}, //", $3
-    print "\t{ \"" name "eo\",", orig, "}, //", $3
+    print "\t{ \"" name "es\",", orig, "}, //", $3
   }                      
 
   tok = $3 - (3 + 255)
-  kw_array[tok] = name
+  kw_array[tok] = upper
 }
 
 END {