[Swift-commit] r6998 - branches/release-0.94/resources

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-08-26 02:06:13 -0500 (Mon, 26 Aug 2013)
New Revision: 6998

Modified:
   branches/release-0.94/resources/swiftscript.g
Log:
removed special treatment of assignment from procedure call and always parse rvalues as expressions

Modified: branches/release-0.94/resources/swiftscript.g
===================================================================
--- branches/release-0.94/resources/swiftscript.g	2013-08-25 18:46:52 UTC (rev 6997)
+++ branches/release-0.94/resources/swiftscript.g	2013-08-26 07:06:13 UTC (rev 6998)
@@ -240,11 +240,10 @@
 
 // TODO: mapping does here...
 // which means construction of the variable template goes here, rather than
-// in procedurecallDecl/variableDecl
+// in variableDecl
 
     (
-      (predictProcedurecallDecl) => procedurecallDecl[code, thisTypeTemplate, n, variable]
-    | variableDecl[code, thisTypeTemplate, n, variable]
+      variableDecl[code, thisTypeTemplate, n, variable]
 // nice to lose this distinction entirely...
 //    | (predictDatasetdecl) => datasetdecl[code, thisTypeTemplate, n]
 // TODO can shorten variableDecl predictor now we dont' need to
@@ -765,25 +764,6 @@
     ;
 
 
-predictProcedurecallDecl : ASSIGN ID LPAREN ;
-
-procedurecallDecl [StringTemplate container, StringTemplate type, StringTemplate decl, StringTemplate var]
-{
-StringTemplate code=template("call");
-StringTemplate f=template("returnParam");
-
-StringTemplate declref=template("variableReference");
-declref.setAttribute("name",decl);
-f.setAttribute("name", declref);
-code.setAttribute("outputs", f);
-container.setAttribute("statements",code);
-
-}
-    :
-        ASSIGN
-        procedureInvocationWithoutSemi[code]
-    ;
-
 procedurecallStatAssignManyReturnParam [StringTemplate s]
 { StringTemplate code=template("call"); }
     :