Skip to content

Commit 53e45ad

Browse files
Remove CobolGoBackException.java and CobolStopRunException.dummy (#756)
* change: remove CobolGoBackException.java * chore: remove CobolStopRun.dummy
1 parent efef79b commit 53e45ad

File tree

6 files changed

+7
-114
lines changed

6 files changed

+7
-114
lines changed

cobj/codegen.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3767,7 +3767,7 @@ static void joutput_stmt(cb_tree x, enum joutput_stmt_type output_type) {
37673767
joutput_indent_level += 2;
37683768
joutput_line(
37693769
"public Optional<CobolControl> run() throws CobolRuntimeException, "
3770-
"CobolGoBackException, CobolStopRunException {");
3770+
"CobolStopRunException {");
37713771
joutput_indent_level += 2;
37723772

37733773
if (cb_flag_trace) {
@@ -4824,8 +4824,6 @@ static void joutput_internal_function(struct cb_program *prog,
48244824
/* PROCEDURE DIVISION */
48254825
joutput_line("/* PROCEDURE DIVISION */");
48264826
joutput_line("try{");
4827-
joutput_line(" CobolStopRunException.dummy();");
4828-
joutput_line(" CobolGoBackException.dummy();");
48294827
joutput_indent_level += 2;
48304828

48314829
// EDIT
@@ -4864,8 +4862,6 @@ static void joutput_internal_function(struct cb_program *prog,
48644862
}
48654863

48664864
joutput_indent_level -= 2;
4867-
joutput_line("} catch(CobolGoBackException e) {");
4868-
joutput_line(" return e.getReturnCode();");
48694865
joutput_line("} catch(CobolStopRunException e) {");
48704866
joutput_line(" CobolStopRunException.stopRun();");
48714867
joutput_line(" System.exit(e.getReturnCode());");
@@ -5849,7 +5845,7 @@ static void joutput_execution_list(struct cb_program *prog) {
58495845
joutput_indent_level += 2;
58505846
joutput_line(
58515847
"public Optional<CobolControl> run() throws CobolRuntimeException, "
5852-
"CobolGoBackException, CobolStopRunException {");
5848+
"CobolStopRunException {");
58535849
joutput_indent_level += 2;
58545850
cb_tree l;
58555851
flag_execution_begin = EXECUTION_NORMAL;
@@ -5950,7 +5946,7 @@ static void joutput_execution_list(struct cb_program *prog) {
59505946

59515947
static void joutput_execution_entry_func() {
59525948
joutput_line("public void execEntry(int start) throws CobolRuntimeException, "
5953-
"CobolGoBackException, CobolStopRunException {");
5949+
"CobolStopRunException {");
59545950
joutput_indent_level += 2;
59555951
joutput_line(
59565952
"Optional<CobolControl> nextLabel = Optional.of(contList[start]);");

libcobj/Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ SRC_FILES = \
3939
./app/src/main/java/jp/osscons/opensourcecobol/libcobj/data/CobolNationalField.java \
4040
./app/src/main/java/jp/osscons/opensourcecobol/libcobj/data/CobolNumericEditedField.java \
4141
./app/src/main/java/jp/osscons/opensourcecobol/libcobj/exceptions/CobolExceptionId.java \
42-
./app/src/main/java/jp/osscons/opensourcecobol/libcobj/exceptions/CobolGoBackException.java \
4342
./app/src/main/java/jp/osscons/opensourcecobol/libcobj/exceptions/CobolStopRunException.java \
4443
./app/src/main/java/jp/osscons/opensourcecobol/libcobj/exceptions/CobolExceptionInfo.java \
4544
./app/src/main/java/jp/osscons/opensourcecobol/libcobj/exceptions/CobolExceptionTabCode.java \

libcobj/Makefile.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ SRC_FILES = \
316316
./app/src/main/java/jp/osscons/opensourcecobol/libcobj/data/CobolNationalField.java \
317317
./app/src/main/java/jp/osscons/opensourcecobol/libcobj/data/CobolNumericEditedField.java \
318318
./app/src/main/java/jp/osscons/opensourcecobol/libcobj/exceptions/CobolExceptionId.java \
319-
./app/src/main/java/jp/osscons/opensourcecobol/libcobj/exceptions/CobolGoBackException.java \
320319
./app/src/main/java/jp/osscons/opensourcecobol/libcobj/exceptions/CobolStopRunException.java \
321320
./app/src/main/java/jp/osscons/opensourcecobol/libcobj/exceptions/CobolExceptionInfo.java \
322321
./app/src/main/java/jp/osscons/opensourcecobol/libcobj/exceptions/CobolExceptionTabCode.java \

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package jp.osscons.opensourcecobol.libcobj.common;
2020

2121
import java.util.Optional;
22-
import jp.osscons.opensourcecobol.libcobj.exceptions.CobolGoBackException;
2322
import jp.osscons.opensourcecobol.libcobj.exceptions.CobolRuntimeException;
2423
import jp.osscons.opensourcecobol.libcobj.exceptions.CobolStopRunException;
2524

@@ -38,11 +37,10 @@ public enum LabelType {
3837
*
3938
* @return TODO: 準備中
4039
* @throws CobolRuntimeException TODO: 準備中
41-
* @throws CobolGoBackException TODO: 準備中
4240
* @throws CobolStopRunException TODO: 準備中
4341
*/
4442
public abstract Optional<CobolControl> run()
45-
throws CobolRuntimeException, CobolGoBackException, CobolStopRunException;
43+
throws CobolRuntimeException, CobolStopRunException;
4644

4745
/** TODO: 準備中 */
4846
public int contId = -1;
@@ -76,7 +74,7 @@ public static CobolControl pure() {
7674
return new CobolControl() {
7775
@Override
7876
public Optional<CobolControl> run()
79-
throws CobolRuntimeException, CobolGoBackException, CobolStopRunException {
77+
throws CobolRuntimeException, CobolStopRunException {
8078
return Optional.empty();
8179
}
8280
};
@@ -92,7 +90,7 @@ public static CobolControl goTo(CobolControl cont) {
9290
return new CobolControl() {
9391
@Override
9492
public Optional<CobolControl> run()
95-
throws CobolRuntimeException, CobolGoBackException, CobolStopRunException {
93+
throws CobolRuntimeException, CobolStopRunException {
9694
return cont.run();
9795
}
9896
};
@@ -110,7 +108,7 @@ public static CobolControl performThrough(CobolControl[] contList, int begin, in
110108
return new CobolControl() {
111109
@Override
112110
public Optional<CobolControl> run()
113-
throws CobolRuntimeException, CobolGoBackException, CobolStopRunException {
111+
throws CobolRuntimeException, CobolStopRunException {
114112
Optional<CobolControl> nextCont = Optional.of(contList[begin]);
115113
LabelType endType = contList[end].type;
116114
int executedProgramId;

libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/exceptions/CobolGoBackException.java

Lines changed: 0 additions & 87 deletions
This file was deleted.

libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/exceptions/CobolStopRunException.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,6 @@ public static void throwException(CobolDataStorage storage) throws CobolStopRunE
7474
throw new CobolStopRunException(storage);
7575
}
7676

77-
/**
78-
* javaコンパイラは、try節の中にthrowが発生しないと判断するとコンパイルエラーになる。 Javaコード生成時にこの問題を回避するため、このメソッドが挿入される。 throws
79-
* CobolRunExceptionが指定されているが、このメソッドは決して例外をスローせず、その他の処理も実行しない。
80-
*
81-
* @throws CobolStopRunException TODO: 準備中
82-
*/
83-
public static void dummy() throws CobolStopRunException {
84-
if (false) {
85-
throw new CobolStopRunException(0);
86-
}
87-
}
88-
8977
/**
9078
* デフォルトの終了処理を実行してから、CobolStopRunExceptionをスローする。
9179
* デフォルトの終了処理では、COBOLプログラムによってオープンされたファイルのクローズが行われる。

0 commit comments

Comments
 (0)