Simplified write code for optional arguments in all templates

fortesg · Mar 6, 2019 · b0efd61 · b0efd61
1 parent bf5ef60
commit b0efd61
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 64 deletions.
diff --git a/templates/BaseCompare/capture.aftersubroutine.tmpl b/templates/BaseCompare/capture.aftersubroutine.tmpl
@@ -49,14 +49,10 @@ SUBROUTINE ftg_${subroutine.name}_capture_input($commaList($args))
   #end for
 
   ! OPTIONAL ARGUMENTS
-  #for $arg in $args.optionals
-    #if $arg.usedVariables
-      IF (PRESENT($arg.name)) THEN
-      #for $var in $arg.usedVariables
-        $ftgWrite($var)
-      #end for 
-      END IF
-    #end if 
+  #for $var in $args.optionals.usedVariables
+    IF (PRESENT($var.container(0))) THEN $mergeBegin('present')
+      $ftgWrite($var) $clearLine
+    END IF $mergeEnd('present')
   #end for
 
   ! GLOBALS
@@ -90,14 +86,10 @@ SUBROUTINE ftg_${subroutine.name}_capture_output($commaList($args.allOut, $resul
   #end for
 
   ! OPTIONAL ARGUMENTS
-  #for $arg in $args.allOut.optionals
-    #if $arg.usedVariables
-      IF (PRESENT($arg.name)) THEN $mergeBegin('present')
-        #for $var in $arg.usedVariables
-          $ftgWrite($var)
-        #end for 
-      END IF $mergeEnd('present')
-    #end if 
+  #for $var in $args.allOut.optionals.usedVariables
+    IF (PRESENT($var.container(0))) THEN $mergeBegin('present')
+      $ftgWrite($var) $clearLine
+    END IF $mergeEnd('present')
   #end for
 
   #if $subroutine.isFunction

diff --git a/templates/IconStandalone/capture.aftersubroutine.tmpl b/templates/IconStandalone/capture.aftersubroutine.tmpl
@@ -85,14 +85,10 @@ SUBROUTINE ftg_${subroutine.name}_capture_input($commaList($args))
   #end for
 
   ! OPTIONAL ARGUMENTS
-  #for $arg in $args.optionals
-    #if $arg.usedVariables
-      IF (PRESENT($arg.name)) THEN $mergeBegin('present')
-      #for $var in $arg.usedVariables
-        $ftgWrite($var) $clearLine
-      #end for 
-      END IF $mergeEnd('present')
-    #end if 
+  #for $var in $args.optionals.usedVariables
+    IF (PRESENT($var.container(0))) THEN $mergeBegin('present')
+      $ftgWrite($var) $clearLine
+    END IF $mergeEnd('present')
   #end for
 
   ! GLOBALS
@@ -132,14 +128,10 @@ SUBROUTINE ftg_${subroutine.name}_capture_output($commaList($args.allOut, $resul
   #end for
 
   ! OPTIONAL ARGUMENTS
-  #for $arg in $args.allOut.optionals
-    #if $arg.usedVariables
-      IF (PRESENT($arg.name)) THEN $mergeBegin('present')
-        #for $var in $arg.usedVariables
-          $ftgWrite($var) $clearLine
-        #end for 
-      END IF $mergeEnd('present')
-    #end if 
+  #for $var in $args.allOut.optionals.usedVariables
+    IF (PRESENT($var.container(0))) THEN $mergeBegin('present')
+      $ftgWrite($var) $clearLine
+    END IF $mergeEnd('present')
   #end for
 
   #if $subroutine.isFunction

diff --git a/templates/Standalone/capture.aftersubroutine.tmpl b/templates/Standalone/capture.aftersubroutine.tmpl
@@ -78,14 +78,10 @@ SUBROUTINE ftg_${subroutine.name}_capture_input($commaList($args))
   #end for
 
   ! OPTIONAL ARGUMENTS
-  #for $arg in $args.optionals
-    #if $arg.usedVariables
-      IF (PRESENT($arg.name)) THEN $mergeBegin('present')
-      #for $var in $arg.usedVariables
-        $ftgWrite($var) $clearLine
-      #end for 
-      END IF $mergeEnd('present')
-    #end if 
+  #for $var in $args.optionals.usedVariables
+    IF (PRESENT($var.container(0))) THEN $mergeBegin('present')
+      $ftgWrite($var) $clearLine
+    END IF $mergeEnd('present')
   #end for
 
   ! GLOBALS
@@ -125,14 +121,10 @@ SUBROUTINE ftg_${subroutine.name}_capture_output($commaList($args.allOut, $resul
   #end for
 
   ! OPTIONAL ARGUMENTS
-  #for $arg in $args.allOut.optionals
-    #if $arg.usedVariables
-      IF (PRESENT($arg.name)) THEN $mergeBegin('present')
-        #for $var in $arg.usedVariables
-          $ftgWrite($var) $clearLine
-        #end for 
-      END IF $mergeEnd('present')
-    #end if 
+  #for $var in $args.allOut.optionals.usedVariables
+    IF (PRESENT($var.container(0))) THEN $mergeBegin('present')
+      $ftgWrite($var) $clearLine
+    END IF $mergeEnd('present')
   #end for
 
   #if $subroutine.isFunction

diff --git a/templates/StandaloneNoMPI/capture.aftersubroutine.tmpl b/templates/StandaloneNoMPI/capture.aftersubroutine.tmpl
@@ -72,14 +72,10 @@ SUBROUTINE ftg_${subroutine.name}_capture_input($commaList($args))
   #end for
 
   ! OPTIONAL ARGUMENTS
-  #for $arg in $args.optionals
-    #if $arg.usedVariables
-      IF (PRESENT($arg.name)) THEN $mergeBegin('present')
-      #for $var in $arg.usedVariables
-        $ftgWrite($var) $clearLine
-      #end for 
-      END IF $mergeEnd('present')
-    #end if 
+  #for $var in $args.optionals.usedVariables
+    IF (PRESENT($var.container(0))) THEN $mergeBegin('present')
+      $ftgWrite($var) $clearLine
+    END IF $mergeEnd('present')
   #end for
 
   ! GLOBALS
@@ -117,14 +113,10 @@ SUBROUTINE ftg_${subroutine.name}_capture_output($commaList($args.allOut, $resul
   #end for
 
   ! OPTIONAL ARGUMENTS
-  #for $arg in $args.allOut.optionals
-    #if $arg.usedVariables
-      IF (PRESENT($arg.name)) THEN $mergeBegin('present')
-        #for $var in $arg.usedVariables
-          $ftgWrite($var) $clearLine
-        #end for 
-      END IF $mergeEnd('present')
-    #end if 
+  #for $var in $args.allOut.optionals.usedVariables
+    IF (PRESENT($var.container(0))) THEN $mergeBegin('present')
+      $ftgWrite($var) $clearLine
+    END IF $mergeEnd('present')
   #end for
 
   #if $subroutine.isFunction