Update production names to be consistant
authorGavin Carothers <gavin@carothers.name>
Wed, 02 May 2012 06:46:29 -0700
changeset 304 5d5514de1998
parent 296 02eeef5cb8e6
child 305 30aac7b208b6
Update production names to be consistant
rdf-turtle/n-prime-bnf.html
rdf-turtle/n-prime.bnf
--- a/rdf-turtle/n-prime-bnf.html	Tue May 01 16:21:36 2012 -0700
+++ b/rdf-turtle/n-prime-bnf.html	Wed May 02 06:46:29 2012 -0700
@@ -6,15 +6,15 @@
     <td>::=</td>
     <td>(<a href='#grammar-production-triple'>triple</a>)? (<a href='#grammar-production-EOL'>EOL</a> <a href='#grammar-production-triple'>triple</a>)<code class='grammar-star'>*</code> (<a href='#grammar-production-EOL'>EOL</a>)?</td>
 </tr>
-            <tr id="grammar-production-triple" data-grammar-original="[2]  triple             ::= subj pred obj &#x27;.&#x27;" data-grammar-expression="(&#x27;,&#x27;, [(&#x27;id&#x27;, &#x27;subj&#x27;), (&#x27;id&#x27;, &#x27;pred&#x27;), (&#x27;id&#x27;, &#x27;obj&#x27;), (&quot;&#x27;&quot;, &#x27;.&#x27;)])" >
+            <tr id="grammar-production-triple" data-grammar-original="[2]  triple             ::= subject predicate object &#x27;.&#x27;" data-grammar-expression="(&#x27;,&#x27;, [(&#x27;id&#x27;, &#x27;subject&#x27;), (&#x27;id&#x27;, &#x27;predicate&#x27;), (&#x27;id&#x27;, &#x27;object&#x27;), (&quot;&#x27;&quot;, &#x27;.&#x27;)])" >
     <td>[2]<td>
     <td><code>triple</code><td>
     <td>::=</td>
-    <td><a href='#grammar-production-subj'>subj</a> <a href='#grammar-production-pred'>pred</a> <a href='#grammar-production-obj'>obj</a> '<code class='grammar-literal'>.</code>'</td>
+    <td><a href='#grammar-production-subject'>subject</a> <a href='#grammar-production-predicate'>predicate</a> <a href='#grammar-production-object'>object</a> '<code class='grammar-literal'>.</code>'</td>
 </tr>
-            <tr id="grammar-production-subjects" data-grammar-original="[3]  subjects           ::= IRIREF | BLANK_NODE_LABEL" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;IRIREF&#x27;), (&#x27;id&#x27;, &#x27;BLANK_NODE_LABEL&#x27;)])" >
+            <tr id="grammar-production-subject" data-grammar-original="[3]  subject           ::= IRIREF | BLANK_NODE_LABEL" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;IRIREF&#x27;), (&#x27;id&#x27;, &#x27;BLANK_NODE_LABEL&#x27;)])" >
     <td>[3]<td>
-    <td><code>subjects</code><td>
+    <td><code>subject</code><td>
     <td>::=</td>
     <td>(<a href='#grammar-production-IRIREF'>IRIREF</a> <code>|</code> <a href='#grammar-production-BLANK_NODE_LABEL'>BLANK_NODE_LABEL</a>)</td>
 </tr>
@@ -24,11 +24,11 @@
     <td>::=</td>
     <td><a href='#grammar-production-IRIREF'>IRIREF</a></td>
 </tr>
-            <tr id="grammar-production-object" data-grammar-original="[5]  object             ::= IRIREF | BLANK_NODE_LABEL | lit" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;IRIREF&#x27;), (&#x27;id&#x27;, &#x27;BLANK_NODE_LABEL&#x27;), (&#x27;id&#x27;, &#x27;lit&#x27;)])" >
+            <tr id="grammar-production-object" data-grammar-original="[5]  object             ::= IRIREF | BLANK_NODE_LABEL | literal" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;IRIREF&#x27;), (&#x27;id&#x27;, &#x27;BLANK_NODE_LABEL&#x27;), (&#x27;id&#x27;, &#x27;literal&#x27;)])" >
     <td>[5]<td>
     <td><code>object</code><td>
     <td>::=</td>
-    <td>(<a href='#grammar-production-IRIREF'>IRIREF</a> <code>|</code> <a href='#grammar-production-BLANK_NODE_LABEL'>BLANK_NODE_LABEL</a> <code>|</code> <a href='#grammar-production-lit'>lit</a>)</td>
+    <td>(<a href='#grammar-production-IRIREF'>IRIREF</a> <code>|</code> <a href='#grammar-production-BLANK_NODE_LABEL'>BLANK_NODE_LABEL</a> <code>|</code> <a href='#grammar-production-literal'>literal</a>)</td>
 </tr>
             <tr id="grammar-production-literal" data-grammar-original="[6]  literal            ::= STRING_LITERAL2 (&#x27;^^&#x27; IRIREF | (&#x27;@&#x27; LANG) )?" data-grammar-expression="(&#x27;,&#x27;, [(&#x27;id&#x27;, &#x27;STRING_LITERAL2&#x27;), (&#x27;?&#x27;, (&#x27;|&#x27;, [(&#x27;,&#x27;, [(&quot;&#x27;&quot;, &#x27;^^&#x27;), (&#x27;id&#x27;, &#x27;IRIREF&#x27;)]), (&#x27;,&#x27;, [(&quot;&#x27;&quot;, &#x27;@&#x27;), (&#x27;id&#x27;, &#x27;LANG&#x27;)])]))])" >
     <td>[6]<td>
--- a/rdf-turtle/n-prime.bnf	Tue May 01 16:21:36 2012 -0700
+++ b/rdf-turtle/n-prime.bnf	Wed May 02 06:46:29 2012 -0700
@@ -1,8 +1,8 @@
 [1]  ntriplesDoc        ::= triple? (EOL triple)* EOL?
-[2]  triple             ::= subj pred obj '.'
-[3]  subjects           ::= IRIREF | BLANK_NODE_LABEL
+[2]  triple             ::= subject predicate object '.'
+[3]  subject           ::= IRIREF | BLANK_NODE_LABEL
 [4]  predicate          ::= IRIREF 
-[5]  object             ::= IRIREF | BLANK_NODE_LABEL | lit
+[5]  object             ::= IRIREF | BLANK_NODE_LABEL | literal
 [6]  literal            ::= STRING_LITERAL2 ('^^' IRIREF | ('@' LANG) )?
 
 @terminals