--- a/model/grammar/Makefile Thu Jun 14 11:00:20 2012 +0100
+++ b/model/grammar/Makefile Thu Jun 14 11:18:36 2012 +0100
@@ -34,7 +34,7 @@
do.ll.js: ll.provn do.ll.html
@echo "grammar_string= " > $(OUT.JS)
- @cat $(IN.HTML) | sed -e "s/\d039/\\\'/g" | sed -e "s/prod-prov_n_LL/prod/g" | sed -e "s/term-prov_n_LL/prod/g" | sed -e "s/((/(/g" | sed -e "s/))/)/g" | sed -e "s/timeZZ/time/g" | sed -e "s/\d035prod-PN_PREFIX/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_LOCAL/g" | sed -e "s/\d035prod-PN_CHARS_U/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_CHARS_U/g" | sed -e "s/\d035prod-ECHAR/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rECHAR/g" | sed -e "s/\d035prod-UCHAR/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rUCHAR/g" | sed -e "s/\d035prod-PN_CHARS\"/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_CHARS\"/g" > $(IN2.HTML)
+ @cat $(IN.HTML) | sed -e "s/\d039/\\\'/g" | sed -e "s/prod-prov_n_LL/prod/g" | sed -e "s/term-prov_n_LL/prod/g" | sed -e "s/((/(/g" | sed -e "s/))/)/g" | sed -e "s/timeZZ/time/g" | sed -e "s/\d035prod-PN_PREFIX/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_LOCAL/g" | sed -e "s/\d035prod-PN_CHARS_U/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_CHARS_U/g" | sed -e "s/\d035prod-ECHAR/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rECHAR/g" | sed -e "s/\d035prod-STRING_LITERAL2/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rSTRING_LITERAL2/g" | sed -e "s/\d035prod-PN_CHARS\"/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_CHARS\"/g" > $(IN2.HTML)
@cat $(IN2.HTML) | awk '{ print "'\''" $$0 " '\'' + " }' >> $(OUT.JS)
@echo "' ' ;" >> $(OUT.JS)
--- a/model/grammar/ll.html Thu Jun 14 11:00:20 2012 +0100
+++ b/model/grammar/ll.html Thu Jun 14 11:18:36 2012 +0100
@@ -579,13 +579,22 @@
<td><a id="term-prov_n_LL-STRING_LITERAL" name="term-prov_n_LL-STRING_LITERAL"></a>[<span class="prodNo">64</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>
+</tr>
+</tbody>
+
+<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><<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>
</tr>
</tbody>
<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">65</span>] </td>
+<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">66</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>
@@ -594,7 +603,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">66</span>] </td>
+<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><<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>
@@ -603,7 +612,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">67</span>] </td>
+<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">68</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/>
@@ -613,7 +622,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">68</span>] </td>
+<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">69</span>] </td>
<td><<code class="production term">ECHAR</code>></td>
<td> ::= </td>
<td><code class="content">"\\" [tbnrf\\\"']</code></td>
@@ -622,7 +631,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">69</span>] </td>
+<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">70</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>
@@ -631,7 +640,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">70</span>] </td>
+<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">71</span>] </td>
<td><<code class="production term">WS</code>></td>
<td> ::= </td>
<td><code class="content">" "<br/>
@@ -643,7 +652,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">71</span>] </td>
+<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">72</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>
@@ -652,7 +661,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">72</span>] </td>
+<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><<code class="production term">PN_CHARS_BASE</code>></td>
<td> ::= </td>
<td><code class="content">[A-Z]<br/>
@@ -674,7 +683,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">73</span>] </td>
+<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><<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/>
@@ -684,7 +693,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">74</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">75</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/>
@@ -698,7 +707,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">75</span>] </td>
+<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">76</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>
@@ -707,7 +716,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">76</span>] </td>
+<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">77</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>
@@ -716,7 +725,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">77</span>] </td>
+<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><<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/>
@@ -733,7 +742,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">78</span>] </td>
+<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">79</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>
@@ -742,7 +751,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">79</span>] </td>
+<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">80</span>] </td>
<td><<code class="production term">HEX</code>></td>
<td> ::= </td>
<td><code class="content">[0-9]<br/>
@@ -753,7 +762,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">80</span>] </td>
+<td><a id="term-prov_n_LL-PASSED_TOKENS" name="term-prov_n_LL-PASSED_TOKENS"></a>[<span class="prodNo">81</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 14 11:00:20 2012 +0100
+++ b/model/grammar/ll.js Thu Jun 14 11:18:36 2012 +0100
@@ -571,7 +571,7 @@
'<td><a id="prod-IRI_REF" name="prod-IRI_REF"></a>[<span class="prodNo">63</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="http://www.w3.org/TR/rdf-sparql-query/#rUCHAR">UCHAR</a></span> )* ">"</code></td> ' +
+'<td><code class="content">"<" ( [^<>\"{}|^`\\] - [#0000- ] | <span class="prod"><a class="grammarRef" href="#prod-UCHAR">UCHAR</a></span> )* ">"</code></td> ' +
'</tr> ' +
'</tbody> ' +
' ' +
@@ -580,13 +580,22 @@
'<td><a id="prod-STRING_LITERAL" name="prod-STRING_LITERAL"></a>[<span class="prodNo">64</span>] </td> ' +
'<td><<code class="production term">STRING_LITERAL</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="http://www.w3.org/TR/rdf-sparql-query/#rUCHAR">UCHAR</a></span> )* \'"\'</code></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> ' +
'</tr> ' +
'</tbody> ' +
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a>[<span class="prodNo">65</span>] </td> ' +
+'<td><a id="prod-STRING_LITERAL2" name="prod-STRING_LITERAL2"></a>[<span class="prodNo">65</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> ' +
+'</tr> ' +
+'</tbody> ' +
+' ' +
+'<tbody class="term"> ' +
+'<tr valign="baseline"> ' +
+'<td><a id="prod-INT_LITERAL" name="prod-INT_LITERAL"></a>[<span class="prodNo">66</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> ' +
@@ -595,7 +604,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-QUALIFIED_NAME_LITERAL" name="prod-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">66</span>] </td> ' +
+'<td><a id="prod-QUALIFIED_NAME_LITERAL" name="prod-QUALIFIED_NAME_LITERAL"></a>[<span class="prodNo">67</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> ' +
@@ -604,7 +613,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-UCHAR" name="prod-UCHAR"></a>[<span class="prodNo">67</span>] </td> ' +
+'<td><a id="prod-UCHAR" name="prod-UCHAR"></a>[<span class="prodNo">68</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/> ' +
@@ -614,7 +623,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-ECHAR" name="prod-ECHAR"></a>[<span class="prodNo">68</span>] </td> ' +
+'<td><a id="prod-ECHAR" name="prod-ECHAR"></a>[<span class="prodNo">69</span>] </td> ' +
'<td><<code class="production term">ECHAR</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">"\\" [tbnrf\\\"\']</code></td> ' +
@@ -623,7 +632,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-NIL" name="prod-NIL"></a>[<span class="prodNo">69</span>] </td> ' +
+'<td><a id="prod-NIL" name="prod-NIL"></a>[<span class="prodNo">70</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> ' +
@@ -632,7 +641,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-WS" name="prod-WS"></a>[<span class="prodNo">70</span>] </td> ' +
+'<td><a id="prod-WS" name="prod-WS"></a>[<span class="prodNo">71</span>] </td> ' +
'<td><<code class="production term">WS</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">" "<br/> ' +
@@ -644,7 +653,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-ANON" name="prod-ANON"></a>[<span class="prodNo">71</span>] </td> ' +
+'<td><a id="prod-ANON" name="prod-ANON"></a>[<span class="prodNo">72</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> ' +
@@ -653,7 +662,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS_BASE" name="prod-PN_CHARS_BASE"></a>[<span class="prodNo">72</span>] </td> ' +
+'<td><a id="prod-PN_CHARS_BASE" name="prod-PN_CHARS_BASE"></a>[<span class="prodNo">73</span>] </td> ' +
'<td><<code class="production term">PN_CHARS_BASE</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">[A-Z]<br/> ' +
@@ -675,7 +684,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS_U" name="prod-PN_CHARS_U"></a>[<span class="prodNo">73</span>] </td> ' +
+'<td><a id="prod-PN_CHARS_U" name="prod-PN_CHARS_U"></a>[<span class="prodNo">74</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/> ' +
@@ -685,7 +694,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS" name="prod-PN_CHARS"></a>[<span class="prodNo">74</span>] </td> ' +
+'<td><a id="prod-PN_CHARS" name="prod-PN_CHARS"></a>[<span class="prodNo">75</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/> ' +
@@ -699,7 +708,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_PREFIX" name="prod-PN_PREFIX"></a>[<span class="prodNo">75</span>] </td> ' +
+'<td><a id="prod-PN_PREFIX" name="prod-PN_PREFIX"></a>[<span class="prodNo">76</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> ' +
@@ -708,7 +717,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a>[<span class="prodNo">76</span>] </td> ' +
+'<td><a id="prod-PN_LOCAL" name="prod-PN_LOCAL"></a>[<span class="prodNo">77</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> ' +
@@ -717,7 +726,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a>[<span class="prodNo">77</span>] </td> ' +
+'<td><a id="prod-PN_CHARS_OTHERS" name="prod-PN_CHARS_OTHERS"></a>[<span class="prodNo">78</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/> ' +
@@ -734,7 +743,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PERCENT" name="prod-PERCENT"></a>[<span class="prodNo">78</span>] </td> ' +
+'<td><a id="prod-PERCENT" name="prod-PERCENT"></a>[<span class="prodNo">79</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> ' +
@@ -743,7 +752,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-HEX" name="prod-HEX"></a>[<span class="prodNo">79</span>] </td> ' +
+'<td><a id="prod-HEX" name="prod-HEX"></a>[<span class="prodNo">80</span>] </td> ' +
'<td><<code class="production term">HEX</code>></td> ' +
'<td> ::= </td> ' +
'<td><code class="content">[0-9]<br/> ' +
@@ -754,7 +763,7 @@
' ' +
'<tbody class="term"> ' +
'<tr valign="baseline"> ' +
-'<td><a id="prod-PASSED_TOKENS" name="prod-PASSED_TOKENS"></a>[<span class="prodNo">80</span>] </td> ' +
+'<td><a id="prod-PASSED_TOKENS" name="prod-PASSED_TOKENS"></a>[<span class="prodNo">81</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 14 11:00:20 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf Thu Jun 14 11:18:36 2012 +0100
@@ -177,8 +177,8 @@
[70s] IRI_REF ::= "<" ( [^<>\"{}|^`\\] - [#x00-#x20] | UCHAR )* ">"
-
-[149s] STRING_LITERAL ::= '"' ( ( [^#x22#x5C#xA#xD]) | ECHAR | UCHAR )* '"'
+[149s] STRING_LITERAL ::= STRING_LITERAL2
+[149s] STRING_LITERAL2 ::= '"' ( ( [^#x22#x5C#xA#xD]) | ECHAR | UCHAR )* '"'
INT_LITERAL::= '-'? DIGIT+
--- a/model/grammar/yack/prov-n-LL.bnf.html Thu Jun 14 11:00:20 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf.html Thu Jun 14 11:18:36 2012 +0100
@@ -578,13 +578,22 @@
<td><a id="term-prov_n_LL-STRING_LITERAL" name="term-prov_n_LL-STRING_LITERAL"></a>[<span class="prodNo">64</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>
+</tr>
+</tbody>
+
+<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><<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>
</tr>
</tbody>
<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">65</span>] </td>
+<td><a id="term-prov_n_LL-INT_LITERAL" name="term-prov_n_LL-INT_LITERAL"></a>[<span class="prodNo">66</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>
@@ -593,7 +602,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">66</span>] </td>
+<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><<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>
@@ -602,7 +611,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">67</span>] </td>
+<td><a id="term-prov_n_LL-UCHAR" name="term-prov_n_LL-UCHAR"></a>[<span class="prodNo">68</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/>
@@ -612,7 +621,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">68</span>] </td>
+<td><a id="term-prov_n_LL-ECHAR" name="term-prov_n_LL-ECHAR"></a>[<span class="prodNo">69</span>] </td>
<td><<code class="production term">ECHAR</code>></td>
<td> ::= </td>
<td><code class="content">"\\" [tbnrf\\\"']</code></td>
@@ -621,7 +630,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">69</span>] </td>
+<td><a id="term-prov_n_LL-NIL" name="term-prov_n_LL-NIL"></a>[<span class="prodNo">70</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>
@@ -630,7 +639,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">70</span>] </td>
+<td><a id="term-prov_n_LL-WS" name="term-prov_n_LL-WS"></a>[<span class="prodNo">71</span>] </td>
<td><<code class="production term">WS</code>></td>
<td> ::= </td>
<td><code class="content">" "<br/>
@@ -642,7 +651,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">71</span>] </td>
+<td><a id="term-prov_n_LL-ANON" name="term-prov_n_LL-ANON"></a>[<span class="prodNo">72</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>
@@ -651,7 +660,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">72</span>] </td>
+<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><<code class="production term">PN_CHARS_BASE</code>></td>
<td> ::= </td>
<td><code class="content">[A-Z]<br/>
@@ -673,7 +682,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">73</span>] </td>
+<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><<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/>
@@ -683,7 +692,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">74</span>] </td>
+<td><a id="term-prov_n_LL-PN_CHARS" name="term-prov_n_LL-PN_CHARS"></a>[<span class="prodNo">75</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/>
@@ -697,7 +706,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">75</span>] </td>
+<td><a id="term-prov_n_LL-PN_PREFIX" name="term-prov_n_LL-PN_PREFIX"></a>[<span class="prodNo">76</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>
@@ -706,7 +715,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">76</span>] </td>
+<td><a id="term-prov_n_LL-PN_LOCAL" name="term-prov_n_LL-PN_LOCAL"></a>[<span class="prodNo">77</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>
@@ -715,7 +724,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">77</span>] </td>
+<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><<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/>
@@ -732,7 +741,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">78</span>] </td>
+<td><a id="term-prov_n_LL-PERCENT" name="term-prov_n_LL-PERCENT"></a>[<span class="prodNo">79</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>
@@ -741,7 +750,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">79</span>] </td>
+<td><a id="term-prov_n_LL-HEX" name="term-prov_n_LL-HEX"></a>[<span class="prodNo">80</span>] </td>
<td><<code class="production term">HEX</code>></td>
<td> ::= </td>
<td><code class="content">[0-9]<br/>
@@ -752,7 +761,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">80</span>] </td>
+<td><a id="term-prov_n_LL-PASSED_TOKENS" name="term-prov_n_LL-PASSED_TOKENS"></a>[<span class="prodNo">81</span>] </td>
<td><code class="production directive">PASSED TOKENS</code></td>
<td> ::= </td>
<td><code class="content">([ \t\r\n])+<br/>