update: add tests for --edit-code-command and fix configure.ac

yutaro-sakamoto · yutaro-sakamoto · commit fdbbe58abf0a · 2023-02-28T18:21:59.000+09:00
diff --git a/Makefile.in b/Makefile.in
@@ -336,7 +336,6 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 NM = @NM@
diff --git a/bin/Makefile.in b/bin/Makefile.in
@@ -300,7 +300,6 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 NM = @NM@
diff --git a/cobj/Makefile.in b/cobj/Makefile.in
@@ -283,7 +283,6 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 NM = @NM@
diff --git a/config/Makefile.in b/config/Makefile.in
@@ -249,7 +249,6 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 NM = @NM@
diff --git a/configure b/configure
@@ -21821,7 +21821,7 @@ printf "%s\n" "#define ICONV_CONST $am_cv_proto_iconv_arg1" >>confdefs.h
 
 
 
-AM_LANGINFO_CODESET
+# AM_LANGINFO_CODESET
 
 # Checks for getopt_long.
 # Cygwin has getopt_long_only prototype in kpathsea/getopt.h
diff --git a/configure.ac b/configure.ac
@@ -231,7 +231,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[timezone = 3600;]])]
 
 # Checks for internationalization stuff
 AM_ICONV
-AM_LANGINFO_CODESET
 
 # Checks for getopt_long.
 # Cygwin has getopt_long_only prototype in kpathsea/getopt.h
diff --git a/copy/Makefile.in b/copy/Makefile.in
@@ -248,7 +248,6 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 NM = @NM@
diff --git a/lib/Makefile.in b/lib/Makefile.in
@@ -278,7 +278,6 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 NM = @NM@
diff --git a/libcobj/Makefile.in b/libcobj/Makefile.in
@@ -199,7 +199,6 @@ MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 NM = @NM@
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -152,7 +152,8 @@ command_line_options_DEPENDENCIES = \
 	command-line-options.src/fsyntax-only.at \
 	command-line-options.src/fserial-variable.at \
 	command-line-options.src/fshort-variable.at \
-	command-line-options.src/java-package.at
+	command-line-options.src/java-package.at \
+	command-line-options.src/edit-code-command.at
 
 misc_DEPENDENCIES = \
 	misc.src/signed-comp3.at \
diff --git a/tests/Makefile.in b/tests/Makefile.in
@@ -693,7 +693,8 @@ command_line_options_DEPENDENCIES = \
 	command-line-options.src/fsyntax-only.at \
 	command-line-options.src/fserial-variable.at \
 	command-line-options.src/fshort-variable.at \
-	command-line-options.src/java-package.at
+	command-line-options.src/java-package.at \
+	command-line-options.src/edit-code-command.at
 
 misc_DEPENDENCIES = \
 	misc.src/signed-comp3.at \
diff --git a/tests/command-line-options.at b/tests/command-line-options.at
@@ -9,6 +9,7 @@ m4_include([B.at])
 m4_include([list-reserved.at])
 m4_include([assign_external.at])
 m4_include([java-package.at])
+m4_include([edit-code-command.at])
 m4_include([Wunreachable.at])
 m4_include([ftrace-ftraceall.at])
 m4_include([fsyntax-only.at])
diff --git a/tests/command-line-options.src/edit-code-command.at b/tests/command-line-options.src/edit-code-command.at
@@ -0,0 +1,94 @@
+AT_SETUP([-edit-code-command])
+
+AT_DATA([prog.cbl], [
+       identification division.
+       program-id. prog.
+       procedure division.
+       display "hello".
+])
+
+AT_DATA([SampleInterface.java], [
+    public interface SampleInterface {
+        public void sampleInterfaceRun();
+    }
+])
+
+AT_DATA([CallSampleInterface.java], [
+    public class CallSampleInterface {
+        public static void main(String@<:@@:>@ args) {
+            SampleInterface s = new prog();
+            s.sampleInterfaceRun();
+        }
+    }
+])
+
+AT_DATA([edit.sh], [
+#!/bin/bash
+
+while getopts c:t-: opt; do
+    optarg="$OPTARG"
+    if @<:@@<:@ "$opt" = - @:>@@:>@; then
+        opt="-${OPTARG%%=*}"
+        optarg="${OPTARG/${OPTARG%%=*}/}"
+        optarg="${optarg#=}"
+
+        if @<:@@<:@ -z "$optarg" @:>@@:>@ && @<:@@<:@ ! "${!OPTIND}" = -* @:>@@:>@; then
+            optarg="${!OPTIND}"
+            shift
+        fi
+    fi
+
+    case "-$opt" in
+        --target)
+	        target="$optarg"
+            ;;
+        --class-name)
+            class_name="$optarg"
+            ;;
+        --)
+            break
+            ;;
+    esac
+done
+shift $((OPTIND - 1))
+
+
+case "$target" in
+    # when `--target=main-class` is specified
+    main-class-annotation)
+        echo "//annotation here"
+	    exit 0
+	    ;;
+    # when `--target=file-header` is specified
+    file-header)
+        echo '//file-header here'
+        exit 0
+        ;;
+    # when `--target=main-class` is specified
+    main-class-implements)
+        echo -n 'SampleInterface'
+        exit 0
+        ;;
+    # when `--target=main-class` is specified
+    main-class-contents)
+        echo '  @Override'
+        echo '  public void sampleInterfaceRun() { System.out.println("COBOL"); }'
+        exit 0
+        ;;
+esac
+
+exit 1
+
+])
+
+AT_CHECK([${COBJ} -edit-code-command="bash edit.sh" prog.cbl], [0])
+AT_CHECK([java prog], [0], [hello
+])
+AT_CHECK([javac CallSampleInterface.java])
+AT_CHECK([java CallSampleInterface], [0], [COBOL
+])
+AT_CHECK([cat prog.java | grep 'annotation here' > /dev/null], [0])
+AT_CHECK([cat prog.java | grep 'file-header here' > /dev/null], [0])
+AT_CHECK([cobj --help | grep 'edit-code-command' > /dev/null], [0])
+
+AT_CLEANUP
