Mercurial > hg > Gears > Gears
changeset 685:aa49b27140df
...
author | anatofuz <anatofuz@cr.ie.u-ryukyu.ac.jp> |
---|---|
date | Fri, 21 Aug 2020 11:37:21 +0900 |
parents | 117c0ef2279f |
children | 3c37a86646ce |
files | src/parallel_execution/lib/Gears/Util.pm src/parallel_execution/perlTests/util.t |
diffstat | 2 files changed, 8 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/parallel_execution/lib/Gears/Util.pm Fri Aug 21 08:59:46 2020 +0900 +++ b/src/parallel_execution/lib/Gears/Util.pm Fri Aug 21 11:37:21 2020 +0900 @@ -4,16 +4,10 @@ use Carp qw/croak carp/; use File::Find; -sub parse { - my ($class, $file_name) = @_; - my $ir = _parse_base($file_name); - return $ir; -} - sub parse_interface { my ($class, $file_name) = @_; - my $ir = _parse_base($file_name); + my $ir = Gears::Util->parse($file_name); unless ($ir->{name}) { carp "[WARN] invalid interface name at $file_name"; @@ -23,7 +17,7 @@ } -sub _parse_base { +sub parse { # create this data structure # \ { @@ -57,7 +51,7 @@ # name "Stack" #} - my ($file,$code_verbose) = @_; + my ($class, $file) = @_; my $ir = {}; $ir->{file_name} = $file; @@ -212,7 +206,7 @@ # my ($class, $file) = @_; - my $ir = _parse_base($file); + my $ir = Gears::Util->parse($file); $ir->{hasOutputArgs} = {}; @@ -271,8 +265,8 @@ my ($class, $find_path) = @_; $find_path //= "."; - my @files; find( { wanted => sub { push @files, $_ if /\. -cbc/ }, no_chdir => 1 }, $find_path); + my @files; + find( { wanted => sub { push @files, $_ if /\.cbc/ }, no_chdir => 1 }, $find_path); return \@files; }
--- a/src/parallel_execution/perlTests/util.t Fri Aug 21 08:59:46 2020 +0900 +++ b/src/parallel_execution/perlTests/util.t Fri Aug 21 11:37:21 2020 +0900 @@ -11,12 +11,13 @@ subtest 'file_checking' => sub { plan tests => 3; + eval { Gears::Util->file_checking("nonexistent_file.c") }; ok $@; like( $@, qr/invalid filepath/ ); my $exists_file = "$FindBin::Bin/README.md"; - my $found_file = Gears::Util->file_checking($exists_file); + my $found_file = Gears::Util->file_checking($exists_file); is $found_file, $exists_file; };