Fix INSPECT statement (#268)

Author: yutaro-sakamoto

CHANGELOG.md

@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 * Fix the message of COB_VERBOSE file sort (#260)
 * Fix the process that checks MOVE statements (#266, #267)
+* Fix `INSPECT` statement (#268)
 ### Optimized
 * Optimize the file reading process (#257)
 

libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/common/CobolInspect.java

@@ -107,20 +107,17 @@ private static void common(AbstractCobolField f1, AbstractCobolField f2, int typ
     int n = 0;
     if (type == INSPECT_TRAILING) {
       for (int i = len - f2.getSize(); i >= 0; i--) {
-        if (inspectData
-                .getSubDataStorage(inspectStart + i)
-                .memcmp(f2.getDataStorage(), f2.getSize())
-            == 0) {
+        if (inspectData.memcmp(inspectStart + i, f2.getDataStorage(), f2.getSize()) == 0) {
           int j;
           for (j = 0; j < f2.getSize(); ++j) {
             if (inspectMark[mark + i + j] != -1) {
               break;
             }
           }
           if (j == f2.getSize()) {
+            CobolDataStorage f1Storage = f1.getDataStorage();
             for (j = 0; j < f2.getSize(); ++j) {
-              inspectMark[mark + i + j] =
-                  inspectReplacing != 0 ? f1.getDataStorage().getByte(i) : 1;
+              inspectMark[mark + i + j] = inspectReplacing != 0 ? f1Storage.getByte(j) : 1;
             }
             i -= f2.getSize() - 1;
             n++;
@@ -131,20 +128,17 @@ private static void common(AbstractCobolField f1, AbstractCobolField f2, int typ
       }
     } else {
       for (int i = 0; i < (len - f2.getSize() + 1); ++i) {
-        if (inspectData
-                .getSubDataStorage(inspectStart + i)
-                .memcmp(f2.getDataStorage(), f2.getSize())
-            == 0) {
+        if (inspectData.memcmp(inspectStart + i, f2.getDataStorage(), f2.getSize()) == 0) {
           int j;
           for (j = 0; j < f2.getSize(); ++j) {
             if (inspectMark[mark + i + j] != -1) {
               break;
             }
           }
           if (j == f2.getSize()) {
+            CobolDataStorage f1Storage = f1.getDataStorage();
             for (j = 0; j < f2.getSize(); ++j) {
-              inspectMark[mark + i + j] =
-                  inspectReplacing != 0 ? f1.getDataStorage().getByte(j) : 1;
+              inspectMark[mark + i + j] = inspectReplacing != 0 ? f1Storage.getByte(j) : 1;
             }
             i += f2.getSize() - 1;
             n++;

libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/data/CobolDataStorage.java

@@ -329,6 +329,17 @@ public int memcmp(CobolDataStorage buf, int size) {
     return 0;
   }
 
+  public int memcmp(int offset, CobolDataStorage buf, int size) {
+    for (int i = 0; i < size; ++i) {
+      byte x = this.getByte(offset + i);
+      byte y = buf.getByte(i);
+      if (x != y) {
+        return Byte.toUnsignedInt(x) - Byte.toUnsignedInt(y);
+      }
+    }
+    return 0;
+  }
+
   /**
    * 引数で与えられたバイト配列をthis.dataの先頭からコピーする
    *

tests/run.src/miscellaneous.at

@@ -874,7 +874,6 @@ AT_CHECK([java prog], [0], [000003])
 AT_CLEANUP
 
 AT_SETUP([INSPECT REPLACING TRAILING ZEROS BY SPACES])
-AT_CHECK([${SKIP_TEST}])
 
 AT_DATA([prog.cob], [
        IDENTIFICATION   DIVISION.
@@ -895,7 +894,6 @@ AT_CHECK([java prog], [0], [1   ])
 AT_CLEANUP
 
 AT_SETUP([INSPECT REPLACING complex])
-AT_CHECK([${SKIP_TEST}])
 
 AT_DATA([prog.cob], [
        IDENTIFICATION   DIVISION.