[Swift-commit] r6404 - in trunk/docs: merged/refmanual userguide

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2013-03-24 21:16:58 -0500 (Sun, 24 Mar 2013)
New Revision: 6404

Modified:
   trunk/docs/merged/refmanual/grammar
   trunk/docs/merged/refmanual/swiftlang
   trunk/docs/userguide/coasters
Log:
formatting, and updates

Modified: trunk/docs/merged/refmanual/grammar
===================================================================
--- trunk/docs/merged/refmanual/grammar	2013-03-22 22:00:32 UTC (rev 6403)
+++ trunk/docs/merged/refmanual/grammar	2013-03-25 02:16:58 UTC (rev 6404)
@@ -457,10 +457,8 @@
     ;
 ----
 
-TODO in here, why do we have an | between LBRACKBRACK and ASSIGN?
-does this mean that we don't have array initialisation in formal
-params? this wouldn't surprise me given the previous treatment
-of arrays. investigate this and fix...
+App Formal parameter
+~~~~~~~~~~~~~~~~~~~~
 
 ----
 formalParameter returns [StringTemplate code=template("parameter")]
@@ -563,7 +561,7 @@
     ;
 ----
 
-These are the statements that we can predict with ll(1) grammer
+These are the statements that can be predicted with ll(1) grammer
 i.e. with one token of lookahead
 
 ----
@@ -1227,12 +1225,6 @@
 
 Identifier
 ~~~~~~~~~~
-
-// TODO - redo identifier parsing to fit in with the XML style
-// that this patch introduces
-// specifically, need the base ID to be distinct from all the
-// other IDs
-
 ----
 identifier returns [StringTemplate code=null]
 {
@@ -1270,11 +1262,11 @@
     ;
 ----
 
+Array Member
+~~~~~~~~~~~~
 ----
-memberName returns [StringTemplate code=null]
-    :
-    d:DOT (member:ID | s:STAR)
-    {
+memberName returns [StringTemplate code=null] :
+    d:DOT (member:ID | s:STAR) {
       code=template("memberAccess");
       if(member != null) code.setAttribute("name",member.getText());
       if(s != null) code.setAttribute("name","*");
@@ -1315,8 +1307,6 @@
     ;
 ----
 
-// TODO ^^^^^^ array literal -- rename and rearrange the methods
-
 Literal Symbols
 ~~~~~~~~~~~~~~~
 
@@ -1381,7 +1371,6 @@
     )
     ;
 
-
 whitespace  :   (   ' '
         |   '\t'
         |   '\r'
@@ -1390,18 +1379,21 @@
         { $setType(Token.SKIP); }
     ;
 
+//Single line comment C/C++ style
 singleline_ccomment:
         "//"
         (~('\n'|'\r'))* ('\n'|'\r'('\n')?)
         {$setType(Token.SKIP); newline();}
     ;
 
+//Single line comment shell style
 singleline_scomment:
         "#"
         (~('\n'|'\r'))* ('\n'|'\r'('\n')?)
         {$setType(Token.SKIP); newline();}
     ;
 
+//Multiline comment C style
 multiline_comment :
         "/*"
         (

Modified: trunk/docs/merged/refmanual/swiftlang
===================================================================
--- trunk/docs/merged/refmanual/swiftlang	2013-03-22 22:00:32 UTC (rev 6403)
+++ trunk/docs/merged/refmanual/swiftlang	2013-03-25 02:16:58 UTC (rev 6404)
@@ -142,9 +142,11 @@
 
 Following is a list of Swift keywords:
 
-    app type float int boolean string global
-    foreach if else iterate switch case default
-    file while import
+----
+    app type float int boolean string
+    global foreach if else iterate
+    switch case default file while import
+----
 
 == Types
 

Modified: trunk/docs/userguide/coasters
===================================================================
--- trunk/docs/userguide/coasters	2013-03-22 22:00:32 UTC (rev 6403)
+++ trunk/docs/userguide/coasters	2013-03-25 02:16:58 UTC (rev 6404)
@@ -100,3 +100,12 @@
 <profile namespace="globus" key="queue">normal</profile>
 ----
 
+Jobs and Coasters Parameters Equation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The parameters provided in the coasters specification affect jobs submitted by Swift to the scheduling system.
+
+----
+Jobs Submitted = slots X node_granularity X jobs_per_node
+----
+