Implement locking of indexed files.

.github/workflows/coverage.yml

@@ -41,7 +41,7 @@ jobs:
       - name: Run other tests
         working-directory: tests
         run: |
-          tests=("command-line-options" "data-rep" "i18n_sjis" "jp-compat" "run" "syntax" "cobj-idx" "misc")
+          tests=("command-line-options" "data-rep" "i18n_sjis" "jp-compat" "run" "syntax" "cobj-idx" "indexed-lock" "misc")
           for test in "${tests[@]}"; do
             ./"$test" || true
           done

.github/workflows/pull-request.yml

@@ -54,6 +54,7 @@ jobs:
           - "syntax"
           - "cobj-idx"
           - "misc"
+          - "indexed-lock"
         os: ["ubuntu:24.04", "almalinux:9", "amazonlinux:2023"]
     uses: ./.github/workflows/test-other.yml
     with:
@@ -74,6 +75,7 @@ jobs:
           - "run"
           - "syntax"
           - "cobj-idx"
+          - "indexed-lock"
           #- "misc"
         os: ["ubuntu:24.04", "almalinux:9", "amazonlinux:2023"]
     uses: ./.github/workflows/test-other.yml

.github/workflows/push.yml

@@ -58,6 +58,7 @@ jobs:
           - "run"
           - "syntax"
           - "cobj-idx"
+          - "indexed-lock"
           - "misc"
         os: ["ubuntu:24.04"]
     uses: ./.github/workflows/test-other.yml
@@ -79,6 +80,7 @@ jobs:
           - "run"
           - "syntax"
           - "cobj-idx"
+          - "indexed-lock"
           #- "misc"
         os: ["ubuntu:24.04"]
     uses: ./.github/workflows/test-other.yml

.gitignore

@@ -54,6 +54,7 @@ tests/jp-compat
 tests/cobj-idx
 tests/misc
 tests/run
+tests/indexed-lock
 tests/*.log
 tests/syntax
 tests/cobol85/*/*.class

cobj/cobj.c

@@ -145,10 +145,14 @@ int cb_flag_main = 0;
 
 int cb_default_byte_specified = 0;
 unsigned char cb_default_byte = 0;
+
+int cb_default_select_lock_mode = COB_LOCK_MANUAL;
+
 #define OPTION_ID_DEFAULT_BYTE (1024)
 #define OPTION_ID_SINGLE_JAR (1025)
 #define OPTION_ID_JAR (1026)
 #define OPTION_ID_INFO_JSON (1027)
+#define OPTION_ID_LOCK_MODE_AUTOMATIC (1028)
 
 int external_flg = 0;
 int errorcount = 0;
@@ -311,6 +315,7 @@ static const struct option long_options[] = {
     {"reference_check", no_argument, NULL, 'K'},
     {"constant", optional_argument, NULL, '3'},
     {"fdefaultbyte", required_argument, NULL, OPTION_ID_DEFAULT_BYTE},
+    {"lock-mode-automatic", no_argument, NULL, OPTION_ID_LOCK_MODE_AUTOMATIC},
 #undef CB_FLAG
 #define CB_FLAG(var, name, doc)                                                \
   {"f" name, no_argument, &var, 1}, {"fno-" name, no_argument, &var, 0},
@@ -901,6 +906,8 @@ static void cobc_print_usage(void) {
          "representing a character"));
   puts(_("                                    * octodecimal 00..0377 "
          "representing a character"));
+  puts(_("  -lock-mode-automatic              Set the default lock mode of "
+         "select clauses to AUTOMATIC"));
   puts(_("  -info-json-dir=<dir>              Specify the directory path of "
          "JSON files that hold information of COBOL programs"));
   puts(_("  -java-package(=<package name>)    Specify the package name of the "
@@ -1156,6 +1163,10 @@ static int process_command_line(const int argc, char *argv[]) {
       fflush(stderr);
       break;
 
+    case OPTION_ID_LOCK_MODE_AUTOMATIC:
+      cb_default_select_lock_mode = COB_LOCK_AUTOMATIC;
+      break;
+
     case '3': /* --constant */
       if (optarg) {
         cb_constant_list_add(optarg);

cobj/cobj.h

@@ -383,4 +383,5 @@ extern int cb_verify(const enum cb_support tag, const char *feature);
 extern int cb_flag_info_json;
 extern char *cb_info_json_dir;
 
+extern int cb_default_select_lock_mode;
 #endif /* CB_COBC_H */

cobj/parser.h

@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by GNU Bison 3.7.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation,
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -515,8 +515,6 @@ typedef int YYSTYPE;
 
 extern YYSTYPE yylval;
 
-
 int yyparse (void);
 
-
 #endif /* !YY_YY_PARSER_H_INCLUDED  */

cobj/parser.y

@@ -5382,9 +5382,7 @@ read_statement:
 		     CB_FILE(cb_ref ($3))->organization != COB_ORG_INDEXED)) {
 			current_statement->handler_id = COB_EC_I_O_PERMANENT_ERROR;
 		}
-		if ($7 && (CB_FILE(cb_ref ($3))->lock_mode & COB_LOCK_AUTOMATIC)) {
-			cb_error (_("LOCK clause invalid with file LOCK AUTOMATIC"));
-		} else if ($8 &&
+		if ($8 &&
 		      (CB_FILE(cb_ref ($3))->organization != COB_ORG_RELATIVE &&
 		       CB_FILE(cb_ref ($3))->organization != COB_ORG_INDEXED)) {
 			cb_error (_("KEY clause invalid with this file type"));

cobj/tree.c

@@ -1725,6 +1725,7 @@ struct cb_file *build_file(cb_tree name) {
   p->access_mode = COB_ACCESS_SEQUENTIAL;
   p->handler = CB_LABEL(cb_standard_error_handler);
   p->handler_prog = current_program;
+  p->lock_mode = cb_default_select_lock_mode;
   if (external_flg == 1) {
     p->external_assign = 1;
   }

libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/file/CobolFile.java

@@ -346,10 +346,10 @@ public class CobolFile {
     protected static final int COB_LOCK_MANUAL = 2;
 
     /** TODO: 準備中 */
-    protected static final int COB_LOCK_AUTOMATIC = 3;
+    protected static final int COB_LOCK_AUTOMATIC = 4;
 
     /** TODO: 準備中 */
-    protected static final int COB_LOCK_MULTIPLE = 1;
+    protected static final int COB_LOCK_MULTIPLE = 8;
 
     /** TODO: 準備中 */
     protected static final int COB_LOCK_MASK = 0x7;
@@ -1436,17 +1436,6 @@ public void read(AbstractCobolField key, AbstractCobolField fnstatus, int readOp
             readOpts &= ~COB_READ_LOCK;
         }
 
-        if (this.organization == COB_ORG_INDEXED /* && bdb_env != null */) {
-            if (this.open_mode != COB_OPEN_I_O || (this.lock_mode & COB_LOCK_EXCLUSIVE) != 0) {
-                readOpts &= ~COB_READ_LOCK;
-            } else if ((this.lock_mode & COB_LOCK_AUTOMATIC) != 0
-                    && (readOpts & COB_READ_NO_LOCK) == 0) {
-                readOpts |= COB_READ_LOCK;
-            }
-        } else {
-            readOpts &= ~COB_READ_LOCK;
-        }
-
         int ret;
         if (key != null) {
             ret = this.read_(key, readOpts);