--- a/model/grammar/ll.html Thu Jun 28 11:59:41 2012 +0100
+++ b/model/grammar/ll.html Thu Jun 28 12:18:20 2012 +0100
@@ -16,7 +16,7 @@
<td><a id="prod-prov_n_LL-expression" name="prod-prov_n_LL-expression"></a>[<span class="prodNo">2</span>] </td>
<td><code class="production prod">expression</code></td>
<td> ::= </td>
-<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-tracedToExpression">tracedToExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-contextualizationExpression">contextualizationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-membershipExpression">membershipExpression</a></span> )</code></td>
+<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-tracedToExpression">tracedToExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-contextualizationExpression">contextualizationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dictMembershipExpression">dictMembershipExpression</a></span> )</code></td>
</tr>
</tbody>
@@ -277,14 +277,22 @@
<td><a id="prod-prov_n_LL-membershipExpression" name="prod-prov_n_LL-membershipExpression"></a>[<span class="prodNo">31</span>] </td>
<td><code class="production prod">membershipExpression</code></td>
<td> ::= </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> ")"<br/>
-| "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">"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>
</tr>
</tbody>
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-complete" name="prod-prov_n_LL-complete"></a>[<span class="prodNo">32</span>] </td>
+<td><a id="prod-prov_n_LL-dictMembershipExpression" name="prod-prov_n_LL-dictMembershipExpression"></a>[<span class="prodNo">32</span>] </td>
+<td><code class="production prod">dictMembershipExpression</code></td>
+<td> ::= </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>
+</tr>
+</tbody>
+
+<tbody class="prod">
+<tr valign="baseline">
+<td><a id="prod-prov_n_LL-complete" name="prod-prov_n_LL-complete"></a>[<span class="prodNo">33</span>] </td>
<td><code class="production prod">complete</code></td>
<td> ::= </td>
<td><code class="content">(( "," ( "true" | "false" | "-" ) ))?</code></td>
@@ -293,7 +301,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-namedBundle" name="prod-prov_n_LL-namedBundle"></a>[<span class="prodNo">33</span>] </td>
+<td><a id="prod-prov_n_LL-namedBundle" name="prod-prov_n_LL-namedBundle"></a>[<span class="prodNo">34</span>] </td>
<td><code class="production prod">namedBundle</code></td>
<td> ::= </td>
<td><code class="content">"bundle" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-expression">expression</a></span>)* "endBundle"</code></td>
@@ -302,7 +310,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-eIdentifier" name="prod-prov_n_LL-eIdentifier"></a>[<span class="prodNo">34</span>] </td>
+<td><a id="prod-prov_n_LL-eIdentifier" name="prod-prov_n_LL-eIdentifier"></a>[<span class="prodNo">35</span>] </td>
<td><code class="production prod">eIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -311,7 +319,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-aIdentifier" name="prod-prov_n_LL-aIdentifier"></a>[<span class="prodNo">35</span>] </td>
+<td><a id="prod-prov_n_LL-aIdentifier" name="prod-prov_n_LL-aIdentifier"></a>[<span class="prodNo">36</span>] </td>
<td><code class="production prod">aIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -320,7 +328,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-agIdentifier" name="prod-prov_n_LL-agIdentifier"></a>[<span class="prodNo">36</span>] </td>
+<td><a id="prod-prov_n_LL-agIdentifier" name="prod-prov_n_LL-agIdentifier"></a>[<span class="prodNo">37</span>] </td>
<td><code class="production prod">agIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -329,7 +337,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-gIdentifier" name="prod-prov_n_LL-gIdentifier"></a>[<span class="prodNo">37</span>] </td>
+<td><a id="prod-prov_n_LL-gIdentifier" name="prod-prov_n_LL-gIdentifier"></a>[<span class="prodNo">38</span>] </td>
<td><code class="production prod">gIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -338,7 +346,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-uIdentifier" name="prod-prov_n_LL-uIdentifier"></a>[<span class="prodNo">38</span>] </td>
+<td><a id="prod-prov_n_LL-uIdentifier" name="prod-prov_n_LL-uIdentifier"></a>[<span class="prodNo">39</span>] </td>
<td><code class="production prod">uIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -347,7 +355,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-dIdentifier" name="prod-prov_n_LL-dIdentifier"></a>[<span class="prodNo">39</span>] </td>
+<td><a id="prod-prov_n_LL-dIdentifier" name="prod-prov_n_LL-dIdentifier"></a>[<span class="prodNo">40</span>] </td>
<td><code class="production prod">dIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -356,7 +364,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-cIdentifier" name="prod-prov_n_LL-cIdentifier"></a>[<span class="prodNo">40</span>] </td>
+<td><a id="prod-prov_n_LL-cIdentifier" name="prod-prov_n_LL-cIdentifier"></a>[<span class="prodNo">41</span>] </td>
<td><code class="production prod">cIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -365,7 +373,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-bIdentifier" name="prod-prov_n_LL-bIdentifier"></a>[<span class="prodNo">41</span>] </td>
+<td><a id="prod-prov_n_LL-bIdentifier" name="prod-prov_n_LL-bIdentifier"></a>[<span class="prodNo">42</span>] </td>
<td><code class="production prod">bIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -374,7 +382,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-eIdentifierOrMarker" name="prod-prov_n_LL-eIdentifierOrMarker"></a>[<span class="prodNo">42</span>] </td>
+<td><a id="prod-prov_n_LL-eIdentifierOrMarker" name="prod-prov_n_LL-eIdentifierOrMarker"></a>[<span class="prodNo">43</span>] </td>
<td><code class="production prod">eIdentifierOrMarker</code></td>
<td> ::= </td>
<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-eIdentifier">eIdentifier</a></span> | "-" )</code></td>
@@ -383,7 +391,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-aIdentifierOrMarker" name="prod-prov_n_LL-aIdentifierOrMarker"></a>[<span class="prodNo">43</span>] </td>
+<td><a id="prod-prov_n_LL-aIdentifierOrMarker" name="prod-prov_n_LL-aIdentifierOrMarker"></a>[<span class="prodNo">44</span>] </td>
<td><code class="production prod">aIdentifierOrMarker</code></td>
<td> ::= </td>
<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-aIdentifier">aIdentifier</a></span> | "-" )</code></td>
@@ -392,7 +400,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-agIdentifierOrMarker" name="prod-prov_n_LL-agIdentifierOrMarker"></a>[<span class="prodNo">44</span>] </td>
+<td><a id="prod-prov_n_LL-agIdentifierOrMarker" name="prod-prov_n_LL-agIdentifierOrMarker"></a>[<span class="prodNo">45</span>] </td>
<td><code class="production prod">agIdentifierOrMarker</code></td>
<td> ::= </td>
<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-agIdentifier">agIdentifier</a></span> | "-" )</code></td>
@@ -401,7 +409,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-gIdentifierOrMarker" name="prod-prov_n_LL-gIdentifierOrMarker"></a>[<span class="prodNo">45</span>] </td>
+<td><a id="prod-prov_n_LL-gIdentifierOrMarker" name="prod-prov_n_LL-gIdentifierOrMarker"></a>[<span class="prodNo">46</span>] </td>
<td><code class="production prod">gIdentifierOrMarker</code></td>
<td> ::= </td>
<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-gIdentifier">gIdentifier</a></span> | "-" )</code></td>
@@ -410,7 +418,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-uIdentifierOrMarker" name="prod-prov_n_LL-uIdentifierOrMarker"></a>[<span class="prodNo">46</span>] </td>
+<td><a id="prod-prov_n_LL-uIdentifierOrMarker" name="prod-prov_n_LL-uIdentifierOrMarker"></a>[<span class="prodNo">47</span>] </td>
<td><code class="production prod">uIdentifierOrMarker</code></td>
<td> ::= </td>
<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-uIdentifier">uIdentifier</a></span> | "-" )</code></td>
@@ -419,7 +427,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-identifier" name="prod-prov_n_LL-identifier"></a>[<span class="prodNo">47</span>] </td>
+<td><a id="prod-prov_n_LL-identifier" name="prod-prov_n_LL-identifier"></a>[<span class="prodNo">48</span>] </td>
<td><code class="production prod">identifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
@@ -428,7 +436,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-attribute" name="prod-prov_n_LL-attribute"></a>[<span class="prodNo">48</span>] </td>
+<td><a id="prod-prov_n_LL-attribute" name="prod-prov_n_LL-attribute"></a>[<span class="prodNo">49</span>] </td>
<td><code class="production prod">attribute</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
@@ -437,7 +445,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-timeZZ" name="prod-prov_n_LL-timeZZ"></a>[<span class="prodNo">49</span>] </td>
+<td><a id="prod-prov_n_LL-timeZZ" name="prod-prov_n_LL-timeZZ"></a>[<span class="prodNo">50</span>] </td>
<td><code class="production prod">timeZZ</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ISODATETIME">ISODATETIME</a></span></code></td>
@@ -446,7 +454,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-literal" name="prod-prov_n_LL-literal"></a>[<span class="prodNo">50</span>] </td>
+<td><a id="prod-prov_n_LL-literal" name="prod-prov_n_LL-literal"></a>[<span class="prodNo">51</span>] </td>
<td><code class="production prod">literal</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-typedLiteral">typedLiteral</a></span><br/>
@@ -456,7 +464,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-typedLiteral" name="prod-prov_n_LL-typedLiteral"></a>[<span class="prodNo">51</span>] </td>
+<td><a id="prod-prov_n_LL-typedLiteral" name="prod-prov_n_LL-typedLiteral"></a>[<span class="prodNo">52</span>] </td>
<td><code class="production prod">typedLiteral</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL">STRING_LITERAL</a></span> "%%" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-datatype">datatype</a></span></code></td>
@@ -465,7 +473,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-datatype" name="prod-prov_n_LL-datatype"></a>[<span class="prodNo">52</span>] </td>
+<td><a id="prod-prov_n_LL-datatype" name="prod-prov_n_LL-datatype"></a>[<span class="prodNo">53</span>] </td>
<td><code class="production prod">datatype</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
@@ -474,7 +482,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-convenienceNotation" name="prod-prov_n_LL-convenienceNotation"></a>[<span class="prodNo">53</span>] </td>
+<td><a id="prod-prov_n_LL-convenienceNotation" name="prod-prov_n_LL-convenienceNotation"></a>[<span class="prodNo">54</span>] </td>
<td><code class="production prod">convenienceNotation</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL">STRING_LITERAL</a></span><br/>
@@ -485,7 +493,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-namespaceDeclarations" name="prod-prov_n_LL-namespaceDeclarations"></a>[<span class="prodNo">54</span>] </td>
+<td><a id="prod-prov_n_LL-namespaceDeclarations" name="prod-prov_n_LL-namespaceDeclarations"></a>[<span class="prodNo">55</span>] </td>
<td><code class="production prod">namespaceDeclarations</code></td>
<td> ::= </td>
<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-defaultNamespaceDeclaration">defaultNamespaceDeclaration</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespaceDeclaration">namespaceDeclaration</a></span> ) (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespaceDeclaration">namespaceDeclaration</a></span>)*</code></td>
@@ -494,7 +502,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-namespaceDeclaration" name="prod-prov_n_LL-namespaceDeclaration"></a>[<span class="prodNo">55</span>] </td>
+<td><a id="prod-prov_n_LL-namespaceDeclaration" name="prod-prov_n_LL-namespaceDeclaration"></a>[<span class="prodNo">56</span>] </td>
<td><code class="production prod">namespaceDeclaration</code></td>
<td> ::= </td>
<td><code class="content">"prefix" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespace">namespace</a></span></code></td>
@@ -503,7 +511,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-defaultNamespaceDeclaration" name="prod-prov_n_LL-defaultNamespaceDeclaration"></a>[<span class="prodNo">56</span>] </td>
+<td><a id="prod-prov_n_LL-defaultNamespaceDeclaration" name="prod-prov_n_LL-defaultNamespaceDeclaration"></a>[<span class="prodNo">57</span>] </td>
<td><code class="production prod">defaultNamespaceDeclaration</code></td>
<td> ::= </td>
<td><code class="content">"default" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-IRI_REF">IRI_REF</a></span></code></td>
@@ -512,7 +520,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-namespace" name="prod-prov_n_LL-namespace"></a>[<span class="prodNo">57</span>] </td>
+<td><a id="prod-prov_n_LL-namespace" name="prod-prov_n_LL-namespace"></a>[<span class="prodNo">58</span>] </td>
<td><code class="production prod">namespace</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-IRI_REF">IRI_REF</a></span></code></td>
@@ -521,7 +529,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALIFIED_NAME" name="term-prov_n_LL-QUALIFIED_NAME"></a>[<span class="prodNo">58</span>] </td>
+<td><a id="term-prov_n_LL-QUALIFIED_NAME" name="term-prov_n_LL-QUALIFIED_NAME"></a>[<span class="prodNo">59</span>] </td>
<td><<code class="production term">QUALIFIED_NAME</code>></td>
<td> ::= </td>
<td><code class="content">(( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_PREFIX">PN_PREFIX</a></span> ":" ))? <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_LOCAL">PN_LOCAL</a></span><br/>
@@ -531,7 +539,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PREFX" name="term-prov_n_LL-PREFX"></a>[<span class="prodNo">59</span>] </td>
+<td><a id="term-prov_n_LL-PREFX" name="term-prov_n_LL-PREFX"></a>[<span class="prodNo">60</span>] </td>
<td><<code class="production term">PREFX</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_PREFIX">PN_PREFIX</a></span></code></td>
@@ -540,7 +548,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-DIGIT" name="term-prov_n_LL-DIGIT"></a>[<span class="prodNo">60</span>] </td>
+<td><a id="term-prov_n_LL-DIGIT" name="term-prov_n_LL-DIGIT"></a>[<span class="prodNo">61</span>] </td>
<td><<code class="production term">DIGIT</code>></td>
<td> ::= </td>
<td><code class="content">[0-9]</code></td>
@@ -549,7 +557,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-ISODATETIME" name="term-prov_n_LL-ISODATETIME"></a>[<span class="prodNo">61</span>] </td>
+<td><a id="term-prov_n_LL-ISODATETIME" name="term-prov_n_LL-ISODATETIME"></a>[<span class="prodNo">62</span>] </td>
<td><<code class="production term">ISODATETIME</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( "." <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)? ))? ))? (( "Z" | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> ))?</code></td>
@@ -558,7 +566,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-TIMEZONEOFFSET" name="term-prov_n_LL-TIMEZONEOFFSET"></a>[<span class="prodNo">62</span>] </td>
+<td><a id="term-prov_n_LL-TIMEZONEOFFSET" name="term-prov_n_LL-TIMEZONEOFFSET"></a>[<span class="prodNo">63</span>] </td>
<td><<code class="production term">TIMEZONEOFFSET</code>></td>
<td> ::= </td>
<td><code class="content">( "+" | "-" ) <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span></code></td>
@@ -567,7 +575,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-IRI_REF" name="term-prov_n_LL-IRI_REF"></a>[<span class="prodNo">63</span>] </td>
+<td><a id="term-prov_n_LL-IRI_REF" name="term-prov_n_LL-IRI_REF"></a>[<span class="prodNo">64</span>] </td>
<td><<code class="production term">IRI_REF</code>></td>
<td> ::= </td>
<td><code class="content">"<" (( [^<>\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* ">"</code></td>
@@ -576,7 +584,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL" name="term-prov_n_LL-STRING_LITERAL"></a>[<span class="prodNo">64</span>] </td>
+<td><a id="term-prov_n_LL-STRING_LITERAL" name="term-prov_n_LL-STRING_LITERAL"></a>[<span class="prodNo">65</span>] </td>
<td><<code class="production term">STRING_LITERAL</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL2">STRING_LITERAL2</a></span></code></td>
@@ -585,7 +593,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL2" name="term-prov_n_LL-STRING_LITERAL2"></a>[<span class="prodNo">65</span>] </td>
+<td><a id="term-prov_n_LL-STRING_LITERAL2" name="term-prov_n_LL-STRING_LITERAL2"></a>[<span class="prodNo">66</span>] </td>
<td><<code class="production term">STRING_LITERAL2</code>></td>
<td> ::= </td>
<td><code class="content">'"' (( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* '"'</code></td>
@@ -594,7 +602,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">66</span>] </td>
+<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">67</span>] </td>
<td><<code class="production term">INT_LITERAL</code>></td>
<td> ::= </td>
<td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)+</code></td>
@@ -603,7 +611,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALIFIED_NAME_LITERAL" name="term-prov_n_LL-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">67</span>] </td>
+<td><a id="term-prov_n_LL-QUALIFIED_NAME_LITERAL" name="term-prov_n_LL-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">68</span>] </td>
<td><<code class="production term">QUALIFIED_NAME_LITERAL</code>></td>
<td> ::= </td>
<td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "'"</code></td>
@@ -612,7 +620,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">68</span>] </td>
+<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">69</span>] </td>
<td><<code class="production term">UCHAR</code>></td>
<td> ::= </td>
<td><code class="content">( "\\u" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> )<br/>
@@ -622,7 +630,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">69</span>] </td>
+<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">70</span>] </td>
<td><<code class="production term">ECHAR</code>></td>
<td> ::= </td>
<td><code class="content">"\\" [tbnrf\\\"']</code></td>
@@ -631,7 +639,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">70</span>] </td>
+<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">71</span>] </td>
<td><<code class="production term">NIL</code>></td>
<td> ::= </td>
<td><code class="content">"(" (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-WS">WS</a></span> ))* ")"</code></td>
@@ -640,7 +648,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">71</span>] </td>
+<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">72</span>] </td>
<td><<code class="production term">WS</code>></td>
<td> ::= </td>
<td><code class="content">" "<br/>
@@ -652,7 +660,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">72</span>] </td>
+<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">73</span>] </td>
<td><<code class="production term">ANON</code>></td>
<td> ::= </td>
<td><code class="content">"[" (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-WS">WS</a></span> ))* "]"</code></td>
@@ -661,7 +669,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_BASE" name="term-prov_n_LL-PN_CHARS_BASE"></a>[<span class="prodNo">73</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_BASE" name="term-prov_n_LL-PN_CHARS_BASE"></a>[<span class="prodNo">74</span>] </td>
<td><<code class="production term">PN_CHARS_BASE</code>></td>
<td> ::= </td>
<td><code class="content">[A-Z]<br/>
@@ -683,7 +691,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_U" name="term-prov_n_LL-PN_CHARS_U"></a>[<span class="prodNo">74</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_U" name="term-prov_n_LL-PN_CHARS_U"></a>[<span class="prodNo">75</span>] </td>
<td><<code class="production term">PN_CHARS_U</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_BASE">PN_CHARS_BASE</a></span><br/>
@@ -693,7 +701,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">75</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">76</span>] </td>
<td><<code class="production term">PN_CHARS</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_U">PN_CHARS_U</a></span><br/>
@@ -707,7 +715,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">76</span>] </td>
+<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">77</span>] </td>
<td><<code class="production term">PN_PREFIX</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_BASE">PN_CHARS_BASE</a></span> (( (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | "." ))* <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> ))?</code></td>
@@ -716,7 +724,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">77</span>] </td>
+<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">78</span>] </td>
<td><<code class="production term">PN_LOCAL</code>></td>
<td> ::= </td>
<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) (( (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ))* ( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) ))?</code></td>
@@ -725,7 +733,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_OTHERS" name="term-prov_n_LL-PN_CHARS_OTHERS"></a>[<span class="prodNo">78</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_OTHERS" name="term-prov_n_LL-PN_CHARS_OTHERS"></a>[<span class="prodNo">79</span>] </td>
<td><<code class="production term">PN_CHARS_OTHERS</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PERCENT">PERCENT</a></span><br/>
@@ -742,7 +750,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">79</span>] </td>
+<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">80</span>] </td>
<td><<code class="production term">PERCENT</code>></td>
<td> ::= </td>
<td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span></code></td>
@@ -751,7 +759,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">80</span>] </td>
+<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">81</span>] </td>
<td><<code class="production term">HEX</code>></td>
<td> ::= </td>
<td><code class="content">[0-9]<br/>
@@ -762,7 +770,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PASSED_TOKENS" name="term-prov_n_LL-PASSED_TOKENS"></a>[<span class="prodNo">81</span>] </td>
+<td><a id="term-prov_n_LL-PASSED_TOKENS" name="term-prov_n_LL-PASSED_TOKENS"></a>[<span class="prodNo">82</span>] </td>
<td><code class="production directive">PASSED TOKENS</code></td>
<td> ::= </td>
<td><code class="content">([ \t\r\n])+<br/>
--- a/model/grammar/ll.js Thu Jun 28 11:59:41 2012 +0100
+++ b/model/grammar/ll.js Thu Jun 28 12:18:20 2012 +0100
@@ -17,7 +17,7 @@
'<td><a id="prod-expression" name="prod-expression"></a>[<span class="prodNo">2</span>] </td> ' +
'<td><code class="production prod">expression</code></td> ' +
'<td> ::= </td> ' +
-'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-tracedToExpression">tracedToExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-contextualizationExpression">contextualizationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-membershipExpression">membershipExpression</a></span> )</code></td> ' +
+'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-tracedToExpression">tracedToExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-contextualizationExpression">contextualizationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-dictMembershipExpression">dictMembershipExpression</a></span> )</code></td> ' +
'</tr> ' +
'</tbody> ' +
' ' +
@@ -278,14 +278,22 @@
'<td><a id="prod-membershipExpression" name="prod-membershipExpression"></a>[<span class="prodNo">31</span>] </td> ' +
'<td><code class="production prod">membershipExpression</code></td> ' +
'<td> ::= </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> ")"<br/> ' +
-'| "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">"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> ' +
'</tr> ' +
'</tbody> ' +
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-complete" name="prod-complete"></a>[<span class="prodNo">32</span>] </td> ' +
+'<td><a id="prod-dictMembershipExpression" name="prod-dictMembershipExpression"></a>[<span class="prodNo">32</span>] </td> ' +
+'<td><code class="production prod">dictMembershipExpression</code></td> ' +
+'<td> ::= </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> ' +
+'</tr> ' +
+'</tbody> ' +
+' ' +
+'<tbody class="prod"> ' +
+'<tr valign="baseline"> ' +
+'<td><a id="prod-complete" name="prod-complete"></a>[<span class="prodNo">33</span>] </td> ' +
'<td><code class="production prod">complete</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">( "," ( "true" | "false" | "-" ) )?</code></td> ' +
@@ -294,7 +302,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-namedBundle" name="prod-namedBundle"></a>[<span class="prodNo">33</span>] </td> ' +
+'<td><a id="prod-namedBundle" name="prod-namedBundle"></a>[<span class="prodNo">34</span>] </td> ' +
'<td><code class="production prod">namedBundle</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"bundle" <span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span> (<span class="prod"><a class="grammarRef" href="#prod-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-expression">expression</a></span>)* "endBundle"</code></td> ' +
@@ -303,7 +311,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-eIdentifier" name="prod-eIdentifier"></a>[<span class="prodNo">34</span>] </td> ' +
+'<td><a id="prod-eIdentifier" name="prod-eIdentifier"></a>[<span class="prodNo">35</span>] </td> ' +
'<td><code class="production prod">eIdentifier</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span></code></td> ' +
@@ -312,7 +320,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-aIdentifier" name="prod-aIdentifier"></a>[<span class="prodNo">35</span>] </td> ' +
+'<td><a id="prod-aIdentifier" name="prod-aIdentifier"></a>[<span class="prodNo">36</span>] </td> ' +
'<td><code class="production prod">aIdentifier</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span></code></td> ' +
@@ -321,7 +329,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-agIdentifier" name="prod-agIdentifier"></a>[<span class="prodNo">36</span>] </td> ' +
+'<td><a id="prod-agIdentifier" name="prod-agIdentifier"></a>[<span class="prodNo">37</span>] </td> ' +
'<td><code class="production prod">agIdentifier</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span></code></td> ' +
@@ -330,7 +338,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-gIdentifier" name="prod-gIdentifier"></a>[<span class="prodNo">37</span>] </td> ' +
+'<td><a id="prod-gIdentifier" name="prod-gIdentifier"></a>[<span class="prodNo">38</span>] </td> ' +
'<td><code class="production prod">gIdentifier</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span></code></td> ' +
@@ -339,7 +347,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-uIdentifier" name="prod-uIdentifier"></a>[<span class="prodNo">38</span>] </td> ' +
+'<td><a id="prod-uIdentifier" name="prod-uIdentifier"></a>[<span class="prodNo">39</span>] </td> ' +
'<td><code class="production prod">uIdentifier</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span></code></td> ' +
@@ -348,7 +356,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-dIdentifier" name="prod-dIdentifier"></a>[<span class="prodNo">39</span>] </td> ' +
+'<td><a id="prod-dIdentifier" name="prod-dIdentifier"></a>[<span class="prodNo">40</span>] </td> ' +
'<td><code class="production prod">dIdentifier</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span></code></td> ' +
@@ -357,7 +365,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-cIdentifier" name="prod-cIdentifier"></a>[<span class="prodNo">40</span>] </td> ' +
+'<td><a id="prod-cIdentifier" name="prod-cIdentifier"></a>[<span class="prodNo">41</span>] </td> ' +
'<td><code class="production prod">cIdentifier</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span></code></td> ' +
@@ -366,7 +374,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-bIdentifier" name="prod-bIdentifier"></a>[<span class="prodNo">41</span>] </td> ' +
+'<td><a id="prod-bIdentifier" name="prod-bIdentifier"></a>[<span class="prodNo">42</span>] </td> ' +
'<td><code class="production prod">bIdentifier</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-identifier">identifier</a></span></code></td> ' +
@@ -375,7 +383,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-eIdentifierOrMarker" name="prod-eIdentifierOrMarker"></a>[<span class="prodNo">42</span>] </td> ' +
+'<td><a id="prod-eIdentifierOrMarker" name="prod-eIdentifierOrMarker"></a>[<span class="prodNo">43</span>] </td> ' +
'<td><code class="production prod">eIdentifierOrMarker</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></span> | "-" )</code></td> ' +
@@ -384,7 +392,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-aIdentifierOrMarker" name="prod-aIdentifierOrMarker"></a>[<span class="prodNo">43</span>] </td> ' +
+'<td><a id="prod-aIdentifierOrMarker" name="prod-aIdentifierOrMarker"></a>[<span class="prodNo">44</span>] </td> ' +
'<td><code class="production prod">aIdentifierOrMarker</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></span> | "-" )</code></td> ' +
@@ -393,7 +401,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-agIdentifierOrMarker" name="prod-agIdentifierOrMarker"></a>[<span class="prodNo">44</span>] </td> ' +
+'<td><a id="prod-agIdentifierOrMarker" name="prod-agIdentifierOrMarker"></a>[<span class="prodNo">45</span>] </td> ' +
'<td><code class="production prod">agIdentifierOrMarker</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-agIdentifier">agIdentifier</a></span> | "-" )</code></td> ' +
@@ -402,7 +410,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-gIdentifierOrMarker" name="prod-gIdentifierOrMarker"></a>[<span class="prodNo">45</span>] </td> ' +
+'<td><a id="prod-gIdentifierOrMarker" name="prod-gIdentifierOrMarker"></a>[<span class="prodNo">46</span>] </td> ' +
'<td><code class="production prod">gIdentifierOrMarker</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-gIdentifier">gIdentifier</a></span> | "-" )</code></td> ' +
@@ -411,7 +419,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-uIdentifierOrMarker" name="prod-uIdentifierOrMarker"></a>[<span class="prodNo">46</span>] </td> ' +
+'<td><a id="prod-uIdentifierOrMarker" name="prod-uIdentifierOrMarker"></a>[<span class="prodNo">47</span>] </td> ' +
'<td><code class="production prod">uIdentifierOrMarker</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-uIdentifier">uIdentifier</a></span> | "-" )</code></td> ' +
@@ -420,7 +428,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-identifier" name="prod-identifier"></a>[<span class="prodNo">47</span>] </td> ' +
+'<td><a id="prod-identifier" name="prod-identifier"></a>[<span class="prodNo">48</span>] </td> ' +
'<td><code class="production prod">identifier</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td> ' +
@@ -429,7 +437,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-attribute" name="prod-attribute"></a>[<span class="prodNo">48</span>] </td> ' +
+'<td><a id="prod-attribute" name="prod-attribute"></a>[<span class="prodNo">49</span>] </td> ' +
'<td><code class="production prod">attribute</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td> ' +
@@ -438,7 +446,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-time" name="prod-time"></a>[<span class="prodNo">49</span>] </td> ' +
+'<td><a id="prod-time" name="prod-time"></a>[<span class="prodNo">50</span>] </td> ' +
'<td><code class="production prod">time</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-ISODATETIME">ISODATETIME</a></span></code></td> ' +
@@ -447,7 +455,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-literal" name="prod-literal"></a>[<span class="prodNo">50</span>] </td> ' +
+'<td><a id="prod-literal" name="prod-literal"></a>[<span class="prodNo">51</span>] </td> ' +
'<td><code class="production prod">literal</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-typedLiteral">typedLiteral</a></span><br/> ' +
@@ -457,7 +465,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-typedLiteral" name="prod-typedLiteral"></a>[<span class="prodNo">51</span>] </td> ' +
+'<td><a id="prod-typedLiteral" name="prod-typedLiteral"></a>[<span class="prodNo">52</span>] </td> ' +
'<td><code class="production prod">typedLiteral</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL">STRING_LITERAL</a></span> "%%" <span class="prod"><a class="grammarRef" href="#prod-datatype">datatype</a></span></code></td> ' +
@@ -466,7 +474,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-datatype" name="prod-datatype"></a>[<span class="prodNo">52</span>] </td> ' +
+'<td><a id="prod-datatype" name="prod-datatype"></a>[<span class="prodNo">53</span>] </td> ' +
'<td><code class="production prod">datatype</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td> ' +
@@ -475,7 +483,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-convenienceNotation" name="prod-convenienceNotation"></a>[<span class="prodNo">53</span>] </td> ' +
+'<td><a id="prod-convenienceNotation" name="prod-convenienceNotation"></a>[<span class="prodNo">54</span>] </td> ' +
'<td><code class="production prod">convenienceNotation</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-STRING_LITERAL">STRING_LITERAL</a></span><br/> ' +
@@ -486,7 +494,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-namespaceDeclarations" name="prod-namespaceDeclarations"></a>[<span class="prodNo">54</span>] </td> ' +
+'<td><a id="prod-namespaceDeclarations" name="prod-namespaceDeclarations"></a>[<span class="prodNo">55</span>] </td> ' +
'<td><code class="production prod">namespaceDeclarations</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-defaultNamespaceDeclaration">defaultNamespaceDeclaration</a></span> | <span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration">namespaceDeclaration</a></span> ) (<span class="prod"><a class="grammarRef" href="#prod-namespaceDeclaration">namespaceDeclaration</a></span>)*</code></td> ' +
@@ -495,7 +503,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></a>[<span class="prodNo">55</span>] </td> ' +
+'<td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></a>[<span class="prodNo">56</span>] </td> ' +
'<td><code class="production prod">namespaceDeclaration</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"prefix" <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace">namespace</a></span></code></td> ' +
@@ -504,7 +512,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-defaultNamespaceDeclaration" name="prod-defaultNamespaceDeclaration"></a>[<span class="prodNo">56</span>] </td> ' +
+'<td><a id="prod-defaultNamespaceDeclaration" name="prod-defaultNamespaceDeclaration"></a>[<span class="prodNo">57</span>] </td> ' +
'<td><code class="production prod">defaultNamespaceDeclaration</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"default" <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rIRI_REF">IRI_REF</a></span></code></td> ' +
@@ -513,7 +521,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-namespace" name="prod-namespace"></a>[<span class="prodNo">57</span>] </td> ' +
+'<td><a id="prod-namespace" name="prod-namespace"></a>[<span class="prodNo">58</span>] </td> ' +
'<td><code class="production prod">namespace</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rIRI_REF">IRI_REF</a></span></code></td> ' +
@@ -522,7 +530,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-QUALIFIED_NAME" name="prod-QUALIFIED_NAME"></a>[<span class="prodNo">58</span>] </td> ' +
+'<td><a id="prod-QUALIFIED_NAME" name="prod-QUALIFIED_NAME"></a>[<span class="prodNo">59</span>] </td> ' +
'<td><<code class="production term">QUALIFIED_NAME</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL">PN_PREFIX</a></span> ":" )? <span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL">PN_LOCAL</a></span><br/> ' +
@@ -532,7 +540,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PREFX" name="prod-PREFX"></a>[<span class="prodNo">59</span>] </td> ' +
+'<td><a id="prod-PREFX" name="prod-PREFX"></a>[<span class="prodNo">60</span>] </td> ' +
'<td><<code class="production term">PREFX</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL">PN_PREFIX</a></span></code></td> ' +
@@ -541,7 +549,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-DIGIT" name="prod-DIGIT"></a>[<span class="prodNo">60</span>] </td> ' +
+'<td><a id="prod-DIGIT" name="prod-DIGIT"></a>[<span class="prodNo">61</span>] </td> ' +
'<td><<code class="production term">DIGIT</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">[0-9]</code></td> ' +
@@ -550,7 +558,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-ISODATETIME" name="prod-ISODATETIME"></a>[<span class="prodNo">61</span>] </td> ' +
+'<td><a id="prod-ISODATETIME" name="prod-ISODATETIME"></a>[<span class="prodNo">62</span>] </td> ' +
'<td><<code class="production term">ISODATETIME</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ( "." <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ( <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span>)? )? )? ( "Z" | <span class="prod"><a class="grammarRef" href="#prod-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> )?</code></td> ' +
@@ -559,7 +567,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></a>[<span class="prodNo">62</span>] </td> ' +
+'<td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></a>[<span class="prodNo">63</span>] </td> ' +
'<td><<code class="production term">TIMEZONEOFFSET</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">( "+" | "-" ) <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span></code></td> ' +
@@ -568,7 +576,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-IRI_REF" name="prod-IRI_REF"></a>[<span class="prodNo">63</span>] </td> ' +
+'<td><a id="prod-IRI_REF" name="prod-IRI_REF"></a>[<span class="prodNo">64</span>] </td> ' +
'<td><<code class="production term">IRI_REF</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"<" ( [^<>\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* ">"</code></td> ' +
@@ -577,7 +585,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a>[<span class="prodNo">64</span>] </td> ' +
+'<td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a>[<span class="prodNo">65</span>] </td> ' +
'<td><<code class="production term">STRING_LITERAL</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rSTRING_LITERAL2">STRING_LITERAL2</a></span></code></td> ' +
@@ -586,7 +594,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-STRING_LITERAL2" name="prod-STRING_LITERAL2"></a>[<span class="prodNo">65</span>] </td> ' +
+'<td><a id="prod-STRING_LITERAL2" name="prod-STRING_LITERAL2"></a>[<span class="prodNo">66</span>] </td> ' +
'<td><<code class="production term">STRING_LITERAL2</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">\'"\' ( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* \'"\'</code></td> ' +
@@ -595,7 +603,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a>[<span class="prodNo">66</span>] </td> ' +
+'<td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a>[<span class="prodNo">67</span>] </td> ' +
'<td><<code class="production term">INT_LITERAL</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span>)+</code></td> ' +
@@ -604,7 +612,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-QUALIFIED_NAME_LITERAL" name="prod-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">67</span>] </td> ' +
+'<td><a id="prod-QUALIFIED_NAME_LITERAL" name="prod-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">68</span>] </td> ' +
'<td><<code class="production term">QUALIFIED_NAME_LITERAL</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"\'" <span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "\'"</code></td> ' +
@@ -613,7 +621,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-UCHAR" name="prod-UCHAR"></a>[<span class="prodNo">68</span>] </td> ' +
+'<td><a id="prod-UCHAR" name="prod-UCHAR"></a>[<span class="prodNo">69</span>] </td> ' +
'<td><<code class="production term">UCHAR</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">( "\\u" <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> )<br/> ' +
@@ -623,7 +631,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-ECHAR" name="prod-ECHAR"></a>[<span class="prodNo">69</span>] </td> ' +
+'<td><a id="prod-ECHAR" name="prod-ECHAR"></a>[<span class="prodNo">70</span>] </td> ' +
'<td><<code class="production term">ECHAR</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"\\" [tbnrf\\\"\']</code></td> ' +
@@ -632,7 +640,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-NIL" name="prod-NIL"></a>[<span class="prodNo">70</span>] </td> ' +
+'<td><a id="prod-NIL" name="prod-NIL"></a>[<span class="prodNo">71</span>] </td> ' +
'<td><<code class="production term">NIL</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"(" ( <span class="prod"><a class="grammarRef" href="#prod-WS">WS</a></span> )* ")"</code></td> ' +
@@ -641,7 +649,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-WS" name="prod-WS"></a>[<span class="prodNo">71</span>] </td> ' +
+'<td><a id="prod-WS" name="prod-WS"></a>[<span class="prodNo">72</span>] </td> ' +
'<td><<code class="production term">WS</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">" "<br/> ' +
@@ -653,7 +661,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-ANON" name="prod-ANON"></a>[<span class="prodNo">72</span>] </td> ' +
+'<td><a id="prod-ANON" name="prod-ANON"></a>[<span class="prodNo">73</span>] </td> ' +
'<td><<code class="production term">ANON</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"[" ( <span class="prod"><a class="grammarRef" href="#prod-WS">WS</a></span> )* "]"</code></td> ' +
@@ -662,7 +670,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS_BASE" name="prod-PN_CHARS_BASE"></a>[<span class="prodNo">73</span>] </td> ' +
+'<td><a id="prod-PN_CHARS_BASE" name="prod-PN_CHARS_BASE"></a>[<span class="prodNo">74</span>] </td> ' +
'<td><<code class="production term">PN_CHARS_BASE</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">[A-Z]<br/> ' +
@@ -684,7 +692,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS_U" name="prod-PN_CHARS_U"></a>[<span class="prodNo">74</span>] </td> ' +
+'<td><a id="prod-PN_CHARS_U" name="prod-PN_CHARS_U"></a>[<span class="prodNo">75</span>] </td> ' +
'<td><<code class="production term">PN_CHARS_U</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_BASE">PN_CHARS_BASE</a></span><br/> ' +
@@ -694,7 +702,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS" name="prod-PN_CHARS"></a>[<span class="prodNo">75</span>] </td> ' +
+'<td><a id="prod-PN_CHARS" name="prod-PN_CHARS"></a>[<span class="prodNo">76</span>] </td> ' +
'<td><<code class="production term">PN_CHARS</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS_U">PN_CHARS_U</a></span><br/> ' +
@@ -708,7 +716,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_PREFIX" name="prod-PN_PREFIX"></a>[<span class="prodNo">76</span>] </td> ' +
+'<td><a id="prod-PN_PREFIX" name="prod-PN_PREFIX"></a>[<span class="prodNo">77</span>] </td> ' +
'<td><<code class="production term">PN_PREFIX</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_BASE">PN_CHARS_BASE</a></span> ( ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | "." )* <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> )?</code></td> ' +
@@ -717,7 +725,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a>[<span class="prodNo">77</span>] </td> ' +
+'<td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a>[<span class="prodNo">78</span>] </td> ' +
'<td><<code class="production term">PN_LOCAL</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) ( ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> )* ( <span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) )?</code></td> ' +
@@ -726,7 +734,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a>[<span class="prodNo">78</span>] </td> ' +
+'<td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a>[<span class="prodNo">79</span>] </td> ' +
'<td><<code class="production term">PN_CHARS_OTHERS</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PERCENT">PERCENT</a></span><br/> ' +
@@ -743,7 +751,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PERCENT" name="prod-PERCENT"></a>[<span class="prodNo">79</span>] </td> ' +
+'<td><a id="prod-PERCENT" name="prod-PERCENT"></a>[<span class="prodNo">80</span>] </td> ' +
'<td><<code class="production term">PERCENT</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-HEX">HEX</a></span></code></td> ' +
@@ -752,7 +760,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-HEX" name="prod-HEX"></a>[<span class="prodNo">80</span>] </td> ' +
+'<td><a id="prod-HEX" name="prod-HEX"></a>[<span class="prodNo">81</span>] </td> ' +
'<td><<code class="production term">HEX</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">[0-9]<br/> ' +
@@ -763,7 +771,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PASSED_TOKENS" name="prod-PASSED_TOKENS"></a>[<span class="prodNo">81</span>] </td> ' +
+'<td><a id="prod-PASSED_TOKENS" name="prod-PASSED_TOKENS"></a>[<span class="prodNo">82</span>] </td> ' +
'<td><code class="production directive">PASSED TOKENS</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">([ \t\r\n])+<br/> ' +
--- a/model/grammar/yack/prov-n-LL.bnf Thu Jun 28 11:59:41 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf Thu Jun 28 12:18:20 2012 +0100
@@ -11,8 +11,8 @@
| startExpression | endExpression | invalidationExpression | communicationExpression
| agentExpression | associationExpression | attributionExpression | delegationExpression
| derivationExpression | tracedToExpression
- | alternateExpression | specializationExpression | contextualizationExpression
- | insertionExpression | removalExpression | membershipExpression
+ | alternateExpression | specializationExpression | contextualizationExpression | membershipExpression
+ | insertionExpression | removalExpression | dictMembershipExpression
)
@@ -91,8 +91,11 @@
[30a] keySet::= "{" literal ("," literal)* "}"
-[31] membershipExpression::= "memberOf" "(" optionalIdentifier dIdentifier "," keyEntitySet complete optionalAttributeValuePairs ")"
-| "memberOf" "(" optionalIdentifier cIdentifier "," entitySet complete optionalAttributeValuePairs ")"
+[31] membershipExpression::=
+ "memberOf" "(" optionalIdentifier cIdentifier "," entitySet complete optionalAttributeValuePairs ")"
+
+[31c] dictMembershipExpression::= "memberOf" "(" optionalIdentifier dIdentifier "," keyEntitySet complete optionalAttributeValuePairs ")"
+
[31b] complete::= ("," ("true" | "false" | "-"))?
--- a/model/grammar/yack/prov-n-LL.bnf.html Thu Jun 28 11:59:41 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf.html Thu Jun 28 12:18:20 2012 +0100
@@ -15,7 +15,7 @@
<td><a id="prod-prov_n_LL-expression" name="prod-prov_n_LL-expression"></a>[<span class="prodNo">2</span>] </td>
<td><code class="production prod">expression</code></td>
<td> ::= </td>
-<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-tracedToExpression">tracedToExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-contextualizationExpression">contextualizationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-membershipExpression">membershipExpression</a></span> )</code></td>
+<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-tracedToExpression">tracedToExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-contextualizationExpression">contextualizationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-membershipExpression">membershipExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-insertionExpression">insertionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-removalExpression">removalExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-dictMembershipExpression">dictMembershipExpression</a></span> )</code></td>
</tr>
</tbody>
@@ -276,14 +276,22 @@
<td><a id="prod-prov_n_LL-membershipExpression" name="prod-prov_n_LL-membershipExpression"></a>[<span class="prodNo">31</span>] </td>
<td><code class="production prod">membershipExpression</code></td>
<td> ::= </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> ")"<br/>
-| "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">"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>
</tr>
</tbody>
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-complete" name="prod-prov_n_LL-complete"></a>[<span class="prodNo">32</span>] </td>
+<td><a id="prod-prov_n_LL-dictMembershipExpression" name="prod-prov_n_LL-dictMembershipExpression"></a>[<span class="prodNo">32</span>] </td>
+<td><code class="production prod">dictMembershipExpression</code></td>
+<td> ::= </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>
+</tr>
+</tbody>
+
+<tbody class="prod">
+<tr valign="baseline">
+<td><a id="prod-prov_n_LL-complete" name="prod-prov_n_LL-complete"></a>[<span class="prodNo">33</span>] </td>
<td><code class="production prod">complete</code></td>
<td> ::= </td>
<td><code class="content">(( "," ( "true" | "false" | "-" ) ))?</code></td>
@@ -292,7 +300,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-namedBundle" name="prod-prov_n_LL-namedBundle"></a>[<span class="prodNo">33</span>] </td>
+<td><a id="prod-prov_n_LL-namedBundle" name="prod-prov_n_LL-namedBundle"></a>[<span class="prodNo">34</span>] </td>
<td><code class="production prod">namedBundle</code></td>
<td> ::= </td>
<td><code class="content">"bundle" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespaceDeclarations">namespaceDeclarations</a></span>)? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-expression">expression</a></span>)* "endBundle"</code></td>
@@ -301,7 +309,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-eIdentifier" name="prod-prov_n_LL-eIdentifier"></a>[<span class="prodNo">34</span>] </td>
+<td><a id="prod-prov_n_LL-eIdentifier" name="prod-prov_n_LL-eIdentifier"></a>[<span class="prodNo">35</span>] </td>
<td><code class="production prod">eIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -310,7 +318,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-aIdentifier" name="prod-prov_n_LL-aIdentifier"></a>[<span class="prodNo">35</span>] </td>
+<td><a id="prod-prov_n_LL-aIdentifier" name="prod-prov_n_LL-aIdentifier"></a>[<span class="prodNo">36</span>] </td>
<td><code class="production prod">aIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -319,7 +327,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-agIdentifier" name="prod-prov_n_LL-agIdentifier"></a>[<span class="prodNo">36</span>] </td>
+<td><a id="prod-prov_n_LL-agIdentifier" name="prod-prov_n_LL-agIdentifier"></a>[<span class="prodNo">37</span>] </td>
<td><code class="production prod">agIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -328,7 +336,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-gIdentifier" name="prod-prov_n_LL-gIdentifier"></a>[<span class="prodNo">37</span>] </td>
+<td><a id="prod-prov_n_LL-gIdentifier" name="prod-prov_n_LL-gIdentifier"></a>[<span class="prodNo">38</span>] </td>
<td><code class="production prod">gIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -337,7 +345,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-uIdentifier" name="prod-prov_n_LL-uIdentifier"></a>[<span class="prodNo">38</span>] </td>
+<td><a id="prod-prov_n_LL-uIdentifier" name="prod-prov_n_LL-uIdentifier"></a>[<span class="prodNo">39</span>] </td>
<td><code class="production prod">uIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -346,7 +354,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-dIdentifier" name="prod-prov_n_LL-dIdentifier"></a>[<span class="prodNo">39</span>] </td>
+<td><a id="prod-prov_n_LL-dIdentifier" name="prod-prov_n_LL-dIdentifier"></a>[<span class="prodNo">40</span>] </td>
<td><code class="production prod">dIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -355,7 +363,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-cIdentifier" name="prod-prov_n_LL-cIdentifier"></a>[<span class="prodNo">40</span>] </td>
+<td><a id="prod-prov_n_LL-cIdentifier" name="prod-prov_n_LL-cIdentifier"></a>[<span class="prodNo">41</span>] </td>
<td><code class="production prod">cIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -364,7 +372,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-bIdentifier" name="prod-prov_n_LL-bIdentifier"></a>[<span class="prodNo">41</span>] </td>
+<td><a id="prod-prov_n_LL-bIdentifier" name="prod-prov_n_LL-bIdentifier"></a>[<span class="prodNo">42</span>] </td>
<td><code class="production prod">bIdentifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-identifier">identifier</a></span></code></td>
@@ -373,7 +381,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-eIdentifierOrMarker" name="prod-prov_n_LL-eIdentifierOrMarker"></a>[<span class="prodNo">42</span>] </td>
+<td><a id="prod-prov_n_LL-eIdentifierOrMarker" name="prod-prov_n_LL-eIdentifierOrMarker"></a>[<span class="prodNo">43</span>] </td>
<td><code class="production prod">eIdentifierOrMarker</code></td>
<td> ::= </td>
<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-eIdentifier">eIdentifier</a></span> | "-" )</code></td>
@@ -382,7 +390,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-aIdentifierOrMarker" name="prod-prov_n_LL-aIdentifierOrMarker"></a>[<span class="prodNo">43</span>] </td>
+<td><a id="prod-prov_n_LL-aIdentifierOrMarker" name="prod-prov_n_LL-aIdentifierOrMarker"></a>[<span class="prodNo">44</span>] </td>
<td><code class="production prod">aIdentifierOrMarker</code></td>
<td> ::= </td>
<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-aIdentifier">aIdentifier</a></span> | "-" )</code></td>
@@ -391,7 +399,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-agIdentifierOrMarker" name="prod-prov_n_LL-agIdentifierOrMarker"></a>[<span class="prodNo">44</span>] </td>
+<td><a id="prod-prov_n_LL-agIdentifierOrMarker" name="prod-prov_n_LL-agIdentifierOrMarker"></a>[<span class="prodNo">45</span>] </td>
<td><code class="production prod">agIdentifierOrMarker</code></td>
<td> ::= </td>
<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-agIdentifier">agIdentifier</a></span> | "-" )</code></td>
@@ -400,7 +408,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-gIdentifierOrMarker" name="prod-prov_n_LL-gIdentifierOrMarker"></a>[<span class="prodNo">45</span>] </td>
+<td><a id="prod-prov_n_LL-gIdentifierOrMarker" name="prod-prov_n_LL-gIdentifierOrMarker"></a>[<span class="prodNo">46</span>] </td>
<td><code class="production prod">gIdentifierOrMarker</code></td>
<td> ::= </td>
<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-gIdentifier">gIdentifier</a></span> | "-" )</code></td>
@@ -409,7 +417,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-uIdentifierOrMarker" name="prod-prov_n_LL-uIdentifierOrMarker"></a>[<span class="prodNo">46</span>] </td>
+<td><a id="prod-prov_n_LL-uIdentifierOrMarker" name="prod-prov_n_LL-uIdentifierOrMarker"></a>[<span class="prodNo">47</span>] </td>
<td><code class="production prod">uIdentifierOrMarker</code></td>
<td> ::= </td>
<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-uIdentifier">uIdentifier</a></span> | "-" )</code></td>
@@ -418,7 +426,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-identifier" name="prod-prov_n_LL-identifier"></a>[<span class="prodNo">47</span>] </td>
+<td><a id="prod-prov_n_LL-identifier" name="prod-prov_n_LL-identifier"></a>[<span class="prodNo">48</span>] </td>
<td><code class="production prod">identifier</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
@@ -427,7 +435,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-attribute" name="prod-prov_n_LL-attribute"></a>[<span class="prodNo">48</span>] </td>
+<td><a id="prod-prov_n_LL-attribute" name="prod-prov_n_LL-attribute"></a>[<span class="prodNo">49</span>] </td>
<td><code class="production prod">attribute</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
@@ -436,7 +444,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-timeZZ" name="prod-prov_n_LL-timeZZ"></a>[<span class="prodNo">49</span>] </td>
+<td><a id="prod-prov_n_LL-timeZZ" name="prod-prov_n_LL-timeZZ"></a>[<span class="prodNo">50</span>] </td>
<td><code class="production prod">timeZZ</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ISODATETIME">ISODATETIME</a></span></code></td>
@@ -445,7 +453,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-literal" name="prod-prov_n_LL-literal"></a>[<span class="prodNo">50</span>] </td>
+<td><a id="prod-prov_n_LL-literal" name="prod-prov_n_LL-literal"></a>[<span class="prodNo">51</span>] </td>
<td><code class="production prod">literal</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-typedLiteral">typedLiteral</a></span><br/>
@@ -455,7 +463,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-typedLiteral" name="prod-prov_n_LL-typedLiteral"></a>[<span class="prodNo">51</span>] </td>
+<td><a id="prod-prov_n_LL-typedLiteral" name="prod-prov_n_LL-typedLiteral"></a>[<span class="prodNo">52</span>] </td>
<td><code class="production prod">typedLiteral</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL">STRING_LITERAL</a></span> "%%" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-datatype">datatype</a></span></code></td>
@@ -464,7 +472,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-datatype" name="prod-prov_n_LL-datatype"></a>[<span class="prodNo">52</span>] </td>
+<td><a id="prod-prov_n_LL-datatype" name="prod-prov_n_LL-datatype"></a>[<span class="prodNo">53</span>] </td>
<td><code class="production prod">datatype</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span></code></td>
@@ -473,7 +481,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-convenienceNotation" name="prod-prov_n_LL-convenienceNotation"></a>[<span class="prodNo">53</span>] </td>
+<td><a id="prod-prov_n_LL-convenienceNotation" name="prod-prov_n_LL-convenienceNotation"></a>[<span class="prodNo">54</span>] </td>
<td><code class="production prod">convenienceNotation</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL">STRING_LITERAL</a></span><br/>
@@ -484,7 +492,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-namespaceDeclarations" name="prod-prov_n_LL-namespaceDeclarations"></a>[<span class="prodNo">54</span>] </td>
+<td><a id="prod-prov_n_LL-namespaceDeclarations" name="prod-prov_n_LL-namespaceDeclarations"></a>[<span class="prodNo">55</span>] </td>
<td><code class="production prod">namespaceDeclarations</code></td>
<td> ::= </td>
<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-defaultNamespaceDeclaration">defaultNamespaceDeclaration</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespaceDeclaration">namespaceDeclaration</a></span> ) (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespaceDeclaration">namespaceDeclaration</a></span>)*</code></td>
@@ -493,7 +501,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-namespaceDeclaration" name="prod-prov_n_LL-namespaceDeclaration"></a>[<span class="prodNo">55</span>] </td>
+<td><a id="prod-prov_n_LL-namespaceDeclaration" name="prod-prov_n_LL-namespaceDeclaration"></a>[<span class="prodNo">56</span>] </td>
<td><code class="production prod">namespaceDeclaration</code></td>
<td> ::= </td>
<td><code class="content">"prefix" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespace">namespace</a></span></code></td>
@@ -502,7 +510,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-defaultNamespaceDeclaration" name="prod-prov_n_LL-defaultNamespaceDeclaration"></a>[<span class="prodNo">56</span>] </td>
+<td><a id="prod-prov_n_LL-defaultNamespaceDeclaration" name="prod-prov_n_LL-defaultNamespaceDeclaration"></a>[<span class="prodNo">57</span>] </td>
<td><code class="production prod">defaultNamespaceDeclaration</code></td>
<td> ::= </td>
<td><code class="content">"default" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-IRI_REF">IRI_REF</a></span></code></td>
@@ -511,7 +519,7 @@
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-namespace" name="prod-prov_n_LL-namespace"></a>[<span class="prodNo">57</span>] </td>
+<td><a id="prod-prov_n_LL-namespace" name="prod-prov_n_LL-namespace"></a>[<span class="prodNo">58</span>] </td>
<td><code class="production prod">namespace</code></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-IRI_REF">IRI_REF</a></span></code></td>
@@ -520,7 +528,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALIFIED_NAME" name="term-prov_n_LL-QUALIFIED_NAME"></a>[<span class="prodNo">58</span>] </td>
+<td><a id="term-prov_n_LL-QUALIFIED_NAME" name="term-prov_n_LL-QUALIFIED_NAME"></a>[<span class="prodNo">59</span>] </td>
<td><<code class="production term">QUALIFIED_NAME</code>></td>
<td> ::= </td>
<td><code class="content">(( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_PREFIX">PN_PREFIX</a></span> ":" ))? <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_LOCAL">PN_LOCAL</a></span><br/>
@@ -530,7 +538,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PREFX" name="term-prov_n_LL-PREFX"></a>[<span class="prodNo">59</span>] </td>
+<td><a id="term-prov_n_LL-PREFX" name="term-prov_n_LL-PREFX"></a>[<span class="prodNo">60</span>] </td>
<td><<code class="production term">PREFX</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_PREFIX">PN_PREFIX</a></span></code></td>
@@ -539,7 +547,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-DIGIT" name="term-prov_n_LL-DIGIT"></a>[<span class="prodNo">60</span>] </td>
+<td><a id="term-prov_n_LL-DIGIT" name="term-prov_n_LL-DIGIT"></a>[<span class="prodNo">61</span>] </td>
<td><<code class="production term">DIGIT</code>></td>
<td> ::= </td>
<td><code class="content">[0-9]</code></td>
@@ -548,7 +556,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-ISODATETIME" name="term-prov_n_LL-ISODATETIME"></a>[<span class="prodNo">61</span>] </td>
+<td><a id="term-prov_n_LL-ISODATETIME" name="term-prov_n_LL-ISODATETIME"></a>[<span class="prodNo">62</span>] </td>
<td><<code class="production term">ISODATETIME</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( "." <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)? ))? ))? (( "Z" | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> ))?</code></td>
@@ -557,7 +565,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-TIMEZONEOFFSET" name="term-prov_n_LL-TIMEZONEOFFSET"></a>[<span class="prodNo">62</span>] </td>
+<td><a id="term-prov_n_LL-TIMEZONEOFFSET" name="term-prov_n_LL-TIMEZONEOFFSET"></a>[<span class="prodNo">63</span>] </td>
<td><<code class="production term">TIMEZONEOFFSET</code>></td>
<td> ::= </td>
<td><code class="content">( "+" | "-" ) <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span></code></td>
@@ -566,7 +574,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-IRI_REF" name="term-prov_n_LL-IRI_REF"></a>[<span class="prodNo">63</span>] </td>
+<td><a id="term-prov_n_LL-IRI_REF" name="term-prov_n_LL-IRI_REF"></a>[<span class="prodNo">64</span>] </td>
<td><<code class="production term">IRI_REF</code>></td>
<td> ::= </td>
<td><code class="content">"<" (( [^<>\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* ">"</code></td>
@@ -575,7 +583,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL" name="term-prov_n_LL-STRING_LITERAL"></a>[<span class="prodNo">64</span>] </td>
+<td><a id="term-prov_n_LL-STRING_LITERAL" name="term-prov_n_LL-STRING_LITERAL"></a>[<span class="prodNo">65</span>] </td>
<td><<code class="production term">STRING_LITERAL</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-STRING_LITERAL2">STRING_LITERAL2</a></span></code></td>
@@ -584,7 +592,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-STRING_LITERAL2" name="term-prov_n_LL-STRING_LITERAL2"></a>[<span class="prodNo">65</span>] </td>
+<td><a id="term-prov_n_LL-STRING_LITERAL2" name="term-prov_n_LL-STRING_LITERAL2"></a>[<span class="prodNo">66</span>] </td>
<td><<code class="production term">STRING_LITERAL2</code>></td>
<td> ::= </td>
<td><code class="content">'"' (( ( [^\"\\\n\r] ) | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ECHAR">ECHAR</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-UCHAR">UCHAR</a></span> ))* '"'</code></td>
@@ -593,7 +601,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">66</span>] </td>
+<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">67</span>] </td>
<td><<code class="production term">INT_LITERAL</code>></td>
<td> ::= </td>
<td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)+</code></td>
@@ -602,7 +610,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALIFIED_NAME_LITERAL" name="term-prov_n_LL-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">67</span>] </td>
+<td><a id="term-prov_n_LL-QUALIFIED_NAME_LITERAL" name="term-prov_n_LL-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">68</span>] </td>
<td><<code class="production term">QUALIFIED_NAME_LITERAL</code>></td>
<td> ::= </td>
<td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "'"</code></td>
@@ -611,7 +619,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">68</span>] </td>
+<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">69</span>] </td>
<td><<code class="production term">UCHAR</code>></td>
<td> ::= </td>
<td><code class="content">( "\\u" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> )<br/>
@@ -621,7 +629,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">69</span>] </td>
+<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">70</span>] </td>
<td><<code class="production term">ECHAR</code>></td>
<td> ::= </td>
<td><code class="content">"\\" [tbnrf\\\"']</code></td>
@@ -630,7 +638,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">70</span>] </td>
+<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">71</span>] </td>
<td><<code class="production term">NIL</code>></td>
<td> ::= </td>
<td><code class="content">"(" (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-WS">WS</a></span> ))* ")"</code></td>
@@ -639,7 +647,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">71</span>] </td>
+<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">72</span>] </td>
<td><<code class="production term">WS</code>></td>
<td> ::= </td>
<td><code class="content">" "<br/>
@@ -651,7 +659,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">72</span>] </td>
+<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">73</span>] </td>
<td><<code class="production term">ANON</code>></td>
<td> ::= </td>
<td><code class="content">"[" (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-WS">WS</a></span> ))* "]"</code></td>
@@ -660,7 +668,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_BASE" name="term-prov_n_LL-PN_CHARS_BASE"></a>[<span class="prodNo">73</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_BASE" name="term-prov_n_LL-PN_CHARS_BASE"></a>[<span class="prodNo">74</span>] </td>
<td><<code class="production term">PN_CHARS_BASE</code>></td>
<td> ::= </td>
<td><code class="content">[A-Z]<br/>
@@ -682,7 +690,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_U" name="term-prov_n_LL-PN_CHARS_U"></a>[<span class="prodNo">74</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_U" name="term-prov_n_LL-PN_CHARS_U"></a>[<span class="prodNo">75</span>] </td>
<td><<code class="production term">PN_CHARS_U</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_BASE">PN_CHARS_BASE</a></span><br/>
@@ -692,7 +700,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">75</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">76</span>] </td>
<td><<code class="production term">PN_CHARS</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_U">PN_CHARS_U</a></span><br/>
@@ -706,7 +714,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">76</span>] </td>
+<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">77</span>] </td>
<td><<code class="production term">PN_PREFIX</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_BASE">PN_CHARS_BASE</a></span> (( (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | "." ))* <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> ))?</code></td>
@@ -715,7 +723,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">77</span>] </td>
+<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">78</span>] </td>
<td><<code class="production term">PN_LOCAL</code>></td>
<td> ::= </td>
<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_U">PN_CHARS_U</a></span> | [0-9] | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) (( (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | "." | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ))* ( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) ))?</code></td>
@@ -724,7 +732,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PN_CHARS_OTHERS" name="term-prov_n_LL-PN_CHARS_OTHERS"></a>[<span class="prodNo">78</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_OTHERS" name="term-prov_n_LL-PN_CHARS_OTHERS"></a>[<span class="prodNo">79</span>] </td>
<td><<code class="production term">PN_CHARS_OTHERS</code>></td>
<td> ::= </td>
<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-PERCENT">PERCENT</a></span><br/>
@@ -741,7 +749,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">79</span>] </td>
+<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">80</span>] </td>
<td><<code class="production term">PERCENT</code>></td>
<td> ::= </td>
<td><code class="content">"%" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-HEX">HEX</a></span></code></td>
@@ -750,7 +758,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">80</span>] </td>
+<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">81</span>] </td>
<td><<code class="production term">HEX</code>></td>
<td> ::= </td>
<td><code class="content">[0-9]<br/>
@@ -761,7 +769,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-PASSED_TOKENS" name="term-prov_n_LL-PASSED_TOKENS"></a>[<span class="prodNo">81</span>] </td>
+<td><a id="term-prov_n_LL-PASSED_TOKENS" name="term-prov_n_LL-PASSED_TOKENS"></a>[<span class="prodNo">82</span>] </td>
<td><code class="production directive">PASSED TOKENS</code></td>
<td> ::= </td>
<td><code class="content">([ \t\r\n])+<br/>
--- a/model/prov-dictionary.html Thu Jun 28 11:59:41 2012 +0100
+++ b/model/prov-dictionary.html Thu Jun 28 12:18:20 2012 +0100
@@ -43,13 +43,43 @@
-moz-border-radius: ;
}
</style>
+ <script src="grammar/ll.js" class="remove"></script>
+ <script class="remove">
+function insertProductionDefinition(doc, content, name) {
+
+ var xml=$.parseXML(content);
+
+ var segment = $(xml).find('a[name~="' + name + '"]').parents("tbody")[0];
+
+// return doc._esc((new XMLSerializer()).serializeToString(segment));
+ return (new XMLSerializer()).serializeToString(segment);
+}
+
+function insertProductionGeneration(doc, content) { return insertProductionDefinition(doc,content,'prod-prov_n_LL-generationExpression'); }
+
+ </script>
+
<script src="http://dev.w3.org/2009/dap/ReSpec.js/js/respec.js" class="remove"></script>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" class="remove"></script>
<script src="http://www.w3.org/2007/OWL/toggles.js"></script>
<script src="glossary.js" class="remove"></script>
+ <script class="remove">
+ function updateGrammarRefs() {
+ $('.grammar-ref').each(function(index) {
+ var ref=$(this).attr('data-ref');
+ console.log( "updating grammar for " + ref);
+// $('#'+ref).parents("tbody").clone().appendTo($(this));
+
+ // $(this).replaceWith(function() {return $('#'+ref).parents("tbody").clone()});
+
+ $(this).replaceWith($('#'+ref).parents("tbody").clone());
+
+ });
+ }
+ </script>
<script class="remove">
function updateGlossaryRefs() {
$('.glossary-ref').each(function(index) {
@@ -198,8 +228,10 @@
$(document).ready(function(){
// if glossary is in a string:
$('#glossary_div').html(glossary_string)
+ $('#grammar_div').html(grammar_string);
updateGlossaryRefs();
updateFigCaptions();
+ updateGrammarRefs();
updateExamples();
updateExamplesRefs();
@@ -781,6 +813,230 @@
</section> <!-- end dictionaries-->
+</section>
+<section>
+<h2>PROV Notation</h2>
+
+<section id="expression-collection-membership">
+<h3>Membership</h3>
+
+<!--
+<div class="grammar">
+ <span class="nonterminal">membershipExpression</span> ::=
+<span class="name">isMemberOf</span>
+ <span class="name">(</span>
+ <span class="optional"><span class="nonterminal">identifier</span>
+ <span class="name">,</span></span>
+<span class="nonterminal">cIdentifier</span>
+ <span class="name">,</span>
+ <span class="name">{</span>
+ <span class="nonterminal">keyValuePairs</span>
+ <span class="name">}</span>
+<span class="nonterminal">optional-attribute-values</span>
+ <span class="name">)</span>
+ <br>
+</div>
+-->
+
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-dictMembershipExpression"></tbody>
+<tbody class="grammar-ref" data-ref="prod-complete"></tbody>
+<tbody class="grammar-ref" data-ref="prod-entitySet"></tbody>
+</table>
+
+
+<p>The following table summarizes how each constituent of a PROV-DM Membership maps to a non-terminal.</p>
+
+<div style="text-align: left; ">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<tr><td><b>Dictionary Membership</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.id"><span class='attribute' id="membership-d.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.dictionary"><span class='attribute' id="membership-d.dictionary">dictionary</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.key-entity-set"><span class='attribute' id="membership-d.key-entity-set">key-entity-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keyEntitySet">keyEntitySet</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.complete"><span class='attribute' id="membership-d.complete">complete</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-complete">complete</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.attributes"><span class='attribute' id="membership-d.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+</table>
+</div>
+
+
+
+<div class="anexample">
+ <pre class="codeexample">
+ memberOf(mId, c, {e1, e2, e3}, []) // Collection membership
+ memberOf(mId, c, {("k4", v4), ("k5", v5)}, []) // Dictionary membership
+ </pre>
+<p> Here
+ <span class="name">mid</span> is the optional membership identifier,
+ <span class="name">c</span> is the identifier for the collection whose membership is stated,
+ <span class="name"> {("k4", v4), ("k5", v5)}</span> is the set of key-value pairs that are members of
+ <span class="name">c</span>,
+ and <span class="name">[]</span> is the optional (empty) set of attributes. </p>
+The remaining examples show cases for Dictionaries, where some of the optionals are omitted. Key-entity sets are replaced with Entity sets for the corresponding generic Collections examples.
+
+<pre class="codeexample">
+memberOf(c3, {("k4", v4), ("k5", v5)})
+memberOf(c3, {("k4", v4)})
+memberOf(c3, {("k4", v4)}, false)
+memberOf(c3, {("k4", v4)}, true)
+memberOf(c3, {("k4", v4), ("k5", v5)},[])
+memberOf(c3, {("k4", v4), ("k5", v5)},true, [])
+</pre>
+</div>
+
+</section>
+
+
+
+<section id="expression-collection-insertion">
+<h3>Insertion</h3>
+
+<!--
+<div class="grammar">
+ <span class="nonterminal">derivationByInsertionFromExpression</span> ::=
+<span class="name">derivedByInsertionFrom</span>
+ <span class="name">(</span>
+ <span class="optional"><span class="nonterminal">identifier</span>
+ <span class="name">,</span></span>
+<span class="nonterminal">cIdentifier</span>
+ <span class="name">,</span>
+<span class="nonterminal">cIdentifier</span>
+ <span class="name">,</span>
+ <span class="name">{</span>
+ <span class="nonterminal">keyValuePairs</span>
+ <span class="name">}</span>
+<span class="nonterminal">optional-attribute-values</span>
+ <span class="name">)</span>
+</div>
+-->
+
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-insertionExpression"></tbody>
+<tbody class="grammar-ref" data-ref="prod-keyEntitySet"></tbody>
+</table>
+
+
+<p>The following table summarizes how each constituent of a PROV-DM Insertion maps to a non-terminal.</p>
+<div style="text-align: left; ">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<tr><td><b>Insertion</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.id"><span class='attribute' id="insertion.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.after"><span class='attribute' id="insertion.after">after</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.before"><span class='attribute' id="insertion.before">before</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.key-entity-set"><span class='attribute' id="insertion.key-entity-set">key-entity-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keyEntitySet">keyEntitySet</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.attributes"><span class='attribute' id="insertion.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+</table>
+</div>
+
+
+<div class="anexample">
+ <pre class="codeexample">
+ derivedByInsertionFrom(id; c1, c, {("k1", v1), ("k2", v2)}, [])
+ </pre>
+<p> Here
+ <span class="name">id</span> is the optional insertion identifier,
+ <span class="name">c1</span> is the identifier for the collection after the insertion,
+ <span class="name">c</span> is the identifier for the collection before the insertion,
+ <span class="name"> {("k1", v1), ("k2", v2)}</span> is the set of key-value pairs that have been inserted in
+ <span class="name">c</span>,
+ and <span class="name">[]</span> is the optional (empty) set of attributes. </p>
+The remaining examples show cases where some of the optionals are omitted.
+
+ <pre class="codeexample">
+ derivedByInsertionFrom(c1, c, {("k1", v1), ("k2", v2)})
+ derivedByInsertionFrom(c1, c, {("k1", v1)})
+ derivedByInsertionFrom(c1, c, {("k1", v1), ("k2", v2)}, [])
+</pre>
+</div>
+
+
+</section>
+
+<section id="expression-collection-removal">
+<h3>Removal</h3>
+
+<!--
+<div class="grammar">
+ <span class="nonterminal">derivationByRemovalFromExpression</span> ::=
+<span class="name">derivedByRemovalFrom</span>
+ <span class="name">(</span>
+ <span class="optional"><span class="nonterminal">identifier</span>
+ <span class="name">,</span></span>
+<span class="nonterminal">cIdentifier</span>
+ <span class="name">,</span>
+<span class="nonterminal">cIdentifier</span>
+ <span class="name">,</span>
+ <span class="name">{</span>
+ <span class="nonterminal">keySet</span>
+ <span class="name">}</span>
+<span class="nonterminal">optional-attribute-values</span>
+ <span class="name">)</span>
+ <br>
+</div>
+-->
+
+<table class="grammar">
+<tbody class="grammar-ref" data-ref="prod-removalExpression"></tbody>
+<tbody class="grammar-ref" data-ref="prod-keySet"></tbody>
+</table>
+
+<p>The following table summarizes how each constituent of a PROV-DM Removal maps to a non-terminal.</p>
+<div style="text-align: left; ">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<tr><td><b>Removal</b></td><td><b>Non-Terminal</b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.id"><span class='attribute' id="removal.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.after"><span class='attribute' id="removal.after">after</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.before"><span class='attribute' id="removal.before">before</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
+
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.key-set"><span class='attribute' id="removal.key-set">key-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keySet">keySet</a></code></td></tr>
+
+<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.attributes"><span class='attribute' id="removal.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
+</table>
+</div>
+
+
+
+
+<div class="anexample">
+ <pre class="codeexample">
+ derivedByRemovalFrom(id; c3, c, {"k1", "k3"}, [])
+ </pre>
+<p> Here
+ <span class="name">id</span> is the optional removal identifier,
+ <span class="name">c1</span> is the identifier for the collection after the removal,
+ <span class="name">c</span> is the identifier for the collection before the removal,
+ <span class="name"> {("k1", v1), ("k2", v2)}</span> is the set of key-value pairs that have been removed from
+ <span class="name">c</span>,
+ and <span class="name">[]</span> is the optional (empty) set of attributes. </p>
+ The remaining examples show cases where some of the optionals are omitted.
+
+ <pre class="codeexample">
+ derivedByRemovalFrom(c3, c1, {"k1", "k3"})
+ derivedByRemovalFrom(c3, c1, {"k1"})
+ derivedByRemovalFrom(c3, c1, {"k1", "k3"}, [])
+</pre>
+ </div>
+
+</section>
+
+</section>
@@ -789,6 +1045,11 @@
class remove, will remove this element from the final output.
-->
</div>
+<div id="grammar_div" class="remove">
+<!-- grammar loaded from glossary.js will be hooked up here,
+ class remove, will remove this element from the final output.
+-->
+</div>
<section class="appendix">
<h2>Acknowledgements</h2>
--- a/model/prov-n.html Thu Jun 28 11:59:41 2012 +0100
+++ b/model/prov-n.html Thu Jun 28 12:18:20 2012 +0100
@@ -2014,148 +2014,6 @@
</div>
-->
-<section id="expression-collection-insertion">
-<h3>Insertion</h3>
-
-<!--
-<div class="grammar">
- <span class="nonterminal">derivationByInsertionFromExpression</span> ::=
-<span class="name">derivedByInsertionFrom</span>
- <span class="name">(</span>
- <span class="optional"><span class="nonterminal">identifier</span>
- <span class="name">,</span></span>
-<span class="nonterminal">cIdentifier</span>
- <span class="name">,</span>
-<span class="nonterminal">cIdentifier</span>
- <span class="name">,</span>
- <span class="name">{</span>
- <span class="nonterminal">keyValuePairs</span>
- <span class="name">}</span>
-<span class="nonterminal">optional-attribute-values</span>
- <span class="name">)</span>
-</div>
--->
-
-<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-insertionExpression"></tbody>
-<tbody class="grammar-ref" data-ref="prod-keyEntitySet"></tbody>
-</table>
-
-
-<p>The following table summarizes how each constituent of a PROV-DM Insertion maps to a non-terminal.</p>
-<div style="text-align: left; ">
-<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Insertion</b></td><td><b>Non-Terminal</b></td></tr>
-<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.id"><span class='attribute' id="insertion.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.after"><span class='attribute' id="insertion.after">after</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.before"><span class='attribute' id="insertion.before">before</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
-
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.key-entity-set"><span class='attribute' id="insertion.key-entity-set">key-entity-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keyEntitySet">keyEntitySet</a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#insertion.attributes"><span class='attribute' id="insertion.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
-</table>
-</div>
-
-
-<div class="anexample">
- <pre class="codeexample">
- derivedByInsertionFrom(id; c1, c, {("k1", v1), ("k2", v2)}, [])
- </pre>
-<p> Here
- <span class="name">id</span> is the optional insertion identifier,
- <span class="name">c1</span> is the identifier for the collection after the insertion,
- <span class="name">c</span> is the identifier for the collection before the insertion,
- <span class="name"> {("k1", v1), ("k2", v2)}</span> is the set of key-value pairs that have been inserted in
- <span class="name">c</span>,
- and <span class="name">[]</span> is the optional (empty) set of attributes. </p>
-The remaining examples show cases where some of the optionals are omitted.
-
- <pre class="codeexample">
- derivedByInsertionFrom(c1, c, {("k1", v1), ("k2", v2)})
- derivedByInsertionFrom(c1, c, {("k1", v1)})
- derivedByInsertionFrom(c1, c, {("k1", v1), ("k2", v2)}, [])
-</pre>
-</div>
-
-
-</section>
-
-<section id="expression-collection-removal">
-<h3>Removal</h3>
-
-<!--
-<div class="grammar">
- <span class="nonterminal">derivationByRemovalFromExpression</span> ::=
-<span class="name">derivedByRemovalFrom</span>
- <span class="name">(</span>
- <span class="optional"><span class="nonterminal">identifier</span>
- <span class="name">,</span></span>
-<span class="nonterminal">cIdentifier</span>
- <span class="name">,</span>
-<span class="nonterminal">cIdentifier</span>
- <span class="name">,</span>
- <span class="name">{</span>
- <span class="nonterminal">keySet</span>
- <span class="name">}</span>
-<span class="nonterminal">optional-attribute-values</span>
- <span class="name">)</span>
- <br>
-</div>
--->
-
-<table class="grammar">
-<tbody class="grammar-ref" data-ref="prod-removalExpression"></tbody>
-<tbody class="grammar-ref" data-ref="prod-keySet"></tbody>
-</table>
-
-<p>The following table summarizes how each constituent of a PROV-DM Removal maps to a non-terminal.</p>
-<div style="text-align: left; ">
-<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Removal</b></td><td><b>Non-Terminal</b></td></tr>
-<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.id"><span class='attribute' id="removal.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.after"><span class='attribute' id="removal.after">after</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.before"><span class='attribute' id="removal.before">before</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-cIdentifier">cIdentifier</a></code></td></tr>
-
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.key-set"><span class='attribute' id="removal.key-set">key-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keySet">keySet</a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#removal.attributes"><span class='attribute' id="removal.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
-</table>
-</div>
-
-
-
-
-<div class="anexample">
- <pre class="codeexample">
- derivedByRemovalFrom(id; c3, c, {"k1", "k3"}, [])
- </pre>
-<p> Here
- <span class="name">id</span> is the optional removal identifier,
- <span class="name">c1</span> is the identifier for the collection after the removal,
- <span class="name">c</span> is the identifier for the collection before the removal,
- <span class="name"> {("k1", v1), ("k2", v2)}</span> is the set of key-value pairs that have been removed from
- <span class="name">c</span>,
- and <span class="name">[]</span> is the optional (empty) set of attributes. </p>
- The remaining examples show cases where some of the optionals are omitted.
-
- <pre class="codeexample">
- derivedByRemovalFrom(c3, c1, {"k1", "k3"})
- derivedByRemovalFrom(c3, c1, {"k1"})
- derivedByRemovalFrom(c3, c1, {"k1", "k3"}, [])
-</pre>
- </div>
-
-</section>
<section id="expression-collection-membership">
<h3>Membership</h3>
@@ -2203,22 +2061,6 @@
</table>
</div>
-<div style="text-align: left; ">
-<table class="thinborder" style="margin-left: auto; margin-right: auto;">
-<tr><td><b>Dictionary Membership</b></td><td><b>Non-Terminal</b></td></tr>
-<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.id"><span class='attribute' id="membership-d.id">id</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.dictionary"><span class='attribute' id="membership-d.dictionary">dictionary</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-dIdentifier">dIdentifier</a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.key-entity-set"><span class='attribute' id="membership-d.key-entity-set">key-entity-set</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-keyEntitySet">keyEntitySet</a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.complete"><span class='attribute' id="membership-d.complete">complete</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-complete">complete</a></code></td></tr>
-
-<tr><td><a href="http://www.w3.org/TR/prov-dm/#membership-d.attributes"><span class='attribute' id="membership-d.attributes">attributes</span></a></td><td><code class="content"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></code></td></tr>
-</table>
-</div>