Minor fixes

Author: nberth

cobc/tree.h

@@ -2373,7 +2373,6 @@ extern struct cb_program	*cb_build_program (struct cb_program *,
 
 extern cb_tree		cb_check_numeric_value (cb_tree);
 extern size_t		cb_check_index_or_handle_p (cb_tree x);
-extern void		cb_check_valid_set_index (cb_tree, int, int);
 extern void		cb_set_dmax (int scale);
 
 extern void		cb_set_intr_when_compiled (void);

cobc/typeck.c

@@ -13742,7 +13742,7 @@ cb_check_set_to (cb_tree vars, cb_tree x, const int emit_error)
 	return error_found;
 }
 
-void
+static void
 cb_check_valid_set_index (cb_tree vars, int hasval, int setval)
 {
 	const int emit_exception = cb_flag_check_subscript_set
@@ -13751,10 +13751,14 @@ cb_check_valid_set_index (cb_tree vars, int hasval, int setval)
 	struct cb_field *f, *p;
 	for (l = vars; l; l = CB_CHAIN (l)) {
 		v = CB_VALUE (l);
-		if (!CB_REF_OR_FIELD_P (v)) continue;
+		if (!CB_REF_OR_FIELD_P (v)) {
+			continue;
+		}
 		f = CB_FIELD_PTR (v);
-		if (!f->flag_indexed_by) continue;
-		if (!f->index_qual) continue;
+		if (!f->flag_indexed_by
+		 || !f->index_qual) {
+			continue;
+		}
 		p = f->index_qual;
 		if (p->depending) {
 			if (hasval) {
@@ -13768,12 +13772,13 @@ cb_check_valid_set_index (cb_tree vars, int hasval, int setval)
 									     cb_int (COB_EC_RANGE_INDEX)));
 					}
 				}
-				if (setval >= p->occurs_min) continue;
+				if (setval >= p->occurs_min) {
+					continue;
+				}
 			}
-		} else
-		if (hasval
-		 && setval >= p->occurs_min
-		 && setval <= p->occurs_max) {
+		} else if (hasval
+			&& setval >= p->occurs_min
+			&& setval <= p->occurs_max) {
 			continue;	/* Checks OK at compile time */
 		} else {
 			if (hasval) {
@@ -13815,8 +13820,7 @@ cb_emit_set_to (cb_tree vars, cb_tree src)
 	} else if (src == cb_zero) {
 		hasval = 1;
 	}
-	if (cb_flag_check_subscript_set
-	 && CB_EXCEPTION_ENABLE (COB_EC_BOUND_SUBSCRIPT)) {
+	if (cb_flag_check_subscript_set) {
 		cb_check_valid_set_index (vars, hasval, setval);
 	}
 }
@@ -13973,9 +13977,7 @@ cb_emit_set_up_down (cb_tree l, cb_tree flag, cb_tree x)
 			cb_emit (cb_build_sub (target, x, cb_int0));
 		}
 	}
-	if (CB_EXCEPTION_ENABLE (COB_EC_RANGE_INDEX)) {
-		cb_check_valid_set_index (vars, 0, 0);
-	}
+	cb_check_valid_set_index (vars, 0, 0);
 }
 
 void

tests/testsuite.src/syn_occurs.at

@@ -714,7 +714,8 @@ AT_DATA([prog.cob], [
            END PROGRAM prog.
 ])
 
-AT_CHECK([$COMPILE_ONLY -fopt-check-subscript-set prog.cob], [1], [], [prog.cob:22: error: an integer, INDEX, or a POINTER is expected here
+AT_CHECK([$COMPILE_ONLY -fopt-check-subscript-set prog.cob], [1], [],
+[prog.cob:22: error: an integer, INDEX, or a POINTER is expected here
 prog.cob:23: error: an integer, INDEX, or a POINTER is expected here
 prog.cob:24: warning: SET IB2 TO 10 is out of bounds
 prog.cob:36: warning: SET IB1 TO -9 is out of bounds