[Swift-commit] r2175 - in trunk: src/org/griphyn/vdl/mapping tests/language-behaviour

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2008-08-05 06:27:08 -0500 (Tue, 05 Aug 2008)
New Revision: 2175

Added:
   trunk/tests/language-behaviour/07552-ext-mapper-numeric.inside.out.expected
   trunk/tests/language-behaviour/07552-ext-mapper-numeric.mapper.out.expected
   trunk/tests/language-behaviour/07552-ext-mapper-numeric.sh
   trunk/tests/language-behaviour/07552-ext-mapper-numeric.swift
Modified:
   trunk/src/org/griphyn/vdl/mapping/MappingParam.java
Log:
change formatting of numeric parameters to external mappers to be more
consistent with formatting of numeric parameters passed to applications.
tests for this.


Modified: trunk/src/org/griphyn/vdl/mapping/MappingParam.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/MappingParam.java	2008-08-04 18:55:46 UTC (rev 2174)
+++ trunk/src/org/griphyn/vdl/mapping/MappingParam.java	2008-08-05 11:27:08 UTC (rev 2175)
@@ -44,7 +44,7 @@
 		if (value instanceof DSHandle) {
 			DSHandle handle = (DSHandle) value;
 			checkHandle(handle);
-			return handle.getValue();
+			return handle.toString();
 		}
 		else if (value == null) {
 			if (!defSet) {

Added: trunk/tests/language-behaviour/07552-ext-mapper-numeric.inside.out.expected
===================================================================
--- trunk/tests/language-behaviour/07552-ext-mapper-numeric.inside.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/07552-ext-mapper-numeric.inside.out.expected	2008-08-05 11:27:08 UTC (rev 2175)
@@ -0,0 +1 @@
+5000

Added: trunk/tests/language-behaviour/07552-ext-mapper-numeric.mapper.out.expected
===================================================================
--- trunk/tests/language-behaviour/07552-ext-mapper-numeric.mapper.out.expected	                        (rev 0)
+++ trunk/tests/language-behaviour/07552-ext-mapper-numeric.mapper.out.expected	2008-08-05 11:27:08 UTC (rev 2175)
@@ -0,0 +1 @@
+-ssss 5000

Added: trunk/tests/language-behaviour/07552-ext-mapper-numeric.sh
===================================================================
--- trunk/tests/language-behaviour/07552-ext-mapper-numeric.sh	                        (rev 0)
+++ trunk/tests/language-behaviour/07552-ext-mapper-numeric.sh	2008-08-05 11:27:08 UTC (rev 2175)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo $@ > 07552-ext-mapper-numeric.mapper.out
+
+echo "$ 07552-ext-mapper-numeric.inside.out"
+


Property changes on: trunk/tests/language-behaviour/07552-ext-mapper-numeric.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/tests/language-behaviour/07552-ext-mapper-numeric.swift
===================================================================
--- trunk/tests/language-behaviour/07552-ext-mapper-numeric.swift	                        (rev 0)
+++ trunk/tests/language-behaviour/07552-ext-mapper-numeric.swift	2008-08-05 11:27:08 UTC (rev 2175)
@@ -0,0 +1,13 @@
+type messagefile;
+
+(messagefile t) greeting(int n) { 
+    app {
+        echo n stdout=@filename(t);
+    }
+}
+
+int n = 5000;
+messagefile outfile <ext; exec="07552-ext-mapper-numeric.sh", ssss=n>;
+
+outfile = greeting(n);
+