[Swift-commit] r7848 - trunk/resources

hategan at ci.uchicago.edu hategan at ci.uchicago.edu
Fri May 9 00:01:20 CDT 2014


Author: hategan
Date: 2014-05-09 00:01:20 -0500 (Fri, 09 May 2014)
New Revision: 7848

Modified:
   trunk/resources/swiftscript.g
Log:
I think this was arbitrary string app declaration stuff

Modified: trunk/resources/swiftscript.g
===================================================================
--- trunk/resources/swiftscript.g	2014-05-09 04:58:58 UTC (rev 7847)
+++ trunk/resources/swiftscript.g	2014-05-09 05:01:20 UTC (rev 7848)
@@ -273,6 +273,12 @@
     :   id:ID {code=text(id.getText());}
     ;
 
+appDeclarator returns [StringTemplate code=null]
+    :   id:ID {code=text(id.getText());}
+    |	s:STRING_LITERAL {code=text(s.getText());}
+    ;
+
+
 varInitializer returns [StringTemplate code=null]
     :   ASSIGN code=expression
     ;
@@ -432,8 +438,10 @@
         RPAREN
         LCURLY
         ( appProfile[app] )*
-        exec=declarator
-        {app.setAttribute("exec",exec);}
+        (exec=appDeclarator)
+        {
+       		app.setAttribute("exec", exec);
+        }
         ( appArg[app] )* SEMI
         {code.setAttribute("config",app);}
         RCURLY




More information about the Swift-commit mailing list