Fix CANCEL statement against hyphen-containd program-id #121 (#122)

Author: yutaro-sakamoto

libcobj/src/jp/osscons/opensourcecobol/libcobj/call/CobolResolve.java

@@ -388,6 +388,7 @@ public static void cobCancel(String name) throws CobolStopRunException {
       CobolStopRunException.stopRunAndThrow(1);
     }
 
+    name = name.replaceAll("-", "__");
     CobolRunnable runner = callTable.get(name);
     if (runner != null) {
       runner.cancel();

tests/Makefile.am

@@ -172,7 +172,8 @@ misc_DEPENDENCIES = \
 	misc.src/comp-overflow.at \
 	misc.src/compare-national-diff-size.at \
 	misc.src/compare-9.at \
-	misc.src/comp3-overflow.at
+	misc.src/comp3-overflow.at \
+	misc.src/cancel-hyphen.at
 
 EXTRA_DIST = $(srcdir)/package.m4 \
 	$(TESTS) \

tests/Makefile.in

@@ -713,7 +713,8 @@ misc_DEPENDENCIES = \
 	misc.src/comp-overflow.at \
 	misc.src/compare-national-diff-size.at \
 	misc.src/compare-9.at \
-	misc.src/comp3-overflow.at
+	misc.src/comp3-overflow.at \
+	misc.src/cancel-hyphen.at
 
 EXTRA_DIST = $(srcdir)/package.m4 \
 	$(TESTS) \

tests/misc.at

@@ -31,3 +31,4 @@ m4_include([comp-overflow.at])
 m4_include([compare-national-diff-size.at])
 m4_include([compare-9.at])
 m4_include([comp3-overflow.at])
+m4_include([cancel-hyphen.at])

tests/misc.src/cancel-hyphen.at

@@ -0,0 +1,48 @@
+AT_SETUP([CANCEL hyphen])
+
+AT_DATA([TEST18.cbl], [
+       IDENTIFICATION              DIVISION.
+       PROGRAM-ID. TEST18.
+       DATA                        DIVISION.
+       WORKING-STORAGE             SECTION.
+       01  WK-X         PIC X(02).
+       PROCEDURE                   DIVISION.
+       MAIN-RTN.
+           MOVE  "AA"  TO  WK-X.
+           CALL "TEST18-1" USING WK-X.
+           MOVE  "BB"  TO  WK-X.
+           CALL "TEST18-1" USING WK-X.
+           CALL "TEST18-1" USING WK-X.
+           CANCEL "TEST18-1".
+           CALL "TEST18-1" USING WK-X.
+])
+
+AT_DATA([TEST18-1.cbl], [
+       IDENTIFICATION              DIVISION.
+       PROGRAM-ID.                 TEST18-1.
+       ENVIRONMENT                 DIVISION.
+       DATA                        DIVISION.
+       WORKING-STORAGE             SECTION.
+       01  WK-9         PIC 9(02) VALUE ZERO.
+       LINKAGE                     SECTION.
+       01  LK-X         PIC X(02).
+       PROCEDURE                   DIVISION USING LK-X.
+       MAIN-RTN.
+           EVALUATE  LK-X
+            WHEN "AA"
+              MOVE  ZERO  TO  WK-9
+            WHEN "BB"
+              ADD  1  TO  WK-9
+              DISPLAY WK-9 UPON CONSOLE
+           END-EVALUATE.
+           GOBACK.
+])
+
+AT_CHECK([${COBJ} TEST18.cbl TEST18-1.cbl])
+AT_CHECK([java TEST18], [0],
+[01
+02
+01
+])
+
+AT_CLEANUP