Update N-Triples/N-Quads production names for quoted triples.

Author: gkellogg

etc/n-triples-star.ebnf

@@ -1,7 +1,7 @@
-[1] ntriplesDoc ::= triple? (EOL triple)* EOL?
-[2] triple      ::= subject predicate object '.'
-[3] subject     ::= IRIREF | BLANK_NODE_LABEL | embTriple
-[4] predicate   ::= IRIREF
-[5] object      ::= IRIREF | BLANK_NODE_LABEL | literal | embTriple
-[6] literal     ::= STRING_LITERAL_QUOTE ('^^' IRIREF | LANGTAG)?
-[7] embTriple   ::= '<<' subject predicate object '>>'
+[1] ntriplesDoc   ::= triple? (EOL triple)* EOL?
+[2] triple        ::= subject predicate object '.'
+[3] subject       ::= IRIREF | BLANK_NODE_LABEL | quotedTriple
+[4] predicate     ::= IRIREF
+[5] object        ::= IRIREF | BLANK_NODE_LABEL | literal | quotedTriple
+[6] literal       ::= STRING_LITERAL_QUOTE ('^^' IRIREF | LANGTAG)?
+[7] quotedTriple  ::= '<<' subject predicate object '>>'

lib/rdf/nquads.rb

@@ -69,9 +69,9 @@ def read_triple
 
           begin
             unless blank? || read_comment
-              subject   = read_uriref || read_node || read_embTriple || fail_subject
+              subject   = read_uriref || read_node || read_quotedTriple || fail_subject
               predicate = read_uriref(intern: true) || fail_predicate
-              object    = read_uriref || read_node || read_literal || read_embTriple || fail_object
+              object    = read_uriref || read_node || read_literal || read_quotedTriple || fail_object
               graph_name    = read_uriref || read_node
               if validate? && !read_eos
                 log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)

lib/rdf/ntriples/reader.rb

@@ -213,7 +213,7 @@ def read_value
       begin
         read_statement
       rescue RDF::ReaderError
-        value = read_uriref || read_node || read_literal || read_embTriple
+        value = read_uriref || read_node || read_literal || read_quotedTriple
         log_recover
         value
       end
@@ -229,9 +229,9 @@ def read_triple
 
         begin
           unless blank? || read_comment
-            subject   = read_uriref || read_node || read_embTriple || fail_subject
+            subject   = read_uriref || read_node || read_quotedTriple || fail_subject
             predicate = read_uriref(intern: true) || fail_predicate
-            object    = read_uriref || read_node || read_literal || read_embTriple || fail_object
+            object    = read_uriref || read_node || read_literal || read_quotedTriple || fail_object
 
             if validate? && !read_eos
               log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
@@ -247,11 +247,11 @@ def read_triple
 
     ##
     # @return [RDF::Statement]
-    def read_embTriple
+    def read_quotedTriple
       if @options[:rdfstar] && match(ST_START)
-        subject   = read_uriref || read_node || read_embTriple || fail_subject
+        subject   = read_uriref || read_node || read_quotedTriple || fail_subject
         predicate = read_uriref(intern: true) || fail_predicate
-        object    = read_uriref || read_node || read_literal || read_embTriple || fail_object
+        object    = read_uriref || read_node || read_literal || read_quotedTriple || fail_object
         if !match(ST_END)
           log_error("Expected end of statement (found: #{current_line.inspect})", lineno: lineno, exception: RDF::ReaderError)
         end

lib/rdf/ntriples/writer.rb

@@ -227,7 +227,7 @@ def format_statement(statement, **options)
     # @param  [RDF::Statement] statement
     # @param  [Hash{Symbol => Object}] options ({})
     # @return [String]
-    def format_embTriple(statement, **options)
+    def format_quotedTriple(statement, **options)
       "<<%s %s %s>>" % statement.to_a.map { |value| format_term(value, **options) }
     end
     ##

lib/rdf/writer.rb

@@ -516,7 +516,7 @@ def format_term(term, **options)
         when RDF::Literal   then format_literal(term, **options)
         when RDF::URI       then format_uri(term, **options)
         when RDF::Node      then format_node(term, **options)
-        when RDF::Statement then format_embTriple(term, **options)
+        when RDF::Statement then format_quotedTriple(term, **options)
         else nil
       end
     end
@@ -574,7 +574,7 @@ def format_list(value, **options)
     # @return [String]
     # @raise  [NotImplementedError] unless implemented in subclass
     # @abstract
-    def format_embTriple(value, **options)
+    def format_quotedTriple(value, **options)
       raise NotImplementedError.new("#{self.class}#format_statement") # override in subclasses
     end