[Swift-commit] r2968 - in trunk: resources tests/language-behaviour

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2009-06-22 07:01:37 -0500 (Mon, 22 Jun 2009)
New Revision: 2968

Added:
   trunk/tests/language-behaviour/00242-compound-with-vars.swift
Modified:
   trunk/resources/Karajan.stg
Log:
log internal variables of compound procedures as if they are outputs. these
are distinguished by their names, as internal variable names appear in the
same namespace as return parameters.

Modified: trunk/resources/Karajan.stg
===================================================================
--- trunk/resources/Karajan.stg	2009-06-22 11:14:00 UTC (rev 2967)
+++ trunk/resources/Karajan.stg	2009-06-22 12:01:37 UTC (rev 2968)
@@ -307,6 +307,12 @@
     $endif$
   $endif$
 </set>
+<parameterlog>
+<string>intermediate</string>
+<string>$name$</string>
+<vdl:getdatasetprovenanceid var="{$name$}" />
+<string>{#thread}</string>
+</parameterlog>
 >>
 
 vdl_mapping(mapping,file,waitfor) ::= <<

Added: trunk/tests/language-behaviour/00242-compound-with-vars.swift
===================================================================
--- trunk/tests/language-behaviour/00242-compound-with-vars.swift	                        (rev 0)
+++ trunk/tests/language-behaviour/00242-compound-with-vars.swift	2009-06-22 12:01:37 UTC (rev 2968)
@@ -0,0 +1,20 @@
+type messagefile {}
+
+(messagefile t) greeting(string m) { 
+    app {
+        echo m stdout=@filename(t);
+    }
+}
+
+(messagefile first, messagefile second) compound() {
+  string third="f";
+  first = greeting(third);
+  second = greeting("s");
+}
+
+messagefile a <"0024-compound.Q.out">;
+messagefile b <"0024-compound.R.out">;
+
+(a,b) = compound();
+
+