--- a/model/grammar/ll.html Tue May 15 12:27:30 2012 +0100
+++ b/model/grammar/ll.html Tue May 15 12:54:15 2012 +0100
@@ -439,19 +439,17 @@
<td><a id="prod-prov_n_LL-literal" name="prod-prov_n_LL-literal"></a>[<span class="prodNo">49</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-StringLiteral">StringLiteral</a></span> "%%" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-datatype">datatype</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-StringLiteral">StringLiteral</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-INTLITERAL">INTLITERAL</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALNAME_LITERAL">QUALNAME_LITERAL</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-typedLiteral">typedLiteral</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-convenienceNotation">convenienceNotation</a></span></code></td>
</tr>
</tbody>
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-StringLiteral" name="prod-prov_n_LL-StringLiteral"></a>[<span class="prodNo">50</span>] </td>
-<td><code class="production prod">StringLiteral</code></td>
+<td><a id="prod-prov_n_LL-typedLiteral" name="prod-prov_n_LL-typedLiteral"></a>[<span class="prodNo">50</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></code></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>
</tr>
</tbody>
@@ -460,14 +458,24 @@
<td><a id="prod-prov_n_LL-datatype" name="prod-prov_n_LL-datatype"></a>[<span class="prodNo">51</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-IRI_REF">IRI_REF</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALNAME">QUALNAME</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALNAME">QUALNAME</a></span></code></td>
</tr>
</tbody>
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-namespaceDeclarations" name="prod-prov_n_LL-namespaceDeclarations"></a>[<span class="prodNo">52</span>] </td>
+<td><a id="prod-prov_n_LL-convenienceNotation" name="prod-prov_n_LL-convenienceNotation"></a>[<span class="prodNo">52</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/>
+| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-INT_LITERAL">INT_LITERAL</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALNAME_LITERAL">QUALNAME_LITERAL</a></span></code></td>
+</tr>
+</tbody>
+
+<tbody class="prod">
+<tr valign="baseline">
+<td><a id="prod-prov_n_LL-namespaceDeclarations" name="prod-prov_n_LL-namespaceDeclarations"></a>[<span class="prodNo">53</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>
@@ -476,7 +484,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">53</span>] </td>
+<td><a id="prod-prov_n_LL-namespaceDeclaration" name="prod-prov_n_LL-namespaceDeclaration"></a>[<span class="prodNo">54</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-QUALNAME">QUALNAME</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespace">namespace</a></span></code></td>
@@ -485,7 +493,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">54</span>] </td>
+<td><a id="prod-prov_n_LL-defaultNamespaceDeclaration" name="prod-prov_n_LL-defaultNamespaceDeclaration"></a>[<span class="prodNo">55</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>
@@ -494,7 +502,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">55</span>] </td>
+<td><a id="prod-prov_n_LL-namespace" name="prod-prov_n_LL-namespace"></a>[<span class="prodNo">56</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>
@@ -503,7 +511,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALNAME" name="term-prov_n_LL-QUALNAME"></a>[<span class="prodNo">56</span>] </td>
+<td><a id="term-prov_n_LL-QUALNAME" name="term-prov_n_LL-QUALNAME"></a>[<span class="prodNo">57</span>] </td>
<td><<code class="production term">QUALNAME</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/>
@@ -513,7 +521,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">57</span>] </td>
+<td><a id="term-prov_n_LL-PREFX" name="term-prov_n_LL-PREFX"></a>[<span class="prodNo">58</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>
@@ -522,7 +530,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">58</span>] </td>
+<td><a id="term-prov_n_LL-DIGIT" name="term-prov_n_LL-DIGIT"></a>[<span class="prodNo">59</span>] </td>
<td><<code class="production term">DIGIT</code>></td>
<td> ::= </td>
<td><code class="content">[0-9]</code></td>
@@ -531,7 +539,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">59</span>] </td>
+<td><a id="term-prov_n_LL-ISODATETIME" name="term-prov_n_LL-ISODATETIME"></a>[<span class="prodNo">60</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>
@@ -540,7 +548,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">60</span>] </td>
+<td><a id="term-prov_n_LL-TIMEZONEOFFSET" name="term-prov_n_LL-TIMEZONEOFFSET"></a>[<span class="prodNo">61</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>
@@ -549,7 +557,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">61</span>] </td>
+<td><a id="term-prov_n_LL-IRI_REF" name="term-prov_n_LL-IRI_REF"></a>[<span class="prodNo">62</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>
@@ -558,15 +566,6 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-INTLITERAL" name="term-prov_n_LL-INTLITERAL"></a>[<span class="prodNo">62</span>] </td>
-<td><<code class="production term">INTLITERAL</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>
-</tr>
-</tbody>
-
-<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">63</span>] </td>
<td><<code class="production term">STRING_LITERAL</code>></td>
<td> ::= </td>
@@ -576,7 +575,16 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALNAME_LITERAL" name="term-prov_n_LL-QUALNAME_LITERAL"></a>[<span class="prodNo">64</span>] </td>
+<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">64</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>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-QUALNAME_LITERAL" name="term-prov_n_LL-QUALNAME_LITERAL"></a>[<span class="prodNo">65</span>] </td>
<td><<code class="production term">QUALNAME_LITERAL</code>></td>
<td> ::= </td>
<td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALNAME">QUALNAME</a></span> "'"</code></td>
@@ -585,7 +593,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">65</span>] </td>
+<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">66</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/>
@@ -595,7 +603,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">66</span>] </td>
+<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">67</span>] </td>
<td><<code class="production term">ECHAR</code>></td>
<td> ::= </td>
<td><code class="content">"\\" [tbnrf\\\"']</code></td>
@@ -604,7 +612,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">67</span>] </td>
+<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">68</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>
@@ -613,7 +621,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">68</span>] </td>
+<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">69</span>] </td>
<td><<code class="production term">WS</code>></td>
<td> ::= </td>
<td><code class="content">" "<br/>
@@ -625,7 +633,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">69</span>] </td>
+<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">70</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>
@@ -634,7 +642,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">70</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_BASE" name="term-prov_n_LL-PN_CHARS_BASE"></a>[<span class="prodNo">71</span>] </td>
<td><<code class="production term">PN_CHARS_BASE</code>></td>
<td> ::= </td>
<td><code class="content">[A-Z]<br/>
@@ -656,7 +664,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">71</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_U" name="term-prov_n_LL-PN_CHARS_U"></a>[<span class="prodNo">72</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/>
@@ -666,7 +674,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">72</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">73</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/>
@@ -680,7 +688,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">73</span>] </td>
+<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">74</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>
@@ -689,7 +697,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">74</span>] </td>
+<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">75</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>
@@ -698,7 +706,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">75</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_OTHERS" name="term-prov_n_LL-PN_CHARS_OTHERS"></a>[<span class="prodNo">76</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/>
@@ -715,7 +723,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">76</span>] </td>
+<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">77</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>
@@ -724,7 +732,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">77</span>] </td>
+<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">78</span>] </td>
<td><<code class="production term">HEX</code>></td>
<td> ::= </td>
<td><code class="content">[0-9]<br/>
@@ -735,7 +743,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">78</span>] </td>
+<td><a id="term-prov_n_LL-PASSED_TOKENS" name="term-prov_n_LL-PASSED_TOKENS"></a>[<span class="prodNo">79</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 Tue May 15 12:27:30 2012 +0100
+++ b/model/grammar/ll.js Tue May 15 12:54:15 2012 +0100
@@ -440,19 +440,17 @@
'<td><a id="prod-literal" name="prod-literal"></a>[<span class="prodNo">49</span>] </td> ' +
'<td><code class="production prod">literal</code></td> ' +
'<td> ::= </td> ' +
-'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-StringLiteral">StringLiteral</a></span> "%%" <span class="prod"><a class="grammarRef" href="#prod-datatype">datatype</a></span><br/> ' +
-'| <span class="prod"><a class="grammarRef" href="#prod-StringLiteral">StringLiteral</a></span><br/> ' +
-'| <span class="prod"><a class="grammarRef" href="#prod-INTLITERAL">INTLITERAL</a></span><br/> ' +
-'| <span class="prod"><a class="grammarRef" href="#prod-QUALNAME_LITERAL">QUALNAME_LITERAL</a></span></code></td> ' +
+'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-typedLiteral">typedLiteral</a></span><br/> ' +
+'| <span class="prod"><a class="grammarRef" href="#prod-convenienceNotation">convenienceNotation</a></span></code></td> ' +
'</tr> ' +
'</tbody> ' +
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-StringLiteral" name="prod-StringLiteral"></a>[<span class="prodNo">50</span>] </td> ' +
-'<td><code class="production prod">StringLiteral</code></td> ' +
+'<td><a id="prod-typedLiteral" name="prod-typedLiteral"></a>[<span class="prodNo">50</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></code></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> ' +
'</tr> ' +
'</tbody> ' +
' ' +
@@ -461,14 +459,24 @@
'<td><a id="prod-datatype" name="prod-datatype"></a>[<span class="prodNo">51</span>] </td> ' +
'<td><code class="production prod">datatype</code></td> ' +
'<td> ::= </td> ' +
-'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-IRI_REF">IRI_REF</a></span><br/> ' +
-'| <span class="prod"><a class="grammarRef" href="#prod-QUALNAME">QUALNAME</a></span></code></td> ' +
+'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALNAME">QUALNAME</a></span></code></td> ' +
'</tr> ' +
'</tbody> ' +
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-namespaceDeclarations" name="prod-namespaceDeclarations"></a>[<span class="prodNo">52</span>] </td> ' +
+'<td><a id="prod-convenienceNotation" name="prod-convenienceNotation"></a>[<span class="prodNo">52</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/> ' +
+'| <span class="prod"><a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a></span><br/> ' +
+'| <span class="prod"><a class="grammarRef" href="#prod-QUALNAME_LITERAL">QUALNAME_LITERAL</a></span></code></td> ' +
+'</tr> ' +
+'</tbody> ' +
+' ' +
+'<tbody class="prod"> ' +
+'<tr valign="baseline"> ' +
+'<td><a id="prod-namespaceDeclarations" name="prod-namespaceDeclarations"></a>[<span class="prodNo">53</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> ' +
@@ -477,7 +485,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></a>[<span class="prodNo">53</span>] </td> ' +
+'<td><a id="prod-namespaceDeclaration" name="prod-namespaceDeclaration"></a>[<span class="prodNo">54</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-QUALNAME">QUALNAME</a></span> <span class="prod"><a class="grammarRef" href="#prod-namespace">namespace</a></span></code></td> ' +
@@ -486,7 +494,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-defaultNamespaceDeclaration" name="prod-defaultNamespaceDeclaration"></a>[<span class="prodNo">54</span>] </td> ' +
+'<td><a id="prod-defaultNamespaceDeclaration" name="prod-defaultNamespaceDeclaration"></a>[<span class="prodNo">55</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-IRI_REF">IRI_REF</a></span></code></td> ' +
@@ -495,7 +503,7 @@
' ' +
'<tbody class="prod"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-namespace" name="prod-namespace"></a>[<span class="prodNo">55</span>] </td> ' +
+'<td><a id="prod-namespace" name="prod-namespace"></a>[<span class="prodNo">56</span>] </td> ' +
'<td><code class="production prod">namespace</code></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-IRI_REF">IRI_REF</a></span></code></td> ' +
@@ -504,7 +512,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-QUALNAME" name="prod-QUALNAME"></a>[<span class="prodNo">56</span>] </td> ' +
+'<td><a id="prod-QUALNAME" name="prod-QUALNAME"></a>[<span class="prodNo">57</span>] </td> ' +
'<td><<code class="production term">QUALNAME</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX">PN_PREFIX</a></span> ":" )? <span class="prod"><a class="grammarRef" href="#prod-PN_LOCAL">PN_LOCAL</a></span><br/> ' +
@@ -514,7 +522,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PREFX" name="prod-PREFX"></a>[<span class="prodNo">57</span>] </td> ' +
+'<td><a id="prod-PREFX" name="prod-PREFX"></a>[<span class="prodNo">58</span>] </td> ' +
'<td><<code class="production term">PREFX</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-PN_PREFIX">PN_PREFIX</a></span></code></td> ' +
@@ -523,7 +531,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-DIGIT" name="prod-DIGIT"></a>[<span class="prodNo">58</span>] </td> ' +
+'<td><a id="prod-DIGIT" name="prod-DIGIT"></a>[<span class="prodNo">59</span>] </td> ' +
'<td><<code class="production term">DIGIT</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">[0-9]</code></td> ' +
@@ -532,7 +540,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-ISODATETIME" name="prod-ISODATETIME"></a>[<span class="prodNo">59</span>] </td> ' +
+'<td><a id="prod-ISODATETIME" name="prod-ISODATETIME"></a>[<span class="prodNo">60</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> ' +
@@ -541,7 +549,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></a>[<span class="prodNo">60</span>] </td> ' +
+'<td><a id="prod-TIMEZONEOFFSET" name="prod-TIMEZONEOFFSET"></a>[<span class="prodNo">61</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> ' +
@@ -550,7 +558,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-IRI_REF" name="prod-IRI_REF"></a>[<span class="prodNo">61</span>] </td> ' +
+'<td><a id="prod-IRI_REF" name="prod-IRI_REF"></a>[<span class="prodNo">62</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> ' +
@@ -559,15 +567,6 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-INTLITERAL" name="prod-INTLITERAL"></a>[<span class="prodNo">62</span>] </td> ' +
-'<td><<code class="production term">INTLITERAL</code>></td> ' +
-'<td> ::= </td> ' +
-'<td><code class="content">("-")? (<span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span>)+</code></td> ' +
-'</tr> ' +
-'</tbody> ' +
-' ' +
-'<tbody class="term"> ' +
-'<tr valign="baseline"> ' +
'<td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a>[<span class="prodNo">63</span>] </td> ' +
'<td><<code class="production term">STRING_LITERAL</code>></td> ' +
'<td> ::= </td> ' +
@@ -577,7 +576,16 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-QUALNAME_LITERAL" name="prod-QUALNAME_LITERAL"></a>[<span class="prodNo">64</span>] </td> ' +
+'<td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a>[<span class="prodNo">64</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> ' +
+'</tr> ' +
+'</tbody> ' +
+' ' +
+'<tbody class="term"> ' +
+'<tr valign="baseline"> ' +
+'<td><a id="prod-QUALNAME_LITERAL" name="prod-QUALNAME_LITERAL"></a>[<span class="prodNo">65</span>] </td> ' +
'<td><<code class="production term">QUALNAME_LITERAL</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"\'" <span class="prod"><a class="grammarRef" href="#prod-QUALNAME">QUALNAME</a></span> "\'"</code></td> ' +
@@ -586,7 +594,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-UCHAR" name="prod-UCHAR"></a>[<span class="prodNo">65</span>] </td> ' +
+'<td><a id="prod-UCHAR" name="prod-UCHAR"></a>[<span class="prodNo">66</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/> ' +
@@ -596,7 +604,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-ECHAR" name="prod-ECHAR"></a>[<span class="prodNo">66</span>] </td> ' +
+'<td><a id="prod-ECHAR" name="prod-ECHAR"></a>[<span class="prodNo">67</span>] </td> ' +
'<td><<code class="production term">ECHAR</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"\\" [tbnrf\\\"\']</code></td> ' +
@@ -605,7 +613,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-NIL" name="prod-NIL"></a>[<span class="prodNo">67</span>] </td> ' +
+'<td><a id="prod-NIL" name="prod-NIL"></a>[<span class="prodNo">68</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> ' +
@@ -614,7 +622,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-WS" name="prod-WS"></a>[<span class="prodNo">68</span>] </td> ' +
+'<td><a id="prod-WS" name="prod-WS"></a>[<span class="prodNo">69</span>] </td> ' +
'<td><<code class="production term">WS</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">" "<br/> ' +
@@ -626,7 +634,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-ANON" name="prod-ANON"></a>[<span class="prodNo">69</span>] </td> ' +
+'<td><a id="prod-ANON" name="prod-ANON"></a>[<span class="prodNo">70</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> ' +
@@ -635,7 +643,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS_BASE" name="prod-PN_CHARS_BASE"></a>[<span class="prodNo">70</span>] </td> ' +
+'<td><a id="prod-PN_CHARS_BASE" name="prod-PN_CHARS_BASE"></a>[<span class="prodNo">71</span>] </td> ' +
'<td><<code class="production term">PN_CHARS_BASE</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">[A-Z]<br/> ' +
@@ -657,7 +665,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS_U" name="prod-PN_CHARS_U"></a>[<span class="prodNo">71</span>] </td> ' +
+'<td><a id="prod-PN_CHARS_U" name="prod-PN_CHARS_U"></a>[<span class="prodNo">72</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/> ' +
@@ -667,7 +675,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS" name="prod-PN_CHARS"></a>[<span class="prodNo">72</span>] </td> ' +
+'<td><a id="prod-PN_CHARS" name="prod-PN_CHARS"></a>[<span class="prodNo">73</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-PN_CHARS_U">PN_CHARS_U</a></span><br/> ' +
@@ -681,7 +689,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_PREFIX" name="prod-PN_PREFIX"></a>[<span class="prodNo">73</span>] </td> ' +
+'<td><a id="prod-PN_PREFIX" name="prod-PN_PREFIX"></a>[<span class="prodNo">74</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="#prod-PN_CHARS">PN_CHARS</a></span> | "." )* <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS">PN_CHARS</a></span> )?</code></td> ' +
@@ -690,7 +698,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a>[<span class="prodNo">74</span>] </td> ' +
+'<td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a>[<span class="prodNo">75</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-PN_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="#prod-PN_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="#prod-PN_CHARS">PN_CHARS</a></span> | <span class="prod"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></span> ) )?</code></td> ' +
@@ -699,7 +707,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a>[<span class="prodNo">75</span>] </td> ' +
+'<td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a>[<span class="prodNo">76</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/> ' +
@@ -716,7 +724,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PERCENT" name="prod-PERCENT"></a>[<span class="prodNo">76</span>] </td> ' +
+'<td><a id="prod-PERCENT" name="prod-PERCENT"></a>[<span class="prodNo">77</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> ' +
@@ -725,7 +733,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-HEX" name="prod-HEX"></a>[<span class="prodNo">77</span>] </td> ' +
+'<td><a id="prod-HEX" name="prod-HEX"></a>[<span class="prodNo">78</span>] </td> ' +
'<td><<code class="production term">HEX</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">[0-9]<br/> ' +
@@ -736,7 +744,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PASSED_TOKENS" name="prod-PASSED_TOKENS"></a>[<span class="prodNo">78</span>] </td> ' +
+'<td><a id="prod-PASSED_TOKENS" name="prod-PASSED_TOKENS"></a>[<span class="prodNo">79</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 Tue May 15 12:27:30 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf Tue May 15 12:54:15 2012 +0100
@@ -141,11 +141,16 @@
-[13] literal ::= StringLiteral "%%" datatype | StringLiteral | INTLITERAL | QUALNAME_LITERAL
+[13] literal ::= typedLiteral | convenienceNotation
+typedLiteral ::= STRING_LITERAL "%%" datatype
+datatype::= QUALNAME
-[66s] StringLiteral ::= STRING_LITERAL
-datatype::= IRI_REF | QUALNAME
+convenienceNotation ::= STRING_LITERAL | INT_LITERAL | QUALNAME_LITERAL
+
+
+
+
@@ -174,11 +179,11 @@
[70s] IRI_REF ::= "<" ( [^<>\"{}|^`\\] - [#x00-#x20] | UCHAR )* ">"
-INTLITERAL::= '-'? DIGIT+
+[149s] STRING_LITERAL ::= '"' ( ( [^#x22#x5C#xA#xD]) | ECHAR | UCHAR )* '"'
-
-
-[149s] STRING_LITERAL ::= '"' ( ( [^#x22#x5C#xA#xD]) | ECHAR | UCHAR )* '"'
+INT_LITERAL::= '-'? DIGIT+
+
+
[149s] QUALNAME_LITERAL ::= '\'' QUALNAME '\''
--- a/model/grammar/yack/prov-n-LL.bnf.html Tue May 15 12:27:30 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf.html Tue May 15 12:54:15 2012 +0100
@@ -438,19 +438,17 @@
<td><a id="prod-prov_n_LL-literal" name="prod-prov_n_LL-literal"></a>[<span class="prodNo">49</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-StringLiteral">StringLiteral</a></span> "%%" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-datatype">datatype</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-StringLiteral">StringLiteral</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-INTLITERAL">INTLITERAL</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALNAME_LITERAL">QUALNAME_LITERAL</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-typedLiteral">typedLiteral</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-convenienceNotation">convenienceNotation</a></span></code></td>
</tr>
</tbody>
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-StringLiteral" name="prod-prov_n_LL-StringLiteral"></a>[<span class="prodNo">50</span>] </td>
-<td><code class="production prod">StringLiteral</code></td>
+<td><a id="prod-prov_n_LL-typedLiteral" name="prod-prov_n_LL-typedLiteral"></a>[<span class="prodNo">50</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></code></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>
</tr>
</tbody>
@@ -459,14 +457,24 @@
<td><a id="prod-prov_n_LL-datatype" name="prod-prov_n_LL-datatype"></a>[<span class="prodNo">51</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-IRI_REF">IRI_REF</a></span><br/>
-| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALNAME">QUALNAME</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALNAME">QUALNAME</a></span></code></td>
</tr>
</tbody>
<tbody class="prod">
<tr valign="baseline">
-<td><a id="prod-prov_n_LL-namespaceDeclarations" name="prod-prov_n_LL-namespaceDeclarations"></a>[<span class="prodNo">52</span>] </td>
+<td><a id="prod-prov_n_LL-convenienceNotation" name="prod-prov_n_LL-convenienceNotation"></a>[<span class="prodNo">52</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/>
+| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-INT_LITERAL">INT_LITERAL</a></span><br/>
+| <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALNAME_LITERAL">QUALNAME_LITERAL</a></span></code></td>
+</tr>
+</tbody>
+
+<tbody class="prod">
+<tr valign="baseline">
+<td><a id="prod-prov_n_LL-namespaceDeclarations" name="prod-prov_n_LL-namespaceDeclarations"></a>[<span class="prodNo">53</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>
@@ -475,7 +483,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">53</span>] </td>
+<td><a id="prod-prov_n_LL-namespaceDeclaration" name="prod-prov_n_LL-namespaceDeclaration"></a>[<span class="prodNo">54</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-QUALNAME">QUALNAME</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-namespace">namespace</a></span></code></td>
@@ -484,7 +492,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">54</span>] </td>
+<td><a id="prod-prov_n_LL-defaultNamespaceDeclaration" name="prod-prov_n_LL-defaultNamespaceDeclaration"></a>[<span class="prodNo">55</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>
@@ -493,7 +501,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">55</span>] </td>
+<td><a id="prod-prov_n_LL-namespace" name="prod-prov_n_LL-namespace"></a>[<span class="prodNo">56</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>
@@ -502,7 +510,7 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALNAME" name="term-prov_n_LL-QUALNAME"></a>[<span class="prodNo">56</span>] </td>
+<td><a id="term-prov_n_LL-QUALNAME" name="term-prov_n_LL-QUALNAME"></a>[<span class="prodNo">57</span>] </td>
<td><<code class="production term">QUALNAME</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/>
@@ -512,7 +520,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">57</span>] </td>
+<td><a id="term-prov_n_LL-PREFX" name="term-prov_n_LL-PREFX"></a>[<span class="prodNo">58</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>
@@ -521,7 +529,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">58</span>] </td>
+<td><a id="term-prov_n_LL-DIGIT" name="term-prov_n_LL-DIGIT"></a>[<span class="prodNo">59</span>] </td>
<td><<code class="production term">DIGIT</code>></td>
<td> ::= </td>
<td><code class="content">[0-9]</code></td>
@@ -530,7 +538,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">59</span>] </td>
+<td><a id="term-prov_n_LL-ISODATETIME" name="term-prov_n_LL-ISODATETIME"></a>[<span class="prodNo">60</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>
@@ -539,7 +547,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">60</span>] </td>
+<td><a id="term-prov_n_LL-TIMEZONEOFFSET" name="term-prov_n_LL-TIMEZONEOFFSET"></a>[<span class="prodNo">61</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>
@@ -548,7 +556,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">61</span>] </td>
+<td><a id="term-prov_n_LL-IRI_REF" name="term-prov_n_LL-IRI_REF"></a>[<span class="prodNo">62</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>
@@ -557,15 +565,6 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-INTLITERAL" name="term-prov_n_LL-INTLITERAL"></a>[<span class="prodNo">62</span>] </td>
-<td><<code class="production term">INTLITERAL</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>
-</tr>
-</tbody>
-
-<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">63</span>] </td>
<td><<code class="production term">STRING_LITERAL</code>></td>
<td> ::= </td>
@@ -575,7 +574,16 @@
<tbody class="term">
<tr valign="baseline">
-<td><a id="term-prov_n_LL-QUALNAME_LITERAL" name="term-prov_n_LL-QUALNAME_LITERAL"></a>[<span class="prodNo">64</span>] </td>
+<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">64</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>
+</tr>
+</tbody>
+
+<tbody class="term">
+<tr valign="baseline">
+<td><a id="term-prov_n_LL-QUALNAME_LITERAL" name="term-prov_n_LL-QUALNAME_LITERAL"></a>[<span class="prodNo">65</span>] </td>
<td><<code class="production term">QUALNAME_LITERAL</code>></td>
<td> ::= </td>
<td><code class="content">"'" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALNAME">QUALNAME</a></span> "'"</code></td>
@@ -584,7 +592,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">65</span>] </td>
+<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">66</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/>
@@ -594,7 +602,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">66</span>] </td>
+<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">67</span>] </td>
<td><<code class="production term">ECHAR</code>></td>
<td> ::= </td>
<td><code class="content">"\\" [tbnrf\\\"']</code></td>
@@ -603,7 +611,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">67</span>] </td>
+<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">68</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>
@@ -612,7 +620,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">68</span>] </td>
+<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">69</span>] </td>
<td><<code class="production term">WS</code>></td>
<td> ::= </td>
<td><code class="content">" "<br/>
@@ -624,7 +632,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">69</span>] </td>
+<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">70</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>
@@ -633,7 +641,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">70</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_BASE" name="term-prov_n_LL-PN_CHARS_BASE"></a>[<span class="prodNo">71</span>] </td>
<td><<code class="production term">PN_CHARS_BASE</code>></td>
<td> ::= </td>
<td><code class="content">[A-Z]<br/>
@@ -655,7 +663,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">71</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_U" name="term-prov_n_LL-PN_CHARS_U"></a>[<span class="prodNo">72</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/>
@@ -665,7 +673,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">72</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">73</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/>
@@ -679,7 +687,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">73</span>] </td>
+<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">74</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>
@@ -688,7 +696,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">74</span>] </td>
+<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">75</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>
@@ -697,7 +705,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">75</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS_OTHERS" name="term-prov_n_LL-PN_CHARS_OTHERS"></a>[<span class="prodNo">76</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/>
@@ -714,7 +722,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">76</span>] </td>
+<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">77</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>
@@ -723,7 +731,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">77</span>] </td>
+<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">78</span>] </td>
<td><<code class="production term">HEX</code>></td>
<td> ::= </td>
<td><code class="content">[0-9]<br/>
@@ -734,7 +742,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">78</span>] </td>
+<td><a id="term-prov_n_LL-PASSED_TOKENS" name="term-prov_n_LL-PASSED_TOKENS"></a>[<span class="prodNo">79</span>] </td>
<td><code class="production directive">PASSED TOKENS</code></td>
<td> ::= </td>
<td><code class="content">([ \t\r\n])+<br/>
--- a/model/prov-n.html Tue May 15 12:27:30 2012 +0100
+++ b/model/prov-n.html Tue May 15 12:54:15 2012 +0100
@@ -1890,12 +1890,12 @@
<div class="anexample" id="anexample-namespace">
<p>The following example declares three namespaces, one default, and two with explicit prefixes <span class="name">ex1</span> and <span class="name">ex2</span>.</p>
<pre class="codeexample">
-container
+bundle
default <http://example.org/0/>
prefix ex1 <http://example.org/1/>
prefix ex2 <http://example.org/2/>
...
-end
+endBundle
</pre>
</div>
@@ -2041,7 +2041,7 @@
<div class="anexample" id="anexample-qualified-name">
<p>Examples of articles on the BBC Web site seen as entities.</p>
<pre class="codeexample">
-container
+bundle
prefix bbc <http://www.bbc.co.uk/>
prefix bbcNews <http://www.bbc.co.uk/news/>
@@ -2051,7 +2051,7 @@
entity(bbcNews:) // an alternative way of referring to the bbc news site
-end
+endBundle
</pre>
</div>
@@ -2059,7 +2059,7 @@
<div class="anexample" id="anexample-qualified-name2">
<p>Examples of entities with declared and default namespace.</p>
<pre class="codeexample">
-container
+bundle
default <http://example.org/2/>
prefix ex <http://example.org/1/>
@@ -2069,7 +2069,7 @@
entity(b) // corresponds to IRI http://example.org/2/b
entity(ex:1234) // corresponds to IRI http://example.org/2/1234
entity(4567) // corresponds to IRI http://example.org/2/4567
-end
+endBundle
</pre>
</div>
@@ -2126,19 +2126,27 @@
<table class="grammar">
<tbody class="grammar-ref" data-ref="prod-literal"></tbody>
-<tbody class="grammar-ref" data-ref="prod-StringLiteral"></tbody>
-
-<tbody class="grammar-ref" data-ref="prod-INTLITERAL"></tbody>
+<tbody class="grammar-ref" data-ref="prod-typedLiteral"></tbody>
+<tbody class="grammar-ref" data-ref="prod-datatype"></tbody>
+<tbody><tr valign="baseline"><td></td><td><em>where <a class="grammarRef" href="#prod-QUALNAME">QUALNAME</a> is listed in Table <a href="#permitted-datatypes">permitted-datatypes</a></em></td></tbody>
+<tbody class="grammar-ref" data-ref="prod-convenienceNotation"></tbody>
<tbody class="grammar-ref" data-ref="prod-STRING_LITERAL"></tbody>
+<tbody class="grammar-ref" data-ref="prod-INT_LITERAL"></tbody>
<tbody class="grammar-ref" data-ref="prod-QUALNAME_LITERAL"></tbody>
</table>
-<p>The non terminals <span class="nonterminal">stringLiteral</span> and
-<span class="nonterminal">intLiteral</span>
-are syntactic sugar for quoted strings with datatype <a href="http://www.w3.org/TR/xmlschema-2/#string"><span class="name">xsd:string</span></a> and <a href="http://www.w3.org/TR/xmlschema-2/#int"><span class="name">xsd:int</span></a>, respectively.
+<p>The non terminals
+<a class="grammarRef" href="#prod-STRING_LITERAL">STRING_LITERAL</a>,
+<a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a>, and
+<a class="grammarRef" href="#prod-QUALNAME_LITERAL">QUALNAME_LITERAL</a>
+are syntactic sugar for quoted strings with datatype
+<a href="http://www.w3.org/TR/xmlschema-2/#string"><span class="name">xsd:string</span></a>,
+<a href="http://www.w3.org/TR/xmlschema-2/#int"><span class="name">xsd:int</span></a>, and
+<a class="grammarRef" href="#prod-QUALNAME">prov:QUALNAME</a>
+respectively.
</p>
<p> In particular, a Literal may be an IRI-typed string (with datatype <span class="name">xsd:anyURI</span>); such IRI has no specific interpretation in the context of PROV.</p>
@@ -2161,21 +2169,12 @@
<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedByte">xsd:unsignedByte</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#anyURI">xsd:QName</a></td><td></td></tr>
</table>
-<p><b>Note:</b>The productions for <span class="nonterminal">qualifiedName</span> and <span class="nonterminal">intLiteral</span> are conflicting. In the context of a <span class="nonterminal">Literal</span>, a parser should give precedence to the production for <span class="nonterminal">intLiteral</span>.
+<p><b>Note:</b>The productions for <a class="grammarRef" href="#prod-QUALNAME">prov:QUALNAME</a> and
+<a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a> are conflicting. In the context of a
+<a class="grammarRef" href="#prod-literal">literal</a>, a parser should give precedence to the production for
+<a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a>.
</p>
-<div class="note">
-Wouldn't it be useful to introduce a literal for a qualified name?
-Currenlty, we have to write:
-<pre>
-prov:type="ex:Programmer" %% xsd:QName
-</pre>
-to indicate that ex:Programmer should be interpreted as qualified name (QName).
-Instead, we could have a notation such as
-<pre>
-prov:type='ex:Programmer'
-</pre>
-
</div>