merge
authorTim L <lebot@rpi.edu>
Mon, 09 Jul 2012 17:23:53 -0400
changeset 3846 df9b0f49afa2
parent 3845 472e6d47cd36 (current diff)
parent 3844 2adf018e3554 (diff)
child 3848 f7e2efbf555a
child 3850 6a2dc0f9575c
merge
--- a/model/grammar/ll.html	Mon Jul 09 17:23:39 2012 -0400
+++ b/model/grammar/ll.html	Mon Jul 09 17:23:53 2012 -0400
@@ -241,7 +241,7 @@
 <td><a id="prod-prov_n_LL-membershipExpression" name="prod-prov_n_LL-membershipExpression"></a>[<span class="prodNo">27</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">membershipExpression</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"memberOf" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-cIdentifier">cIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entitySet">entitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
+<td><code class="content">"hadMembers" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-cIdentifier">cIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entitySet">entitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
 </tr>
 </tbody>
 
@@ -515,7 +515,7 @@
 <td><a id="prod-prov_n_LL-dictMembershipExpression" name="prod-prov_n_LL-dictMembershipExpression"></a>[<span class="prodNo">57</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">dictMembershipExpression</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"memberOf" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-keyEntitySet">keyEntitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
+<td><code class="content">"hadMembers" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-keyEntitySet">keyEntitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
 </tr>
 </tbody>
 
--- a/model/grammar/ll.js	Mon Jul 09 17:23:39 2012 -0400
+++ b/model/grammar/ll.js	Mon Jul 09 17:23:53 2012 -0400
@@ -242,7 +242,7 @@
 '<td><a id="prod-membershipExpression" name="prod-membershipExpression"></a>[<span class="prodNo">27</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="production prod">membershipExpression</code></td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content">"memberOf" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-entitySet">entitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> ' + 
+'<td><code class="content">"hadMembers" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-entitySet">entitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
@@ -516,7 +516,7 @@
 '<td><a id="prod-dictMembershipExpression" name="prod-dictMembershipExpression"></a>[<span class="prodNo">57</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="production prod">dictMembershipExpression</code></td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content">"memberOf" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-keyEntitySet">keyEntitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> ' + 
+'<td><code class="content">"hadMembers" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-keyEntitySet">keyEntitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
--- a/model/grammar/yack/prov-n-LL.bnf	Mon Jul 09 17:23:39 2012 -0400
+++ b/model/grammar/yack/prov-n-LL.bnf	Mon Jul 09 17:23:53 2012 -0400
@@ -94,7 +94,7 @@
 
 
 [31] membershipExpression::=
- 	"memberOf" "("  optionalIdentifier  cIdentifier "," entitySet complete  optionalAttributeValuePairs ")"
+ 	"hadMembers" "("  optionalIdentifier  cIdentifier "," entitySet complete  optionalAttributeValuePairs ")"
 
 [31b] complete::= ("," ("true" | "false" | "-"))?
 
@@ -177,7 +177,7 @@
 
 dIdentifier ::=identifier
 
-[31c] dictMembershipExpression::=	"memberOf" "("  optionalIdentifier  dIdentifier "," keyEntitySet complete  optionalAttributeValuePairs ")"
+[31c] dictMembershipExpression::=	"hadMembers" "("  optionalIdentifier  dIdentifier "," keyEntitySet complete  optionalAttributeValuePairs ")"
 
 [30] removalExpression::=	"derivedByRemovalFrom" "("  optionalIdentifier dIdentifier "," dIdentifier "," keySet optionalAttributeValuePairs ")"
 
--- a/model/grammar/yack/prov-n-LL.bnf.html	Mon Jul 09 17:23:39 2012 -0400
+++ b/model/grammar/yack/prov-n-LL.bnf.html	Mon Jul 09 17:23:53 2012 -0400
@@ -240,7 +240,7 @@
 <td><a id="prod-prov_n_LL-membershipExpression" name="prod-prov_n_LL-membershipExpression"></a>[<span class="prodNo">27</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">membershipExpression</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"memberOf" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-cIdentifier">cIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entitySet">entitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
+<td><code class="content">"hadMembers" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-cIdentifier">cIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entitySet">entitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
 </tr>
 </tbody>
 
@@ -514,7 +514,7 @@
 <td><a id="prod-prov_n_LL-dictMembershipExpression" name="prod-prov_n_LL-dictMembershipExpression"></a>[<span class="prodNo">57</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">dictMembershipExpression</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"memberOf" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-keyEntitySet">keyEntitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
+<td><code class="content">"hadMembers" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dIdentifier">dIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-keyEntitySet">keyEntitySet</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-complete">complete</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
 </tr>
 </tbody>
 
--- a/model/prov-n.html	Mon Jul 09 17:23:39 2012 -0400
+++ b/model/prov-n.html	Mon Jul 09 17:23:53 2012 -0400
@@ -1981,7 +1981,7 @@
 
 <div class="anexample">
     <pre class="codeexample">
-   memberOf(mId, c, {e1, e2, e3}, [])   // Collection membership
+   hadMembers(mId, c, {e1, e2, e3}, [])   // Collection membership
   </pre>
 <p>  Here
     <span class="name">mId</span> is the optional membership identifier,
@@ -1992,12 +1992,12 @@
 In the remaining examples,  some of the optionals are omitted.
 
 <pre class="codeexample">
-memberOf(c3, {e1})
-memberOf(c3, {e1,e2})     // default "complete" flag is false
-memberOf(c3, {e1,e2}, false)
-memberOf(c3, {e1,e2}, true)
-memberOf(c3, ,[])  
-memberOf(c3, ,true, [])  
+hadMembers(c3, {e1})
+hadMembers(c3, {e1,e2})     // default "complete" flag is false
+hadMembers(c3, {e1,e2}, false)
+hadMembers(c3, {e1,e2}, true)
+hadMembers(c3, ,[])  
+hadMembers(c3, ,true, [])  
 </pre>
 </div>
 
@@ -2507,18 +2507,18 @@
 
 <div class="anexample">
 <p>
-<a href="#component6">Collections</a> are sets of entities, whose membership can be expressed using the <span class="name">memberOf</span> relation.  The following example shows how one can express membership for an extension of Collections, namely sets of key-value pairs. The notation is a variation of that used for Collections membership, in which the elements of the set are pairs. The name of the relation is qualified with the extension-specific namespace <span class="name">http://example.org/dictionaries</span>.
+<a href="#component6">Collections</a> are sets of entities, whose membership can be expressed using the <span class="name">hadMembers</span> relation.  The following example shows how one can express membership for an extension of Collections, namely sets of key-value pairs. The notation is a variation of that used for Collections membership, in which the elements of the set are pairs. The name of the relation is qualified with the extension-specific namespace <span class="name">http://example.org/dictionaries</span>.
 </p>
 <pre class="codeexample">
   prefix dictExt &lt;http://example.org/dictionaries&gt;
-  dictExt:memberOf(mId; d, {(k1,e1), (k2,e2), (k3,e3)}, []) 
+  dictExt:hadMembers(mId; d, {(k1,e1), (k2,e2), (k3,e3)}, []) 
 </pre>
 
 Note that the generic <code class="content"><a class="grammarRef"
  href="#prod-extensibilityExpression">extensibilityExpression</a></code> production  above allows for alternative notations to be used for expressing membership, if the designers of the extensions so desire. Here is an alternate syntax that is consistent with the productions:
 <pre class="codeexample">
   prefix dictExt &lt;http://example.org/dictionaries&gt;
-  dictExt:memberOf(mid; d, dictExt:set(dictExt:pair(k1,e1), dictExt:pair(k2,e2), dictExt:pair(k3,e3), [dictExt:uniqueKeys="true"]) 
+  dictExt:hadMembers(mid; d, dictExt:set(dictExt:pair(k1,e1), dictExt:pair(k2,e2), dictExt:pair(k3,e3), [dictExt:uniqueKeys="true"]) 
 </pre>