Merge pull request #350 from opensourcecobol/develop

Author: yutaro-sakamoto

.github/workflows/build-gcc9.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps: 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '21'
@@ -18,7 +18,7 @@ jobs:
           sudo apt install -y gcc-9 build-essential gettext autoconf
 
       - name: Checkout opensource COBOL 4J
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install opensource COBOL 4J
         run: |

.github/workflows/javadoc.yml

@@ -18,4 +18,4 @@ jobs:
       - name: Run javadoc
         working-directory: libcobj 
         run: |
-          ./gradlew javadoc || true
+          ./gradlew javadoc

CHANGELOG.md

@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.0.20] - 2024-02-28
+### Added
+* Add command line options
+  * `-conf`: specify the configuration file (#331)
+  * `-std`: specify the dialect (#331)
+  * `-Wconstant`: Warn inconsistent constant (#335)
+  * `-Warchaic`: Warn if archaic features are used (#336)
+  * `-Wobsolete`: Warn if obsolete features are used (#336)
+* Add intrinsic functions
+  * `LOCALE-DATE` (#338)
+  * `LOCALE-TIME` (#340)
+  * `LOCALE-TIME-FROM-SECONDS` (#341)
+### Fixed
+* Fix runtime checkings (#326, #328)
+* Detect invalid indexed record keys (#346)
+* Accept field names which contain Japanese characters (#324)
+
 ## [1.0.19] - 2024-01-31
 ### Added
 * A new CLI tool for indexed files (#299)

ChangeLog

@@ -1,3 +1,7 @@
+2024-02-28  OSS Consortium <ws-opensource-cobol-contact@osscons.jp>
+
+	* opensource COBOL 4J v1.0.20 released.
+
 2024-01-31  OSS Consortium <ws-opensource-cobol-contact@osscons.jp>
 
 	* opensource COBOL 4J v1.0.19 released.

NEWS

@@ -1,9 +1,29 @@
 NEWS - user visible changes				-*- outline -*-
 
-* opensource COBOL 4J 1.0.19
+-----------------------------------------------------------------------
+
+* opensource COBOL 4J 1.0.20
+
+** New Features
+  (1) Add command line options
+    * -conf: specify the configuration file
+    * -std: specify the dialect
+    * -Wconstant: Warn inconsistent constant
+    * -Warchaic: Warn if archaic features are used
+    * -Wobsolete: Warn if obsolete features are used
+  (2) Add intrinsic functions
+    * LOCALE-DATE
+    * LOCALE-TIME
+    * LOCALE-TIME-FROM-SECONDS
+** Bug Fixes
+  (1) Fix runtime checkings
+  (2) Detect invalid indexed record keys
+  (3) Accept field names which contain Japanese characters
 
 -----------------------------------------------------------------------
 
+* opensource COBOL 4J 1.0.19
+
 ** New Features
   (1) A new CLI tool for indexed files
   (2) Implement `COB_FILE_SEQ_WRITE_BUFFER_SIZE`

README.md

@@ -53,9 +53,9 @@ dnf install -y java-21-amazon-corretto-devel gcc make bison flex automake autoco
 
 ### Install opensource COBOL 4J
 ```
-curl -L -o opensourcecobol4j-v1.0.19.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.19.tar.gz
-tar zxvf opensourcecobol4j-v1.0.19.tar.gz
-cd opensourcecobol4j-1.0.19
+curl -L -o opensourcecobol4j-v1.0.20.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.20.tar.gz
+tar zxvf opensourcecobol4j-v1.0.20.tar.gz
+cd opensourcecobol4j-1.0.20
 ./configure --prefix=/usr/
 make
 sudo make install
@@ -72,7 +72,7 @@ In order to check installations of older versions,
 The docker container for opensource COBOL 4J is available.
 
 ```bash
-docker pull opensourcecobol/opensourcecobol4j:1.0.19
+docker pull opensourcecobol/opensourcecobol4j:1.0.20
 ```
 
 Execute the following commands in order to run the "Hello World" COBOL program.

README_JP.md

@@ -23,7 +23,7 @@ opensource COBOL 4J は下記の環境でテストされています.
 
 ## インストール
 
-opensource COBOL 4J v1.0.19はUbuntuとAlmaLinuxで動作を確認しています.  
+opensource COBOL 4J v1.0.20はUbuntuとAlmaLinuxで動作を確認しています.  
 
 ## 手動インストール
 
@@ -57,9 +57,9 @@ dnf install -y java-21-amazon-corretto-devel gcc make bison flex automake autoco
 下記のコマンドを実行する
 
 ```
-curl -L -o opensourcecobol4j-v1.0.19.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.19.tar.gz
-tar zxvf opensourcecobol4j-v1.0.19.tar.gz
-cd opensourcecobol4j-1.0.19
+curl -L -o opensourcecobol4j-v1.0.20.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.20.tar.gz
+tar zxvf opensourcecobol4j-v1.0.20.tar.gz
+cd opensourcecobol4j-1.0.20
 ./configure --prefix=/usr/
 make
 sudo make install
@@ -73,10 +73,10 @@ sudo make install
 
 ## Dockerによるインストール
 
-opensource COBOL 4J v1.0.19をインストールしたDockerイメージを利用できます.
+opensource COBOL 4J v1.0.20をインストールしたDockerイメージを利用できます.
 
 ```bash
-docker pull opensourcecobol/opensourcecobol4j:1.0.19
+docker pull opensourcecobol/opensourcecobol4j:1.0.20
 ```
 
 コンテナ内で下記のコマンドを実行すると、Hello Worldプログラムをコンパイル&実行できる。

bin/cobjrun.c

@@ -84,8 +84,8 @@ cobjrun_print_version (void)
 	} else {
 		snprintf (buff, buff_size, "%s %s", __DATE__, __TIME__);
 	}
-	printf ("cobjrun (%s) %s.%d\n",
-		PACKAGE_NAME, PACKAGE_VERSION, PATCH_LEVEL);
+	printf ("cobjrun (%s) %s\n",
+		PACKAGE_NAME, PACKAGE_VERSION);
 	puts ("Copyright (C) 2022-2022 TOKYO SYSTEM HOUSE CO.,LTD.");
 }
 

cobj/check-format

@@ -7,9 +7,6 @@ codegen.c \
 config.c \
 error.c \
 field.c \
-pplex.c \
-ppparse.c \
-ppparse.h \
 reserved.c \
 tree.c \
 tree.h \

cobj/cobj.c

@@ -783,6 +783,13 @@ static void cobc_print_usage(void) {
   puts(_("  --version, -V                     Display compiler version"));
   puts(_("  -m                                Create jar files instead of "
          "class files (an experimental feature)"));
+  puts(_("  -std=<dialect>                    Warnings/features for a specific "
+         "dialect :"));
+  puts(_("                                      cobol85     Cobol 85"));
+  puts(_(
+      "                                      default     When not specified"));
+  puts(_("                                    See config/default.conf and "
+         "config/*.conf"));
   puts(_("  -free                             Use free source format"));
   puts(_("  -free_1col_aster                  Use free(1col_aster) source "
          "format"));
@@ -801,6 +808,8 @@ static void cobc_print_usage(void) {
          "search path"));
   puts(_("  -B <options>                      Add <options> to the Java "
          "compiler"));
+  puts(_("  -conf=<file>                      User defined dialect "
+         "configuration - See -std="));
   puts(_("  --list-reserved                   Display reserved words"));
   puts(
       _("  -assign_external                  Set the file assign to external"));
@@ -1556,8 +1565,7 @@ static int preprocess(struct filename *fn) {
       if (ppout) {
         char line[COB_MEDIUM_BUFF];
         memset(line, 0, sizeof(line));
-        fprintf(cb_listing_file, "# Generated by %s.%d\n", PACKAGE_STRING,
-                PATCH_LEVEL);
+        fprintf(cb_listing_file, "# Generated by %s\n", PACKAGE_STRING);
         fprintf(cb_listing_file, "# Built        %s\n", cb_oc_build_stamp);
         fprintf(cb_listing_file, "# Packaged     %s\n", octardate);
         fprintf(cb_listing_file, "# Environment\n");