changeset 655:4846c5f8ccbf

tweak generate_stub.pl
author anatofuz <anatofuz@cr.ie.u-ryukyu.ac.jp>
date Sun, 16 Aug 2020 13:32:09 +0900
parents 9d360601b620
children 0aa2e7cde328
files src/parallel_execution/generate_stub.pl
diffstat 1 files changed, 48 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- a/src/parallel_execution/generate_stub.pl	Fri Aug 14 17:29:19 2020 +0900
+++ b/src/parallel_execution/generate_stub.pl	Sun Aug 16 13:32:09 2020 +0900
@@ -304,66 +304,66 @@
     if ($typeName eq $implementation) {
         # get implementation
         $dataGearName{$codeGearName} .= "\t$typeName* $varName = ($typeName*)GearImpl($context_name, $interface, $varName);\n";
-    } else {
-        # interface var
-        for my $ivar (keys %{$var{$interface}}) {
-            #  input data gear field
-            if ($varName eq $ivar) {
-                if ($typeName eq $var{$interface}->{$ivar}) {
-                    if ($output) {
-                        $dataGearName{$codeGearName} .= "\t$typeName$ptrType* O_$varName = &Gearef($context_name, $interface)->$varName;\n";
-                        $outputVar{$codeGearName} .= "\t$typeName$ptrType $varName  __attribute__((unused))  = *O_$varName;\n";
-                        return 1;
-                    }
-                    $dataGearName{$codeGearName} .= "\t$typeName$ptrType $varName = Gearef($context_name, $interface)->$varName;\n";
+        return 1;
+    }
+    # interface var
+    for my $ivar (keys %{$var{$interface}}) {
+        #  input data gear field
+        if ($varName eq $ivar) {
+            if ($typeName eq $var{$interface}->{$ivar}) {
+                if ($output) {
+                    $dataGearName{$codeGearName} .= "\t$typeName$ptrType* O_$varName = &Gearef($context_name, $interface)->$varName;\n";
+                    $outputVar{$codeGearName} .= "\t$typeName$ptrType $varName  __attribute__((unused))  = *O_$varName;\n";
                     return 1;
                 }
-            }
-        }
-    
-        # interface continuation
-        for my $cName (keys %{$code{$interface}}) {
-            if ($varName eq $cName) {
-                # continuation field
-                $dataGearName{$codeGearName} .= "\tenum Code $varName = Gearef($context_name, $interface)->$varName;\n";
+                $dataGearName{$codeGearName} .= "\t$typeName$ptrType $varName = Gearef($context_name, $interface)->$varName;\n";
                 return 1;
             }
         }
-        # par goto  var
-        for my $var (keys %{$codeGear{$codeGearName}->{"var"}}) {
-            #  input data gear field
-            if ($varName eq $var) {
-                my ($type, $count) = split(/\s/, $codeGear{$codeGearName}->{"var"}->{$var});
-                if ($typeName eq $type) {
-                    if ($output) {
-                        $dataGearName{$codeGearName} .= "\t$typeName$ptrType* O_$varName = ($typeName $ptrType*)&${context_name}->data[${context_name}\->odg + $count];\n";
-                        $outputVar{$codeGearName} .= "\t$typeName$ptrType $varName = *O_$varName;\n";
-                        return 1;
-                    }
-                    $dataGearName{$codeGearName} .= "\t$typeName$ptrType $varName = &${context_name}->data[${context_name}\->idg + $count]->$typeName;\n";
+    }
+
+    # interface continuation
+    for my $cName (keys %{$code{$interface}}) {
+        if ($varName eq $cName) {
+            # continuation field
+            $dataGearName{$codeGearName} .= "\tenum Code $varName = Gearef($context_name, $interface)->$varName;\n";
+            return 1;
+        }
+    }
+    # par goto  var
+    for my $var (keys %{$codeGear{$codeGearName}->{"var"}}) {
+        #  input data gear field
+        if ($varName eq $var) {
+            my ($type, $count) = split(/\s/, $codeGear{$codeGearName}->{"var"}->{$var});
+            if ($typeName eq $type) {
+                if ($output) {
+                    $dataGearName{$codeGearName} .= "\t$typeName$ptrType* O_$varName = ($typeName $ptrType*)&${context_name}->data[${context_name}\->odg + $count];\n";
+                    $outputVar{$codeGearName} .= "\t$typeName$ptrType $varName = *O_$varName;\n";
                     return 1;
                 }
-            }
-        }
-
-        # par goto continuation
-        for my $cName (keys %{$codeGear{$codeGearName}->{"code"}}) {
-            if ($varName eq $cName) {
-                # continuation field
-                $dataGearName{$codeGearName} .= "\tenum Code $varName = ${context_name}\->next;\n";
+                $dataGearName{$codeGearName} .= "\t$typeName$ptrType $varName = &${context_name}->data[${context_name}\->idg + $count]->$typeName;\n";
                 return 1;
             }
         }
+    }
 
-        # par goto continuation
-        # global or local variable case
-        if ($typeName eq "Code") {
-            $dataGearName{$codeGearName} .= "\tenum $typeName$ptrType $varName = Gearef(${context_name}, $interface)->$varName;\n";
+    # par goto continuation
+    for my $cName (keys %{$codeGear{$codeGearName}->{"code"}}) {
+        if ($varName eq $cName) {
+            # continuation field
+            $dataGearName{$codeGearName} .= "\tenum Code $varName = ${context_name}\->next;\n";
             return 1;
         }
-        $dataGearName{$codeGearName} .= "\t$typeName$ptrType $varName = Gearef($context_name, $typeName);\n";
+    }
+
+    # par goto continuation
+    # global or local variable case
+    if ($typeName eq "Code") {
+        $dataGearName{$codeGearName} .= "\tenum $typeName$ptrType $varName = Gearef(${context_name}, $interface)->$varName;\n";
         return 1;
     }
+    $dataGearName{$codeGearName} .= "\t$typeName$ptrType $varName = Gearef($context_name, $typeName);\n";
+    return 1;
 }
 
 sub generateDataGear {
@@ -456,7 +456,7 @@
                     if ($args =~ s/^(\s)*\_\_code\s+(\w+)\(([^)]*)\)//) {
                         my $next = $2;
                         my @args = split(/,/,$3);
-                        if (&generateStubArgs($codeGearName, $next, "Code", "", $next, $interface,0) ) {
+                        if (generateStubArgs($codeGearName, $next, "Code", "", $next, $interface,0) ) {
                             $newArgs .= "enum Code $next";
                         }
                         # analyze continuation arguments
@@ -475,7 +475,7 @@
                         }
                             my $typeField = lcfirst($typeName);
                             push(@{$outputArgs{$codeGearName}->{$next}}, $varName);
-                            if (&generateStubArgs($codeGearName, $varName, $typeName, $ptrType, $typeField, $interface,1)) {
+                            if (generateStubArgs($codeGearName, $varName, $typeName, $ptrType, $typeField, $interface,1)) {
                                 $newArgs .= ",$structType $typeName **O_$varName";
                             }
                         }
@@ -489,7 +489,7 @@
                             $typeName = "$structType $typeName";
                         }
                         my $typeField = lcfirst($typeName);
-                        &generateStubArgs($codeGearName, $varName, $typeName, $ptrType, $typeField, $interface,0);
+                        generateStubArgs($codeGearName, $varName, $typeName, $ptrType, $typeField, $interface,0);
                     } elsif ($args =~ s/(.*,)//) {
                         $newArgs .= $1;
                     } else {