Mercurial > hg > Gears > Gears

changeset 824:2deb394a53a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
...
author anatofuz <anatofuz@cr.ie.u-ryukyu.ac.jp>
date Mon, 18 Jan 2021 21:49:23 +0900
parents 64a70e5778a7
children 4cb62fe4673a
files src/parallel_execution/generate_context.pl src/parallel_execution/lib/Gears/Context.pm
diffstat 2 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/parallel_execution/generate_context.pl	Mon Jan 18 13:34:32 2021 +0900
+++ b/src/parallel_execution/generate_context.pl	Mon Jan 18 21:49:23 2021 +0900
@@ -351,16 +351,17 @@
 }
 
 sub find_generics_each_item {
-    my ($name, $entry, $generics, $typed_variables, $interface_name) = @_;
+    my ($name, $entry, $generics, $typed_variables, $interface_name, $file_path) = @_;
     if (defined $entry->{generics}) {
-      my $elem = { name => $name, field_defined_type => $entry->{generics}};
+      my $elem = { name => $name, field_defined_type => $entry->{generics}, file_path => $entry->{file_name}};
       if ($interface_name) {
         $elem->{interface} = $interface_name;
       }
       $generics->{$name} = $elem;
     }
     if (defined $entry->{typed_variable}) {
-      my $elem = { name => $name, typed_variable => $entry->{typed_variable}, typed_variable_types => $entry->{typed_variable_types}};
+      my $elem = { name => $name, typed_variable => $entry->{typed_variable},
+                    typed_variable_types => $entry->{typed_variable_types}, file_path => $entry->{file_name}};
       if ($interface_name) {
         $elem->{interface} = $interface_name;
       }
@@ -432,9 +433,6 @@
     }
   }
 
-  #p $typed_instances;
-  #p $typed_variables;
-
 
 
 }
--- a/src/parallel_execution/lib/Gears/Context.pm	Mon Jan 18 13:34:32 2021 +0900
+++ b/src/parallel_execution/lib/Gears/Context.pm	Mon Jan 18 21:49:23 2021 +0900
@@ -83,7 +83,7 @@
                 my $tmpGenerics = $2;
                 my $tmpVarName  = $3;
 
-                if ($tmpGenerics eq $generics) { #Test<T>* createTest(Impl test, Hoge<T>) case
+                if ( ($generics) && ($tmpGenerics eq $generics)) { #Test<T>* createTest(Impl test, Hoge<T>) case
                     push(
                       @{$self->{generics_list}->{typed_varible}},
                       { name => $tmpType, typed_variable => $tmpGenerics, caller => $cbc_file, line_number => $.}