lib/rdf/turtle/reader.rb in rdf-turtle-0.3.1 vs lib/rdf/turtle/reader.rb in rdf-turtle-0.3.2

@@ -270,11 +270,11 @@
           add_statement(loc, RDF::Statement.from(data))
         when :trace
           debug(loc, *(data.dup << {:level => 0}))
         end
       end
-    rescue RDF::LL1::Parser::Error => e
+    rescue ArgumentError, RDF::LL1::Parser::Error => e
       progress("Parsing completed with errors:\n\t#{e.message}")
       raise RDF::ReaderError, e.message if validate?
     end
     
     ##
@@ -296,15 +296,12 @@
     # @param [Nokogiri::XML::Node, any] node XML Node or string for showing context
     # @param [RDF::Statement] statement the subject of the statement
     # @return [RDF::Statement] Added statement
     # @raise [RDF::ReaderError] Checks parameter types and raises if they are incorrect if parsing mode is _validate_.
     def add_statement(node, statement)
-      if statement.valid?
-        progress(node) {"generate statement: #{statement}"}
-        @callback.call(statement)
-      else
-        error(node, "Statement is invalid: #{statement.inspect}")
-      end
+      error(node, "Statement is invalid: #{statement.inspect}") unless statement.valid?
+      progress(node) {"generate statement: #{statement}"}
+      @callback.call(statement)
     end
 
     def process_iri(iri)
       iri(base_uri, iri)
     end