[Swift-commit] r2973 - in trunk: resources src/org/griphyn/vdl/engine

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2009-06-22 12:00:46 -0500 (Mon, 22 Jun 2009)
New Revision: 2973

Modified:
   trunk/resources/Karajan.stg
   trunk/resources/swiftscript.xsd
   trunk/src/org/griphyn/vdl/engine/Karajan.java
Log:
Remove isArray attribute from variables in the XML representation of
SwiftScript, because arrayness is stored in the type attribute now.

Modified: trunk/resources/Karajan.stg
===================================================================
--- trunk/resources/Karajan.stg	2009-06-22 16:57:12 UTC (rev 2972)
+++ trunk/resources/Karajan.stg	2009-06-22 17:00:46 UTC (rev 2973)
@@ -97,7 +97,7 @@
 >>
 
 typecheck() ::= <<
-<vdl:typecheck argname="$it.name$" var="{$it.name$}" type="$it.type.name$"$if(it.isArray)$ isArray="true"$endif$/>
+<vdl:typecheck argname="$it.name$" var="{$it.name$}" type="$it.type.name$" />
 >>
 
 vdl_execute(outputs,inputs,application,name,line) ::= <<
@@ -291,15 +291,15 @@
 </global>
 >>
 
-variable(name,type,isArray,expr,mapping,nil,file,waitfor,datatype) ::= <<
+variable(name,type,expr,mapping,nil,file,waitfor,datatype) ::= <<
 <set name="$name$">
   $if(mapping)$
-  <vdl:new type="$type$" dbgname="$name$"$if(isArray)$ isArray="true"$endif$$if(waitfor)$ waitfor="$waitfor;separator=" "$"$endif$>
+  <vdl:new type="$type$" dbgname="$name$"$if(waitfor)$ waitfor="$waitfor;separator=" "$"$endif$>
     $vdl_mapping(mapping=mapping,file=file,waitfor=waitfor)$
   </vdl:new>
   $else$
     $if(file)$
-      <vdl:new type="$type$" dbgname="$name$"$if(isArray)$ isArray="true"$endif$$if(waitfor)$ waitfor="$waitfor;separator=" "$"$endif$>
+      <vdl:new type="$type$" dbgname="$name$"$if(waitfor)$ waitfor="$waitfor;separator=" "$"$endif$>
         $vdl_mapping(mapping=mapping,file=file,waitfor=waitfor)$
       </vdl:new>
     $else$

Modified: trunk/resources/swiftscript.xsd
===================================================================
--- trunk/resources/swiftscript.xsd	2009-06-22 16:57:12 UTC (rev 2972)
+++ trunk/resources/swiftscript.xsd	2009-06-22 17:00:46 UTC (rev 2973)
@@ -129,8 +129,6 @@
 
     <xs:attribute name="type" type="xs:QName" use="required"/>
 
-    <xs:attribute default="false" name="isArray" type="xs:boolean"/>
-
   </xs:complexType>
 
   <xs:complexType name="Binding">
@@ -302,8 +300,6 @@
     <xs:attribute name="name" type="xs:NCName"/>
 
     <xs:attribute name="type" type="xs:QName" use="required"/>
-
-    <xs:attribute name="isArray" type="xs:boolean"/>
   </xs:complexType>
 
   <xs:complexType name="ActualParameter">

Modified: trunk/src/org/griphyn/vdl/engine/Karajan.java
===================================================================
--- trunk/src/org/griphyn/vdl/engine/Karajan.java	2009-06-22 16:57:12 UTC (rev 2972)
+++ trunk/src/org/griphyn/vdl/engine/Karajan.java	2009-06-22 17:00:46 UTC (rev 2973)
@@ -242,7 +242,6 @@
 		typeST.setAttribute("name", param.getType().getLocalPart());
 		typeST.setAttribute("namespace", param.getType().getNamespaceURI());
 		paramST.setAttribute("type", typeST);
-		paramST.setAttribute("isArray", new Boolean(param.getIsArray1()));
 		if(!param.isNil())
 			paramST.setAttribute("default",expressionToKarajan(param.getAbstractExpression(), scope));
 		return paramST;
@@ -252,7 +251,6 @@
 		StringTemplate variableST = template("variable");
 		variableST.setAttribute("name", var.getName());
 		variableST.setAttribute("type", var.getType().getLocalPart());
-		variableST.setAttribute("isArray", Boolean.valueOf(var.getIsArray1()));
 
 		checkIsTypeDefined(var.getType().getLocalPart());
 		if(!var.isNil()) {