古いスクリプト構造を修正

diff --git a/asp/configure b/asp/configure
index 8ff7e9d..96a6000 100755 (executable)
--- a/asp/configure
+++ b/asp/configure
@@ -74,7 +74,7 @@ require "getopt.pl";
 #
 #  オプションの処理
 #
-do Getopt("TAaULDltmdpg");
+Getopt("TAaULDltmdpg");
 
 #
 #  変数の初期化
@@ -98,7 +98,7 @@ sub get_objext {
        local(@uname);
 
        use POSIX;
-       @uname = do uname();
+       @uname = uname();
        if ($uname[0] =~ /^cygwin/i) {
                return("exe");
        }
@@ -166,26 +166,26 @@ sub generate {
        if ($sys) {
                $path = $templatedir."/".$file.".".$cpu."-".$sys;
                if (-f $path) {
-                       do convert($path, $file);
+                       convert($path, $file);
                        return;
                }
 
                $path = $templatedir."/".$file.".".$sys;
                if (-f $path) {
-                       do convert($path, $file);
+                       convert($path, $file);
                        return;
                }
        }       
 
        $path = $templatedir."/".$file.".".$cpu;
        if (-f $path) {
-               do convert($path, $file);
+               convert($path, $file);
                return;
        }       
 
        $path = $templatedir."/".$file;
        if ($mandatory || -f $path) {
-               do convert($path, $file);
+               convert($path, $file);
        }       
 }
 
@@ -209,7 +209,7 @@ else {
        $srcabsdir = $srcdir = $pwd;
 }
 
-$perl = $opt_p ? $opt_p : do get_path("perl", ("/usr/local/bin", "/usr/bin"));
+$perl = $opt_p ? $opt_p : get_path("perl", ("/usr/local/bin", "/usr/bin"));
 $cfg = $opt_g ? $opt_g : "\$(SRCDIR)/cfg/cfg/cfg";
 $cfgfile = $opt_g ? $opt_g : $srcdir."/cfg/cfg/cfg";
 $templatedir = $opt_t ? $opt_t : $srcdir."/sample";
@@ -244,7 +244,7 @@ $vartable{"DBGENV"} = $dbgenv;
 $vartable{"ENABLE_TRACE"} = $enable_trace;
 $vartable{"PERL"} = $perl;
 $vartable{"CFG"} = $cfg;
-$objext = do get_objext();
+$objext = get_objext();
 $vartable{"OBJEXT"} = $objext;
 
 #
@@ -260,11 +260,11 @@ if (! -d $srcdir."/target/".$target) {
 #  Makefile とアプリケーションファイルの生成
 #
 
-do generate($makefile, 1);
-do generate($applname.".c", 0);
-do generate($applname.".cpp", 0);
-do generate($applname.".h", 0);
-do generate($applname.".cfg", 0);
+generate($makefile, 1);
+generate($applname.".c", 0);
+generate($applname.".cpp", 0);
+generate($applname.".h", 0);
+generate($applname.".cfg", 0);
 
 #
 #  cfg ができているかのチェック

diff --git a/asp/utils/applyrename b/asp/utils/applyrename
index e4c87d0..8abcfb3 100755 (executable)
--- a/asp/utils/applyrename
+++ b/asp/utils/applyrename
@@ -91,10 +91,10 @@ open(INFILE, $deffile) || die "Cannot open $deffile";
 while ($line = <INFILE>) {
        chomp $line;
        if ($line =~ /^#(.*)$/) {
-               # do nothing
+               # nothing
        }
        elsif ($line =~ /^INCLUDE[ \t]+(.*)$/) {
-               # do nothing
+               # nothing
        }
        elsif ($line ne "") {
                @syms = (@syms, $line)
@@ -115,5 +115,5 @@ foreach $infile (@ARGV) {
        # ファイルでなければスキップ
        next unless (-f $infile);
 
-       do applyrename($infile) if ($infile ne $deffile);
+       applyrename($infile) if ($infile ne $deffile);
 }

diff --git a/asp/utils/genoffset b/asp/utils/genoffset
index a4c3e0e..6cf97c3 100755 (executable)
--- a/asp/utils/genoffset
+++ b/asp/utils/genoffset
@@ -193,7 +193,7 @@ sub parse_bit {
        }
 
        # ビット位置を探す
-       $val_bit = do search_bit($val);
+       $val_bit = search_bit($val);
 
        # バイト単位に換算する
        if ($endian eq "B") {
@@ -246,10 +246,10 @@ while ($line = <INFILE>) {
        chomp $line;
 
        if ($line =~ /^[ \t]*OFFSET_DEF ([^ \t]+) = [#\$]?([^ \t]+)/) {
-               do parse_offset($1, $2);
+               parse_offset($1, $2);
        }
        elsif ($line =~ /^[ \t]*_?BIT_REF_([0-9]+):/) {
-               do ref_bit($1);
+               ref_bit($1);
        }
        elsif ($line =~ /^[ \t]*SIL_ENDIAN = ([BL])/) {
                $sil_endian = $1;
@@ -264,7 +264,7 @@ while ($line = <INFILE>) {
        chomp $line;
 
        if ($line =~ /^[ \t]*_?BIT_([BL])([BHW])_([^ \t]+):/) {
-               do parse_bit($1, $2, $3);
+               parse_bit($1, $2, $3);
        }
 }
 close(INFILE);

diff --git a/asp/utils/genrename b/asp/utils/genrename
index 94627b5..8aa1648 100755 (executable)
--- a/asp/utils/genrename
+++ b/asp/utils/genrename
@@ -68,7 +68,7 @@ sub generate_define
        print FILE "\t" if (length($prefix.$sym) < 16);
        print FILE "\t" if (length($prefix.$sym) < 20);
        print FILE "\t" if (length($prefix.$sym) < 24);
-       print FILE "\t",$prefix,do prefix_string($sym),$sym,"\n";
+       print FILE "\t",$prefix,prefix_string($sym),$sym,"\n";
 }
 
 #
@@ -141,10 +141,10 @@ foreach $sym (@syms) {
                print FILE " */\n";
        }
        elsif ($sym =~ /^INCLUDE[ \t]+(.*)$/) {
-               do generate_include($1, "rename");
+               generate_include($1, "rename");
        }
        elsif ($sym ne "") {
-               do generate_define($sym, "");
+               generate_define($sym, "");
        }
        else {
                print FILE "\n";
@@ -164,10 +164,10 @@ foreach $sym (@syms) {
                print FILE " */\n";
        }
        elsif ($sym =~ /^INCLUDE[ \t]+(.*)$/) {
-               # do nothing
+               # nothing
        }
        elsif ($sym ne "") {
-               do generate_define($sym, "_");
+               generate_define($sym, "_");
        }
        else {
                print FILE "\n";
@@ -205,10 +205,10 @@ foreach $sym (@syms) {
                print FILE " */\n";
        }
        elsif ($sym =~ /^INCLUDE[ \t]+(.*)$/) {
-               do generate_include($1, "unrename");
+               generate_include($1, "unrename");
        }
        elsif ($sym ne "") {
-               do generate_undef($sym, "");
+               generate_undef($sym, "");
        }
        else {
                print FILE "\n";
@@ -228,10 +228,10 @@ foreach $sym (@syms) {
                print FILE " */\n";
        }
        elsif ($sym =~ /^INCLUDE[ \t]+(.*)$/) {
-               # do nothing
+               # nothing
        }
        elsif ($sym ne "") {
-               do generate_undef($sym, "_");
+               generate_undef($sym, "_");
        }
        else {
                print FILE "\n";

diff --git a/asp/utils/gentest b/asp/utils/gentest
index 6746aed..0338281 100755 (executable)
--- a/asp/utils/gentest
+++ b/asp/utils/gentest
@@ -110,14 +110,14 @@ sub gen_svc_call {
 
        $TASKCODE{$tskid} .= $indentstr;
        $TASKCODE{$tskid} .= sprintf("ercd = %s;\n", $svc_call);
-       do gen_var_def($svc_call);
+       gen_var_def($svc_call);
 
        if ($error_code_string eq "") {
                $TASKCODE{$tskid} .= $indentstr;
                $TASKCODE{$tskid} .= sprintf("check_ercd(ercd, E_OK);\n");
        }
        elsif ($error_code_string =~ /^\-\>\s*noreturn$/) {
-               # do nothing.
+               # nothing.
        }
        else {
                $error_code = $error_code_string;
@@ -131,7 +131,7 @@ sub parse_line {
        local($line) = @_;
 
        if ($line =~ /^\.\./) {
-               # do nothing.
+               # nothing.
        }
        elsif ($line =~ /^==\s*((TASK|ALM)[0-9]+)(.*)$/) {
                $startflag = 1;
@@ -168,7 +168,7 @@ sub parse_line {
                }
        }
        elsif (!$startflag) {
-               # do nothing.
+               # nothing.
        }
        elsif ($line =~ /^(assert\(.*\))$/) {
                $assert_string = $1;
@@ -208,13 +208,13 @@ sub parse_line {
                $error_code_string = $3;
                $TASKCODE{$tskid} .= "\n".$indentstr;
                $TASKCODE{$tskid} .= sprintf("check_point(%d);\n", $check_no);
-               do gen_svc_call($svc_call, $error_code_string);
+               gen_svc_call($svc_call, $error_code_string);
        }
        elsif ($line =~ /^([a-z_]+\(.*\))\s*(\-\>\s*[A-Za-z_]*)?\s*$/) {
                $svc_call = $1;
                $error_code_string = $2;
                $TASKCODE{$tskid} .= "\n";
-               do gen_svc_call($svc_call, $error_code_string);
+               gen_svc_call($svc_call, $error_code_string);
        }
        else {
                print STDERR "Error: ",$line,"\n";
@@ -233,7 +233,7 @@ while (($line = <INFILE>) && !$endflag) {
        $line =~ s/\s*\/\/.*$//;
        $line =~ s/\s*\.\.\..*$//;
        next unless($line);
-       do parse_line($line);
+       parse_line($line);
 }
 close(INFILE);
 
@@ -276,5 +276,5 @@ sub output_task {
 #  テストプログラム出力処理
 #
 foreach $tskid (sort(keys(TASKCODE))) {
-       do output_task();
+       output_task();
 }

diff --git a/asp/utils/makedep b/asp/utils/makedep
index 00cb9aa..c4e7d8b 100755 (executable)
--- a/asp/utils/makedep
+++ b/asp/utils/makedep
@@ -62,7 +62,7 @@ require "getopt.pl";
 #
 #  オプションの処理
 #
-do Getopt("COTDR");
+Getopt("COTDR");
 
 $cc_path = $opt_C;
 $cc_opts = $opt_O;
@@ -88,7 +88,7 @@ else {
 #  Cygwin環境の判別
 #
 use POSIX;
-@uname = do uname();
+@uname = uname();
 if ($uname[0] =~ /^cygwin/i) {
        $cygwin = 1;
 }
@@ -153,16 +153,16 @@ sub makedepend_one {
 #
 foreach $file (@ARGV) {
        %dependlist = ();
-       do makedepend_one($file);
+       makedepend_one($file);
        if (%dependlist) {
                if ($target_name) {
                        if ($opt_S) {
                                foreach $target (split(/[ \t]+/, $target_name)) {
-                                       do output_dependlist($target);
+                                       output_dependlist($target);
                                }
                        }
                        else {
-                               do output_dependlist($target_name);
+                               output_dependlist($target_name);
                        }
                }
                else {
@@ -174,7 +174,7 @@ foreach $file (@ARGV) {
                                        $target = $target_dir."/".$target;
                                }
                        }
-                       do output_dependlist($target);
+                       output_dependlist($target);
                }
        }
 }

diff --git a/asp/utils/makerelease b/asp/utils/makerelease
index dae7e8a..bea77d0 100755 (executable)
--- a/asp/utils/makerelease
+++ b/asp/utils/makerelease
@@ -120,7 +120,7 @@ sub read_file {
                        }
                }
                elsif ($line =~ /^INCLUDE[ \t]+(.*)$/) {
-                       do read_file(do gen_path($dirname, $1));
+                       read_file(gen_path($dirname, $1));
                }
                else {
                        $filename = $prefix."/".$dirname.$line;
@@ -137,7 +137,7 @@ sub read_file {
        close($fh);
 }
 
-do read_file($arg1);
+read_file($arg1);
 unless ($package) {
        die "PACKAGE/E_PACKAGE directive not found.";
 }