--- a/model/grammar/ll.html Thu May 24 15:33:58 2012 +0100
+++ b/model/grammar/ll.html Thu May 24 15:42:41 2012 +0100
@@ -106,7 +106,7 @@
<td><a id="prod-prov_n_LL-usageExpression" name="prod-prov_n_LL-usageExpression"></a>[<span class="prodNo">12</span>] </td>
<td><code class="production prod">usageExpression</code></td>
<td> ::= </td>
-<td><code class="content">"used" "(" <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-aIdentifier">aIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-eIdentifier">eIdentifier</a></span> (( "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-timeOrMarker">timeOrMarker</a></span> ))? <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
+<td><code class="content">"used" "(" <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-aIdentifier">aIdentifier</a></span> "," (( "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-eIdentifierOrMarker">eIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-timeOrMarker">timeOrMarker</a></span> ))? <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
</tr>
</tbody>
--- a/model/grammar/ll.js Thu May 24 15:33:58 2012 +0100
+++ b/model/grammar/ll.js Thu May 24 15:42:41 2012 +0100
@@ -107,7 +107,7 @@
'<td><a id="prod-usageExpression" name="prod-usageExpression"></a>[<span class="prodNo">12</span>] </td> ' +
'<td><code class="production prod">usageExpression</code></td> ' +
'<td> ::= </td> ' +
-'<td><code class="content">"used" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></span> ( "," <span class="prod"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></span> )? <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> ' +
+'<td><code class="content">"used" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></span> "," ( "," <span class="prod"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></span> )? <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> ' +
'</tr> ' +
'</tbody> ' +
' ' +
--- a/model/grammar/yack/prov-n-LL.bnf Thu May 24 15:33:58 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf Thu May 24 15:42:41 2012 +0100
@@ -36,7 +36,7 @@
[11] identifierOrMarker::=(identifier | "-")
-[12] usageExpression::= "used" "(" optionalIdentifier aIdentifier "," eIdentifier ("," timeOrMarker)? optionalAttributeValuePairs ")"
+[12] usageExpression::= "used" "(" optionalIdentifier aIdentifier "," ("," eIdentifierOrMarker "," timeOrMarker)? optionalAttributeValuePairs ")"
[13] startExpression::= "wasStartedBy" "(" optionalIdentifier aIdentifier ("," eIdentifierOrMarker "," aIdentifierOrMarker "," timeOrMarker)? optionalAttributeValuePairs ")"
--- a/model/grammar/yack/prov-n-LL.bnf.html Thu May 24 15:33:58 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf.html Thu May 24 15:42:41 2012 +0100
@@ -105,7 +105,7 @@
<td><a id="prod-prov_n_LL-usageExpression" name="prod-prov_n_LL-usageExpression"></a>[<span class="prodNo">12</span>] </td>
<td><code class="production prod">usageExpression</code></td>
<td> ::= </td>
-<td><code class="content">"used" "(" <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-aIdentifier">aIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-eIdentifier">eIdentifier</a></span> (( "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-timeOrMarker">timeOrMarker</a></span> ))? <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
+<td><code class="content">"used" "(" <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-aIdentifier">aIdentifier</a></span> "," (( "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-eIdentifierOrMarker">eIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-timeOrMarker">timeOrMarker</a></span> ))? <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
</tr>
</tbody>
--- a/model/prov-dm.html Thu May 24 15:33:58 2012 +0100
+++ b/model/prov-dm.html Thu May 24 15:42:41 2012 +0100
@@ -1405,7 +1405,7 @@
<ul>
<li><span class='attribute' id="usage.id">id</span>: an OPTIONAL identifier for a usage;</li>
<li><span class='attribute' id="usage.activity">activity</span>: an identifier (<span class="name">a</span>) for the consuming activity;</li>
-<li><span class='attribute' id="usage.entity">entity</span>: an identifier (<span class="name">e</span>) for the consumed entity;</li>
+<li><span class='attribute' id="usage.entity">entity</span>: an OPTIONAL identifier (<span class="name">e</span>) for the consumed entity;</li>
<li><span class='attribute' id="usage.time">time</span>: an OPTIONAL "usage time" (<span class="name">t</span>), the time at which the entity started to be used;</li>
<li><span class='attribute' id="usage.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this usage.</li>
</ul></div>