Merge branch 'develop' into fix-inspect-improve

Author: kio-watanabe

.github/workflows/create-release.yml

@@ -44,4 +44,29 @@ jobs:
         gh release upload ${{ github.ref_name }} cobj.exe --clobber
         gh release upload ${{ github.ref_name }} libcobj.jar --clobber
         gh release upload ${{ github.ref_name }} config/default.conf --clobber
-        
+
+  # publish libcobj.jar to GitHub Packages
+  publish:
+    needs: check-workflows
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          cd ../
+          mv opensourcecobol4j/* .
+          mv libcobj/* opensourcecobol4j
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v3
+      - name: Publish package
+        uses: gradle/gradle-build-action@v3
+        with:
+          arguments: publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish-libcobj.yml

@@ -1973,7 +1973,7 @@ static void joutput_cond(cb_tree x, int save_flag) {
     }
     joutput_indent("(new GetInt() {");
     joutput_indent_level += 2;
-    joutput_indent("public int run(){");
+    joutput_indent("public int run() throws CobolStopRunException {");
     joutput_indent_level += 2;
     for (; x; x = CB_CHAIN(x)) {
       // 最後の文ならreturn文を書く
@@ -2667,6 +2667,7 @@ static void joutput_search_all(cb_tree table, cb_tree stmt, cb_tree cond,
   joutput_prefix();
   joutput("int tail = ");
   if (p->occurs_depending) {
+    joutput("(int)");
     joutput_integer(p->occurs_depending);
     joutput(" + 1;\n");
   } else {

cobj/codegen.c

@@ -18,12 +18,15 @@
  */
 package jp.osscons.opensourcecobol.libcobj.common;
 
+import jp.osscons.opensourcecobol.libcobj.exceptions.CobolStopRunException;
+
 /** TODO: 準備中 */
 public interface GetInt {
     /**
      * TODO: 準備中
      *
      * @return TODO: 準備中
+     * @throws CobolStopRunException TODO: 準備中
      */
-    int run();
+    int run() throws CobolStopRunException;
 }

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

@@ -691,10 +691,49 @@ private int addInt(int in, int opt) {
             }
         }
 
+        if (this.isPositiveZeroOrNegativeZero()) {
+            sign = 1;
+        }
+
         this.putSign(sign);
         return 0;
     }
 
+    /**
+     * このフィールドが正のゼロまたは負のゼロであるかどうかを判定する
+     */
+    private boolean isPositiveZeroOrNegativeZero() {
+        int signIndex;
+        CobolFieldAttribute attr = this.getAttribute();
+        if (attr.isFlagHaveSign() && !attr.isFlagSignSeparate()) {
+            if (attr.isFlagSignLeading()) {
+                signIndex = 0;
+            } else {
+                signIndex = this.getSize() - 1;
+            }
+        } else {
+            signIndex = -1000;
+        }
+
+        CobolDataStorage data = this.getDataStorage();
+        int size = this.getFieldSize();
+        int firstDataIndex = this.getFirstDataIndex();
+        for (int i = 0; i < size; ++i) {
+            int index = firstDataIndex + i;
+            byte value = data.getByte(index);
+            if (index == signIndex) {
+                if (value != 0x30 && value != 0x70) {
+                    return false;
+                }
+            } else {
+                if (value != 0x30) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
     /**
      * libcob/numeric.cのdisplay_add_intの実装
      *
@@ -767,6 +806,9 @@ private static int displaySubInt(CobolDataStorage data, int firstDataIndex, int
 
             /* perform subtraction */
             byte val = data.getByte(sp);
+            if (val >= 0x70) {
+                val -= 0x40;
+            }
             data.setByte(sp, (byte) (val - (i + carry)));
             if (val - (i + carry) < '0') {
                 carry = 1;

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

@@ -221,6 +221,9 @@ misc_DEPENDENCIES = \
 	misc.src/evaluate-switch.at \
 	misc.src/fserial-variable.at \
 	misc.src/file-handler-japanese.at \
+	misc.src/perform-until-div.at \
+	misc.src/search-occurs-depending.at \
+	misc.src/fix-subtract.at \
 	misc.src/display-inspect-sign.at
 
 EXTRA_DIST = $(srcdir)/package.m4 \

tests/Makefile.am

@@ -760,7 +760,10 @@ misc_DEPENDENCIES = \
 	misc.src/evaluate-switch.at \
 	misc.src/fserial-variable.at \
 	misc.src/file-handler-japanese.at \
-	misc.src/display-inspect-sign.at
+	misc.src/perform-until-div.at \
+	misc.src/search-occurs-depending.at \
+	misc.src/fix-subtract.at \
+  misc.src/display-inspect-sign.at
 
 EXTRA_DIST = $(srcdir)/package.m4 \
 	$(TESTS) \

tests/Makefile.in

@@ -50,4 +50,7 @@ m4_include([japanese-char-section-var.at])
 m4_include([evaluate-switch.at])
 m4_include([fserial-variable.at])
 m4_include([file-handler-japanese.at])
+m4_include([perform-until-div.at])
+m4_include([search-occurs-depending.at])
+m4_include([fix-subtract.at])
 m4_include([display-inspect-sign.at])