Fix an error of comparing large numbers (#275)

Author: yutaro-sakamoto

CHANGELOG.md

@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Fix the process that checks MOVE statements (#266, #267)
 * Fix `INSPECT` statement (#268)
 * Fix error handlings of 0 divisions (#273)
+* Fix an error of comparing large numbers (#275)
 ### Optimized
 * Optimize the file reading process (#257)
 

cobj/typeck.c

@@ -2501,9 +2501,19 @@ cb_tree cb_build_cond(cb_tree x) {
 
         if (cb_chk_num_cond(p->x, p->y)) {
           size1 = cb_field_size(p->x);
-          x = cb_build_method_call_3("memcmp", cb_build_cast_address(p->x),
-                                     cb_build_cast_address(p->y),
-                                     cb_int(size1));
+          cb_tree xx;
+          if (CB_LITERAL_P(p->x)) {
+            xx = cb_build_string0(CB_LITERAL(p->x)->data);
+          } else {
+            xx = cb_build_cast_address(p->x);
+          }
+          cb_tree yy;
+          if (CB_LITERAL_P(p->y)) {
+            yy = cb_build_string0(CB_LITERAL(p->y)->data);
+          } else {
+            yy = cb_build_cast_address(p->y);
+          }
+          x = cb_build_method_call_3("memcmp", xx, yy, cb_int(size1));
           break;
         }
         if (CB_TREE_CLASS(p->x) == CB_CLASS_NUMERIC &&
@@ -2531,9 +2541,19 @@ cb_tree cb_build_cond(cb_tree x) {
         if (size1 == 1 && size2 == 1) {
           x = cb_build_funcall_2("$G", p->x, p->y);
         } else if (size1 != 0 && size1 == size2) {
-          x = cb_build_method_call_3("memcmp", cb_build_cast_address(p->x),
-                                     cb_build_cast_address(p->y),
-                                     cb_int(size1));
+          cb_tree xx;
+          if (CB_LITERAL_P(p->x)) {
+            xx = cb_build_string0(CB_LITERAL(p->x)->data);
+          } else {
+            xx = cb_build_cast_address(p->x);
+          }
+          cb_tree yy;
+          if (CB_LITERAL_P(p->y)) {
+            yy = cb_build_string0(CB_LITERAL(p->y)->data);
+          } else {
+            yy = cb_build_cast_address(p->y);
+          }
+          x = cb_build_method_call_3("memcmp", xx, yy, cb_int(size1));
         } else {
           if (CB_TREE_CLASS(p->x) == CB_CLASS_NUMERIC && p->y == cb_zero) {
             x = cb_build_optim_cond(p);

tests/Makefile.am

@@ -190,7 +190,8 @@ misc_DEPENDENCIES = \
 	misc.src/index-file-status.at \
 	misc.src/comp-n.at \
 	misc.src/fd-external.at \
-	misc.src/compile-multiple-files.at
+	misc.src/compile-multiple-files.at \
+	misc.src/compare-large-number.at
 
 EXTRA_DIST = $(srcdir)/package.m4 \
 	$(TESTS) \

tests/Makefile.in

@@ -731,7 +731,8 @@ misc_DEPENDENCIES = \
 	misc.src/index-file-status.at \
 	misc.src/comp-n.at \
 	misc.src/fd-external.at \
-	misc.src/compile-multiple-files.at
+	misc.src/compile-multiple-files.at \
+	misc.src/compare-large-number.at
 
 EXTRA_DIST = $(srcdir)/package.m4 \
 	$(TESTS) \

tests/misc.at

@@ -41,3 +41,4 @@ m4_include([index-file-status.at])
 m4_include([comp-n.at])
 m4_include([fd-external.at])
 m4_include([compile-multiple-files.at])
+m4_include([compare-large-number.at])

tests/misc.src/compare-large-number.at

@@ -0,0 +1,42 @@
+AT_SETUP([Compare large])
+
+AT_DATA([prog.cbl], [
+       IDENTIFICATION   DIVISION.
+       PROGRAM-ID.      prog.
+       DATA             DIVISION.
+       WORKING-STORAGE  SECTION.
+       PROCEDURE        DIVISION.
+           IF 2147483647 = 2147483647 THEN
+              DISPLAY "OK"
+           END-IF.
+
+           IF -2147483648 = 2147483648 THEN
+              DISPLAY "OK"
+           END-IF.
+
+           EVALUATE 2147483647
+             WHEN 2147483647
+               DISPLAY "OK"
+             WHEN 1
+               DISPLAY "NG"
+             WHEN OTHER
+               DISPLAY "NG".
+
+           EVALUATE -2147483648
+             WHEN -2147483648
+               DISPLAY "OK"
+             WHEN 1
+               DISPLAY "NG"
+             WHEN OTHER
+               DISPLAY "NG".
+])
+
+AT_CHECK([cobj prog.cbl])
+AT_CHECK([java prog], [0],
+[OK
+OK
+OK
+OK
+])
+
+AT_CLEANUP