Update DECIMAL and DOUBLE terminals.

Author: gkellogg

lib/rdf/turtle/reader.rb

@@ -619,16 +619,17 @@ def read_annotation(subject, predicate, object)
 
     # @return [RDF::Literal]
     def read_literal
-      error("Unexpected end of file", production: :literal) unless token = @lexer.first
+      token = @lexer.first
+      error("Unexpected end of file", production: :literal) unless token
       case token.type || token.value
-      when :INTEGER then prod(:literal) {literal(@lexer.shift.value, datatype:  RDF::XSD.integer)}
+      when :DOUBLE then prod(:literal) {literal(@lexer.shift.value.sub(/\.([eE])/, '.0\1'), datatype:  RDF::XSD.double)}
       when :DECIMAL
         prod(:literal) do
           value = @lexer.shift.value
           value = "0#{value}" if value.start_with?(".")
           literal(value, datatype:  RDF::XSD.decimal)
         end
-      when :DOUBLE then prod(:literal) {literal(@lexer.shift.value.sub(/\.([eE])/, '.0\1'), datatype:  RDF::XSD.double)}
+      when :INTEGER then prod(:literal) {literal(@lexer.shift.value, datatype:  RDF::XSD.integer)}
       when "true", "false" then prod(:literal) {literal(@lexer.shift.value, datatype: RDF::XSD.boolean)}
       when :STRING_LITERAL_QUOTE, :STRING_LITERAL_SINGLE_QUOTE
         prod(:literal) do

lib/rdf/turtle/terminals.rb

@@ -21,21 +21,21 @@ module Terminals
     PLX                  = /#{PERCENT}|#{PN_LOCAL_ESC}/u.freeze
     PN_CHARS_BASE        = /[A-Z]|[a-z]|#{U_CHARS1}/u.freeze
     PN_CHARS_U           = /_|#{PN_CHARS_BASE}/u.freeze
-    PN_CHARS             = /-|[0-9]|#{PN_CHARS_U}|#{U_CHARS2}/u.freeze
+    PN_CHARS             = /-|\d|#{PN_CHARS_U}|#{U_CHARS2}/u.freeze
     PN_LOCAL_BODY        = /(?:(?:\.|:|#{PN_CHARS}|#{PLX})*(?:#{PN_CHARS}|:|#{PLX}))?/u.freeze
     PN_CHARS_BODY        = /(?:(?:\.|#{PN_CHARS})*#{PN_CHARS})?/u.freeze
     PN_PREFIX            = /#{PN_CHARS_BASE}#{PN_CHARS_BODY}/u.freeze
-    PN_LOCAL             = /(?:[0-9]|:|#{PN_CHARS_U}|#{PLX})#{PN_LOCAL_BODY}/u.freeze
-    EXPONENT             = /[eE][+-]?[0-9]+/u.freeze
+    PN_LOCAL             = /(?:\d|:|#{PN_CHARS_U}|#{PLX})#{PN_LOCAL_BODY}/u.freeze
+    EXPONENT             = /[eE][+-]?\d+/u.freeze
     ECHAR                = /\\[tbnrf\\"']/u.freeze
     IRIREF               = /<(?:#{IRI_RANGE}|#{UCHAR})*>/u.freeze
     PNAME_NS             = /#{PN_PREFIX}?:/u.freeze
     PNAME_LN             = /#{PNAME_NS}#{PN_LOCAL}/u.freeze
-    BLANK_NODE_LABEL     = /_:(?:[0-9]|#{PN_CHARS_U})(?:(?:#{PN_CHARS}|\.)*#{PN_CHARS})?/u.freeze
+    BLANK_NODE_LABEL     = /_:(?:\d|#{PN_CHARS_U})(?:(?:#{PN_CHARS}|\.)*#{PN_CHARS})?/u.freeze
     LANG_DIR              = /@([a-zA-Z]+(?:-[a-zA-Z0-9]+)*(?:--[a-zA-Z]+)?)/u.freeze
-    INTEGER              = /[+-]?[0-9]+/u.freeze
-    DECIMAL              = /[+-]?(?:[0-9]*\.[0-9]+)/u.freeze
-    DOUBLE               = /[+-]?(?:[0-9]+\.[0-9]*#{EXPONENT}|\.?[0-9]+#{EXPONENT})/u.freeze
+    INTEGER              = /[+-]?\d+/u.freeze
+    DECIMAL              = /[+-]?(?:\d*\.\d+)/u.freeze
+    DOUBLE               = /[+-]?(?:\d+\.\d*#{EXPONENT}|\.\d+#{EXPONENT}|\d+#{EXPONENT})/u.freeze
     STRING_LITERAL_SINGLE_QUOTE      = /'(?:[^\'\\\n\r]|#{ECHAR}|#{UCHAR})*'/u.freeze
     STRING_LITERAL_QUOTE             = /"(?:[^\"\\\n\r]|#{ECHAR}|#{UCHAR})*"/u.freeze
     STRING_LITERAL_LONG_SINGLE_QUOTE = /'''(?:(?:'|'')?(?:[^'\\]|#{ECHAR}|#{UCHAR}))*'''/um.freeze

spec/writer_spec.rb

@@ -888,8 +888,6 @@
       }.each do |name, params|
         it name do
           graph = RDF::Graph.new {|g| g << parse(params[:input], rdfstar: true)}
-          #res = serialize(graph, prefixes: {ex: 'http://example/'})
-          #require 'byebug'; byebug
           serialize(graph, params.fetch(:regexp, []), prefixes: {ex: 'http://example/'}, **params)
         end
       end