--- a/rdf-turtle/turtle-bnf.html Sat Jun 16 09:41:01 2012 -0700
+++ b/rdf-turtle/turtle-bnf.html Sat Jun 16 09:45:46 2012 -0700
@@ -66,11 +66,11 @@
<td>::=</td>
<td><a href='#grammar-production-iri'>iri</a></td>
</tr>
- <tr id="grammar-production-object" data-grammar-original="[12] object ::= iri| blank| predicateObjectList| literal" data-grammar-expression="('|', [('id', 'iri'), ('id', 'blank'), ('id', 'predicateObjectList'), ('id', 'literal')])" >
+ <tr id="grammar-production-object" data-grammar-original="[12] object ::= iri| blank| blankNodePropertyList| literal" data-grammar-expression="('|', [('id', 'iri'), ('id', 'blank'), ('id', 'blankNodePropertyList'), ('id', 'literal')])" >
<td>[12]<td>
<td><code>object</code><td>
<td>::=</td>
- <td><a href='#grammar-production-iri'>iri</a> <code>| </code> <a href='#grammar-production-blank'>blank</a> <code>| </code> <a href='#grammar-production-predicateObjectList'>predicateObjectList</a> <code>| </code> <a href='#grammar-production-literal'>literal</a></td>
+ <td><a href='#grammar-production-iri'>iri</a> <code>| </code> <a href='#grammar-production-blank'>blank</a> <code>| </code> <a href='#grammar-production-blankNodePropertyList'>blankNodePropertyList</a> <code>| </code> <a href='#grammar-production-literal'>literal</a></td>
</tr>
<tr id="grammar-production-literal" data-grammar-original="[13] literal ::= RDFLiteral| NumericLiteral| BooleanLiteral" data-grammar-expression="('|', [('id', 'RDFLiteral'), ('id', 'NumericLiteral'), ('id', 'BooleanLiteral')])" >
<td>[13]<td>
@@ -114,11 +114,11 @@
<td>::=</td>
<td>'<code class='grammar-literal'>true</code>' <code>| </code> '<code class='grammar-literal'>false</code>'</td>
</tr>
- <tr id="grammar-production-String" data-grammar-original="[134s] String ::= STRING_LITERAL1| STRING_LITERAL2| STRING_LITERAL_LONG1| STRING_LITERAL_LONG2" data-grammar-expression="('|', [('id', 'STRING_LITERAL1'), ('id', 'STRING_LITERAL2'), ('id', 'STRING_LITERAL_LONG1'), ('id', 'STRING_LITERAL_LONG2')])" >
- <td>[134s]<td>
+ <tr id="grammar-production-String" data-grammar-original="[18] String ::= STRING_LITERAL_QUOTE| STRING_LITERAL_SINGLE_QUOTE| STRING_LITERAL_LONG_SINGLE_QUOTE| STRING_LITERAL_LONG_QUOTE" data-grammar-expression="('|', [('id', 'STRING_LITERAL_QUOTE'), ('id', 'STRING_LITERAL_SINGLE_QUOTE'), ('id', 'STRING_LITERAL_LONG_SINGLE_QUOTE'), ('id', 'STRING_LITERAL_LONG_QUOTE')])" >
+ <td>[18]<td>
<td><code>String</code><td>
<td>::=</td>
- <td><a href='#grammar-production-STRING_LITERAL1'>STRING_LITERAL1</a> <code>| </code> <a href='#grammar-production-STRING_LITERAL2'>STRING_LITERAL2</a> <code>| </code> <a href='#grammar-production-STRING_LITERAL_LONG1'>STRING_LITERAL_LONG1</a> <code>| </code> <a href='#grammar-production-STRING_LITERAL_LONG2'>STRING_LITERAL_LONG2</a></td>
+ <td><a href='#grammar-production-STRING_LITERAL_QUOTE'>STRING_LITERAL_QUOTE</a> <code>| </code> <a href='#grammar-production-STRING_LITERAL_SINGLE_QUOTE'>STRING_LITERAL_SINGLE_QUOTE</a> <code>| </code> <a href='#grammar-production-STRING_LITERAL_LONG_SINGLE_QUOTE'>STRING_LITERAL_LONG_SINGLE_QUOTE</a> <code>| </code> <a href='#grammar-production-STRING_LITERAL_LONG_QUOTE'>STRING_LITERAL_LONG_QUOTE</a></td>
</tr>
<tr id="grammar-production-iri" data-grammar-original="[135s] iri ::= IRIREF| PrefixedName" data-grammar-expression="('|', [('id', 'IRIREF'), ('id', 'PrefixedName')])" >
<td>[135s]<td>
@@ -140,8 +140,8 @@
</tr>
</tbody>
<tbody class="grammar-terminals">
- <tr id="grammar-production-IRIREF" data-grammar-original="[138s] IRIREF ::= '<' ([^#x00-#x20<>\"{}|^`\] | UCHAR)* '>'" data-grammar-expression="(',', [("'", '<'), ('*', ('|', [('[', '^#x00-#x20<>\\"{}|^`\\'), ('id', 'UCHAR')])), ("'", '>')])" class='grammar-token'>
- <td>[138s]<td>
+ <tr id="grammar-production-IRIREF" data-grammar-original="[19] IRIREF ::= '<' ([^#x00-#x20<>\"{}|^`\] | UCHAR)* '>'" data-grammar-expression="(',', [("'", '<'), ('*', ('|', [('[', '^#x00-#x20<>\\"{}|^`\\'), ('id', 'UCHAR')])), ("'", '>')])" class='grammar-token'>
+ <td>[19]<td>
<td><code>IRIREF</code><td>
<td>::=</td>
<td>'<code class='grammar-literal'><</code>' ([<code class='grammar-chars'>^#x00-#x20<>\"{}|^`\</code>] <code>| </code> <a href='#grammar-production-UCHAR'>UCHAR</a>)<code class='grammar-star'>*</code> '<code class='grammar-literal'>></code>'</td>
@@ -194,27 +194,27 @@
<td>::=</td>
<td>[<code class='grammar-chars'>eE</code>] [<code class='grammar-chars'>+-</code>]? [<code class='grammar-chars'>0-9</code>]<code class='grammar-plus'>+</code></td>
</tr>
- <tr id="grammar-production-STRING_LITERAL1" data-grammar-original="[23] STRING_LITERAL1 ::= '"' ( [^#x22#x5C#xA#xD] | ECHAR | UCHAR )* '"'" data-grammar-expression="(',', [("'", '"'), ('*', ('|', [('[', '^#x22#x5C#xA#xD'), ('id', 'ECHAR'), ('id', 'UCHAR')])), ("'", '"')])" class='grammar-token'>
+ <tr id="grammar-production-STRING_LITERAL_QUOTE" data-grammar-original="[23] STRING_LITERAL_QUOTE ::= '"' ( [^#x22#x5C#xA#xD] | ECHAR | UCHAR )* '"'" data-grammar-expression="(',', [("'", '"'), ('*', ('|', [('[', '^#x22#x5C#xA#xD'), ('id', 'ECHAR'), ('id', 'UCHAR')])), ("'", '"')])" class='grammar-token'>
<td>[23]<td>
- <td><code>STRING_LITERAL1</code><td>
+ <td><code>STRING_LITERAL_QUOTE</code><td>
<td>::=</td>
<td>'<code class='grammar-literal'>"</code>' ([<code class='grammar-chars'>^#x22#x5C#xA#xD</code>] <code>| </code> <a href='#grammar-production-ECHAR'>ECHAR</a> <code>| </code> <a href='#grammar-production-UCHAR'>UCHAR</a>)<code class='grammar-star'>*</code> '<code class='grammar-literal'>"</code>'</td>
</tr>
- <tr id="grammar-production-STRING_LITERAL2" data-grammar-original="[24] STRING_LITERAL2 ::= "'" ( [^#x27#x5C#xA#xD] | ECHAR | UCHAR )* "'"" data-grammar-expression="(',', [("'", "'"), ('*', ('|', [('[', '^#x27#x5C#xA#xD'), ('id', 'ECHAR'), ('id', 'UCHAR')])), ("'", "'")])" class='grammar-token'>
+ <tr id="grammar-production-STRING_LITERAL_SINGLE_QUOTE" data-grammar-original="[24] STRING_LITERAL_SINGLE_QUOTE ::= "'" ( [^#x27#x5C#xA#xD] | ECHAR | UCHAR )* "'"" data-grammar-expression="(',', [("'", "'"), ('*', ('|', [('[', '^#x27#x5C#xA#xD'), ('id', 'ECHAR'), ('id', 'UCHAR')])), ("'", "'")])" class='grammar-token'>
<td>[24]<td>
- <td><code>STRING_LITERAL2</code><td>
+ <td><code>STRING_LITERAL_SINGLE_QUOTE</code><td>
<td>::=</td>
<td>"<code class="grammar-literal">'</code>" ([<code class='grammar-chars'>^#x27#x5C#xA#xD</code>] <code>| </code> <a href='#grammar-production-ECHAR'>ECHAR</a> <code>| </code> <a href='#grammar-production-UCHAR'>UCHAR</a>)<code class='grammar-star'>*</code> "<code class="grammar-literal">'</code>"</td>
</tr>
- <tr id="grammar-production-STRING_LITERAL_LONG1" data-grammar-original="[25] STRING_LITERAL_LONG1 ::= "'''" ( ( "'" | "''" )? ( [^'\] | ECHAR | UCHAR ) )* "'''"" data-grammar-expression="(',', [("'", "'''"), ('*', (',', [('?', ('|', [("'", "'"), ("'", "''")])), ('|', [('[', "^'\\"), ('id', 'ECHAR'), ('id', 'UCHAR')])])), ("'", "'''")])" class='grammar-token'>
+ <tr id="grammar-production-STRING_LITERAL_LONG_SINGLE_QUOTE" data-grammar-original="[25] STRING_LITERAL_LONG_SINGLE_QUOTE ::= "'''" ( ( "'" | "''" )? ( [^'\] | ECHAR | UCHAR ) )* "'''"" data-grammar-expression="(',', [("'", "'''"), ('*', (',', [('?', ('|', [("'", "'"), ("'", "''")])), ('|', [('[', "^'\\"), ('id', 'ECHAR'), ('id', 'UCHAR')])])), ("'", "'''")])" class='grammar-token'>
<td>[25]<td>
- <td><code>STRING_LITERAL_LONG1</code><td>
+ <td><code>STRING_LITERAL_LONG_SINGLE_QUOTE</code><td>
<td>::=</td>
<td>"<code class="grammar-literal">'''</code>" (("<code class="grammar-literal">'</code>" <code>| </code> "<code class="grammar-literal">''</code>")? [<code class='grammar-chars'>^'\</code>] <code>| </code> <a href='#grammar-production-ECHAR'>ECHAR</a> <code>| </code> <a href='#grammar-production-UCHAR'>UCHAR</a>)<code class='grammar-star'>*</code> "<code class="grammar-literal">'''</code>"</td>
</tr>
- <tr id="grammar-production-STRING_LITERAL_LONG2" data-grammar-original="[26] STRING_LITERAL_LONG2 ::= '"""' ( ( '"' | '""' )? ( [^"\] | ECHAR | UCHAR ) )* '"""'" data-grammar-expression="(',', [("'", '"""'), ('*', (',', [('?', ('|', [("'", '"'), ("'", '""')])), ('|', [('[', '^"\\'), ('id', 'ECHAR'), ('id', 'UCHAR')])])), ("'", '"""')])" class='grammar-token'>
+ <tr id="grammar-production-STRING_LITERAL_LONG_QUOTE" data-grammar-original="[26] STRING_LITERAL_LONG_QUOTE ::= '"""' ( ( '"' | '""' )? ( [^"\] | ECHAR | UCHAR ) )* '"""'" data-grammar-expression="(',', [("'", '"""'), ('*', (',', [('?', ('|', [("'", '"'), ("'", '""')])), ('|', [('[', '^"\\'), ('id', 'ECHAR'), ('id', 'UCHAR')])])), ("'", '"""')])" class='grammar-token'>
<td>[26]<td>
- <td><code>STRING_LITERAL_LONG2</code><td>
+ <td><code>STRING_LITERAL_LONG_QUOTE</code><td>
<td>::=</td>
<td>'<code class='grammar-literal'>"""</code>' (('<code class='grammar-literal'>"</code>' <code>| </code> '<code class='grammar-literal'>""</code>')? [<code class='grammar-chars'>^"\</code>] <code>| </code> <a href='#grammar-production-ECHAR'>ECHAR</a> <code>| </code> <a href='#grammar-production-UCHAR'>UCHAR</a>)<code class='grammar-star'>*</code> '<code class='grammar-literal'>"""</code>'</td>
</tr>