memberOf - hadMembers
authorLuc Moreau <l.moreau@ecs.soton.ac.uk>
Mon, 09 Jul 2012 22:17:42 +0100
changeset 3843 a9771c404954
parent 3842 01234010e4a7
child 3844 2adf018e3554
child 3847 f43020eb6153
memberOf - hadMembers
model/grammar/ll.html
model/grammar/ll.js
model/grammar/yack/prov-n-LL.bnf
model/grammar/yack/prov-n-LL.bnf.html
--- a/model/grammar/ll.html	Mon Jul 09 17:12:58 2012 -0400
+++ b/model/grammar/ll.html	Mon Jul 09 22:17:42 2012 +0100
@@ -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:12:58 2012 -0400
+++ b/model/grammar/ll.js	Mon Jul 09 22:17:42 2012 +0100
@@ -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:12:58 2012 -0400
+++ b/model/grammar/yack/prov-n-LL.bnf	Mon Jul 09 22:17:42 2012 +0100
@@ -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:12:58 2012 -0400
+++ b/model/grammar/yack/prov-n-LL.bnf.html	Mon Jul 09 22:17:42 2012 +0100
@@ -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>