[Swift-commit] r7942 - trunk/resources

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2014-07-04 01:10:06 -0500 (Fri, 04 Jul 2014)
New Revision: 7942

Modified:
   trunk/resources/Karajan.stg
Log:
removed swift:tr(), swift:stdin(), and other noops

Modified: trunk/resources/Karajan.stg
===================================================================
--- trunk/resources/Karajan.stg	2014-07-04 02:22:01 UTC (rev 7941)
+++ trunk/resources/Karajan.stg	2014-07-04 06:10:06 UTC (rev 7942)
@@ -113,8 +113,8 @@
 swift_execute(outputs,inputs,stageins,stageouts,attributes,application,name,line) ::= <<
 swift:unitStart("PROCEDURE", name="$name$", line=$line$, outputs="$outputs:list();separator=","$")
 swift:execute(
+	"$application.exec$"
 	$attributes$
-	swift:tr("$application.exec$")
 	$stageins:swift_stagein();separator="\n"$
 	$stageouts:swift_stageout();separator="\n"$
 	$swift_arguments(attributes=application.attributes,arguments=application.arguments, stdin=application.stdin,stdout=application.stdout,stderr=application.stderr)$
@@ -152,15 +152,15 @@
 )
 
 $if (stdin)$
-swift:stdin($stdin$)
+stdin = $stdin$
 $endif$
 
 $if (stdout)$
-swift:stdout($stdout$)
+stdout = $stdout$
 $endif$
 
 $if (stderr)$
-swift:stderr($stderr$)
+stderr = $stderr$
 $endif$
 >>
 
@@ -309,7 +309,7 @@
 
 swift_mapping(mapping, file) ::= <<
 $if(file)$
-swift:mapping("single_file_mapper", swift:parameter("file", "$file.name$") $if(file.params)$$file.params;separator="\n"$$endif$)
+swift:mapping("SingleFileMapper", swift:parameter("file", "$file.name$") $if(file.params)$$file.params;separator="\n"$$endif$)
 $else$
 swift:mapping("$mapping.descriptor$", $mapping.params;separator="\n"$)
 $endif$