Check UTF-8 NATIONAL and NATIONAL EDITED size (#770)

* tree.c: enable I18N_UTF8 macro in checking NATIONAL and NATIONAL EDITED size
* cobol_utf8/limits.at: SJIS -> UTF8

Author: tsh-hashimoto

cobj/tree.c

@@ -1565,15 +1565,14 @@ cb_tree cb_build_picture(const char *str) {
     break;
   case PIC_NATIONAL:
     pic->category = CB_CATEGORY_NATIONAL;
-    // #ifdef I18N_UTF8
-    //     /* I18N_UTF8: NATIONAL allocates 3bytes/char for BMP. */
-    //     CHECK_CHARACTER_LENGTH(cb_max_utf8_character_data_size,
-    //                            "National field cannot be larger than %d
-    //                            digits");
-    // #else  /*!I18N_UTF8*/
+#ifdef I18N_UTF8
+    /* I18N_UTF8: NATIONAL allocates 3bytes/char for BMP. */
+    CHECK_CHARACTER_LENGTH(cb_max_utf8_character_data_size,
+                           "National field cannot be larger than %d digits");
+#else  /*!I18N_UTF8*/
     CHECK_CHARACTER_LENGTH(cb_max_sjis_character_data_size,
                            "National field cannot be larger than %d digits");
-    // #endif /*I18N_UTF8*/
+#endif /*I18N_UTF8*/
     break;
   case PIC_NUMERIC_EDITED:
     pic->str = cobc_malloc(idx + 1);
@@ -1599,16 +1598,16 @@ cb_tree cb_build_picture(const char *str) {
     memcpy(pic->str, buff, idx);
     pic->category = CB_CATEGORY_NATIONAL_EDITED;
     pic->lenstr = idx;
-    // #ifdef I18N_UTF8
-    //     /* I18N_UTF8: NATIONAL allocates 3bytes/char for BMP. */
-    //     CHECK_CHARACTER_LENGTH(
-    //         cb_max_utf8_character_data_size,
-    //         "NationalEdit field cannot be larger than %d digits");
-    // #else  /*!I18N_UTF8*/
+#ifdef I18N_UTF8
+    /* I18N_UTF8: NATIONAL allocates 3bytes/char for BMP. */
+    CHECK_CHARACTER_LENGTH(
+        cb_max_utf8_character_data_size,
+        "NationalEdit field cannot be larger than %d digits");
+#else  /*!I18N_UTF8*/
     CHECK_CHARACTER_LENGTH(
         cb_max_sjis_character_data_size,
         "NationalEdit field cannot be larger than %d digits");
-    // #endif /*I18N_UTF8*/
+#endif /*I18N_UTF8*/
     break;
   default:
     goto error;

tests/cobol_utf8.src/limits.at

@@ -215,15 +215,15 @@ AT_CHECK([${COMPILE_LIMIT_TEST} prog.cob], [1], [],
 
 AT_CLEANUP
 
-AT_SETUP([Field length limit PIC N/VALID (SJIS)])
+AT_SETUP([Field length limit PIC N/VALID (UTF-8)])
 export LC_ALL=''
 
 AT_DATA([prog.cob], [
        IDENTIFICATION   DIVISION.
        PROGRAM-ID.      prog.
        DATA             DIVISION.
        WORKING-STORAGE  SECTION.
-       01 VALID-N       PIC N(8388608).
+       01 VALID-N       PIC N(5592405).
        PROCEDURE        DIVISION.
            STOP RUN.
 ])
@@ -232,34 +232,34 @@ AT_CHECK([${COMPILE_LIMIT_TEST} prog.cob], [0])
 
 AT_CLEANUP
 
-AT_SETUP([Field length limit PIC N/TOO LONG (SJIS)])
+AT_SETUP([Field length limit PIC N/TOO LONG (UTF-8)])
 export LC_ALL=''
 
 AT_DATA([prog.cob], [
        IDENTIFICATION   DIVISION.
        PROGRAM-ID.      prog.
        DATA             DIVISION.
        WORKING-STORAGE  SECTION.
-       01 INVALID-N     PIC N(8388609).
+       01 INVALID-N     PIC N(5592406).
        PROCEDURE        DIVISION.
            STOP RUN.
 ])
 
 AT_CHECK([${COMPILE_LIMIT_TEST} prog.cob], [1], [],
-[prog.cob:6: Error: National field cannot be larger than 8388608 digits
+[prog.cob:6: Error: National field cannot be larger than 5592405 digits
 ])
 
 AT_CLEANUP
 
-AT_SETUP([Field length limit PIC BN/VALID (SJIS)])
+AT_SETUP([Field length limit PIC BN/VALID (UTF-8)])
 export LC_ALL=''
 
 AT_DATA([prog.cob], [
        IDENTIFICATION   DIVISION.
        PROGRAM-ID.      prog.
        DATA             DIVISION.
        WORKING-STORAGE  SECTION.
-       01 VALID-BN      PIC BN(8388607).
+       01 VALID-BN      PIC BN(5592404).
        PROCEDURE        DIVISION.
            STOP RUN.
 ])
@@ -268,21 +268,21 @@ AT_CHECK([${COMPILE_LIMIT_TEST} prog.cob], [0])
 
 AT_CLEANUP
 
-AT_SETUP([Field length limit PIC BN/TOO LONG (SJIS)])
+AT_SETUP([Field length limit PIC BN/TOO LONG (UTF-8)])
 export LC_ALL=''
 
 AT_DATA([prog.cob], [
        IDENTIFICATION   DIVISION.
        PROGRAM-ID.      prog.
        DATA             DIVISION.
        WORKING-STORAGE  SECTION.
-       01 INVALID-BN    PIC BN(8388608).
+       01 INVALID-BN    PIC BN(5592405).
        PROCEDURE        DIVISION.
            STOP RUN.
 ])
 
 AT_CHECK([${COMPILE_LIMIT_TEST} prog.cob], [1], [],
-[prog.cob:6: Error: NationalEdit field cannot be larger than 8388608 digits
+[prog.cob:6: Error: NationalEdit field cannot be larger than 5592405 digits
 ])
 
 AT_CLEANUP