[Swift-commit] r3262 - in trunk: libexec src/org/griphyn/vdl/engine

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2010-03-18 11:15:19 -0500 (Thu, 18 Mar 2010)
New Revision: 3262

Modified:
   trunk/libexec/vdl-lib.xml
   trunk/src/org/griphyn/vdl/engine/ProcedureSignature.java
Log:
Turn on @strstr(). 


Modified: trunk/libexec/vdl-lib.xml
===================================================================
--- trunk/libexec/vdl-lib.xml	2010-03-11 22:37:05 UTC (rev 3261)
+++ trunk/libexec/vdl-lib.xml	2010-03-18 16:15:19 UTC (rev 3262)
@@ -8,6 +8,7 @@
 	<export name="writedata"><elementDef classname="org.griphyn.vdl.karajan.lib.swiftscript.WriteData"/></export>
 	<export name="strcat"><elementDef classname="org.griphyn.vdl.karajan.lib.swiftscript.Misc"/></export>
 	<export name="strcut"><elementDef classname="org.griphyn.vdl.karajan.lib.swiftscript.Misc"/></export>
+	<export name="strstr"><elementDef classname="org.griphyn.vdl.karajan.lib.swiftscript.Misc"/></export>	
 	<export name="strsplit"><elementDef classname="org.griphyn.vdl.karajan.lib.swiftscript.Misc"/></export>
 	<export name="regexp"><elementDef classname="org.griphyn.vdl.karajan.lib.swiftscript.Misc"/></export>
 	<export name="toint"><elementDef classname="org.griphyn.vdl.karajan.lib.swiftscript.Misc"/></export>

Modified: trunk/src/org/griphyn/vdl/engine/ProcedureSignature.java
===================================================================
--- trunk/src/org/griphyn/vdl/engine/ProcedureSignature.java	2010-03-11 22:37:05 UTC (rev 3261)
+++ trunk/src/org/griphyn/vdl/engine/ProcedureSignature.java	2010-03-18 16:15:19 UTC (rev 3262)
@@ -213,15 +213,24 @@
 		FormalArgumentSignature strcutOut1 = new FormalArgumentSignature("string");
 		strcut.addOutputArg(strcutOut1);
 		functionsMap.put(strcut.getName(), strcut);
-		
+
+                ProcedureSignature strstr = new ProcedureSignature("strstr");
+		FormalArgumentSignature strstrIn1 = new FormalArgumentSignature("string");
+		strstr.addInputArg(strstrIn1);
+		FormalArgumentSignature strstrIn2 = new FormalArgumentSignature("string");
+		strstr.addInputArg(strstrIn2);
+		FormalArgumentSignature strstrOut1 = new FormalArgumentSignature("int");
+		strstr.addOutputArg(strstrOut1);
+		functionsMap.put(strstr.getName(), strstr);
+                
 		ProcedureSignature strsplit = new ProcedureSignature("strsplit");
-        FormalArgumentSignature strsplitIn1 = new FormalArgumentSignature("string");
-        strsplit.addInputArg(strsplitIn1);
-        FormalArgumentSignature strsplitIn2 = new FormalArgumentSignature("string");
-        strsplit.addInputArg(strsplitIn2);
-        FormalArgumentSignature strsplitOut1 = new FormalArgumentSignature("string[]");
-        strsplit.addOutputArg(strsplitOut1);
-        functionsMap.put(strsplit.getName(), strsplit);
+                FormalArgumentSignature strsplitIn1 = new FormalArgumentSignature("string");
+                strsplit.addInputArg(strsplitIn1);
+                FormalArgumentSignature strsplitIn2 = new FormalArgumentSignature("string");
+                strsplit.addInputArg(strsplitIn2);
+                FormalArgumentSignature strsplitOut1 = new FormalArgumentSignature("string[]");
+                strsplit.addOutputArg(strsplitOut1);
+                functionsMap.put(strsplit.getName(), strsplit);
 		
 		ProcedureSignature toint = new ProcedureSignature("toint");
 		FormalArgumentSignature tointIn1 = new FormalArgumentSignature("string");