mongo-ejson 0.2.1 → 0.2.6

data/lib/ejson/parser_action/abstract_mongo.rb

@@ -1,36 +1,36 @@
 module ParserAction
   module AbstractMongo
-    def make_object_id(input, start, _end, elements)
+    def make_object_id(input, starts_at, _ends_at, elements)
     end
 
-    def make_bin_data(input, start, _end, elements)
+    def make_bin_data(input, starts_at, _ends_at, elements)
     end
 
-    def make_timestamp(input, start, _end, elements)
+    def make_timestamp(input, starts_at, _ends_at, elements)
     end
 
-    def make_number_long(input, start, _end, elements)
+    def make_number_long(input, starts_at, _ends_at, elements)
     end
 
-    def make_number_decimal(input, start, _end, elements)
+    def make_number_decimal(input, starts_at, _ends_at, elements)
     end
 
-    def make_date(input, start, _end, elements)
+    def make_date(input, starts_at, _ends_at, elements)
     end
 
-    def make_regexp(input, start, _end, elements)
+    def make_regexp(input, starts_at, _ends_at, elements)
     end
 
-    def make_db_ref(input, start, _end, elements)
+    def make_db_ref(input, starts_at, _ends_at, elements)
     end
 
-    def make_min_key(input, start, _end)
+    def make_min_key(input, starts_at, _ends_at)
     end
 
-    def make_max_key(input, start, _end)
+    def make_max_key(input, starts_at, _ends_at)
     end
 
-    def make_undefined(input, start, _end)
+    def make_undefined(input, starts_at, _ends_at)
     end
   end
 end

data/lib/ejson/parser_action/bson.rb

@@ -2,59 +2,57 @@ require 'ejson/parser_action/ruby'
 
 module ParserAction
   class BSON < ParserAction::Ruby
-    def make_object_id(input, start, _end, elements)
+    def make_object_id(_input, _starts_at, _ends_at, elements)
       value = elements.first
 
       ::BSON::ObjectId.from_string(value)
     end
 
     NUMBER_TO_TYPE = {
-      0    =>  :generic,
-      1    =>  :function,
-      2    =>  :old,
-      3    =>  :uuid_old,
-      4    =>  :uuid,
-      5    =>  :md5,
-      128  =>  :user,
-    }
-
-    def make_bin_data(input, start, _end, elements)
+      0   => :generic,
+      1   => :function,
+      2   => :old,
+      3   => :uuid_old,
+      4   => :uuid,
+      5   => :md5,
+      128 => :user,
+    }.freeze
+
+    def make_bin_data(_input, _starts_at, _ends_at, elements)
       data = elements.last
       type = elements.first
 
-      if type.is_a? Numeric
-        type = NUMBER_TO_TYPE[type]
-      end
+      type = NUMBER_TO_TYPE[type] if type.is_a? Numeric
 
       ::BSON::Binary.new(data, type.to_sym)
     end
 
-    def make_timestamp(input, start, _end, elements)
+    def make_timestamp(_input, _starts_at, _ends_at, elements)
       ::BSON::Timestamp.new(elements.first, elements.last)
     end
 
-    def make_number_decimal(input, start, _end, elements)
+    def make_number_decimal(_input, _starts_at, _ends_at, elements)
       value = elements.first
 
       ::BSON::Decimal128.new(value.to_s)
     end
 
-    def make_db_ref(input, start, _end, elements)
+    def make_db_ref(_input, _starts_at, _ends_at, elements)
       {
-          "$ref": elements.first,
-          "$id": elements.last,
+        "$ref": elements.first,
+        "$id":  elements.last,
       }
     end
 
-    def make_min_key(input, start, _end)
+    def make_min_key(_input, _starts_at, _ends_at)
       ::BSON::MinKey
     end
 
-    def make_max_key(input, start, _end)
+    def make_max_key(_input, _starts_at, _ends_at)
       ::BSON::MaxKey
     end
 
-    def make_undefined(input, start, _end)
+    def make_undefined(_input, _starts_at, _ends_at)
       ::BSON::Undefined
     end
   end

data/lib/ejson/parser_action/ruby.rb

@@ -3,15 +3,19 @@ require 'date'
 
 module ParserAction
   class Ruby < ParserAction::Abstract
-    def make_root(input, start, _end, elements)
+    UNICODE_ESCAPER = proc { |s|
+      format('\u%04X', s.codepoints[0])
+    }
+
+    def make_root(_input, _starts_at, _ends_at, elements)
       elements.first
     end
 
-    def make_object(input, start, _end, elements)
+    def make_object(_input, _starts_at, _ends_at, elements)
       first_pair = elements.first
       other_pairs = elements.last
 
-      object = {first_pair[0] => first_pair[1]}
+      object = { first_pair[0] => first_pair[1] }
       other_pairs.each do |element|
         pair = element.pair
         object[pair.first] = pair.last
@@ -20,65 +24,74 @@ module ParserAction
       object
     end
 
-    def make_pair(input, start, _end, elements)
+    def make_pair(_input, _starts_at, _ends_at, elements)
       elements
     end
 
-    def make_empty_object(input, start, _end, elements)
+    def make_empty_object(_input, _starts_at, _ends_at, _elements)
       {}
     end
 
-    def make_string(input, start, _end, elements)
-      %Q|"#{elements.first.text}"|.undump
+    def make_string(_input, _starts_at, _ends_at, elements)
+      quoted_string = %("#{elements.first.text}")
+      quoted_string.encode('ASCII', fallback: UNICODE_ESCAPER).undump
+    end
+
+    def make_identifier(input, starts_at, ends_at, _elements)
+      input[starts_at...ends_at]
     end
 
-    def make_numeric_string(input, start, _end, elements)
+    def make_numeric_string(_input, _starts_at, _ends_at, elements)
       elements.first
     end
 
-    def make_number_as_string(input, start, _end, elements)
-      string = input[start..._end]
+    def make_number_as_string(input, starts_at, ends_at, _elements)
+      string = input[starts_at...ends_at]
       string.downcase!
 
       string
     end
 
-    def make_array(input, start, _end, elements)
+    def make_array(_input, _starts_at, _ends_at, elements)
       list = [elements[0]]
       elements[1].each { |el| list << el.value }
       list
     end
 
-    def make_empty_array(input, start, _end, elements)
+    def make_empty_array(_input, _starts_at, _ends_at, _elements)
       []
     end
 
-    def make_number(input, start, _end, elements)
-      string = input[start..._end]
+    def make_number(input, starts_at, ends_at, _elements)
+      string = input[starts_at...ends_at]
       string.downcase!
 
       _number_from_string(string)
     end
 
-    def make_null(input, start, _end)
+    def make_null(_input, _starts_at, _ends_at)
       nil
     end
 
-    def make_true(input, start, _end)
+    def make_true(_input, _starts_at, _ends_at)
       true
     end
 
-    def make_false(input, start, _end)
+    def make_false(_input, _starts_at, _ends_at)
       false
     end
 
     # Makes ruby date from mongo Data type
-    def make_date(input, start, _end, elements)
+    def make_date(input, _starts_at, _ends_at, elements)
       value = elements.first
 
       case value
       when String
-        DateTime.parse(value)
+        begin
+          DateTime.parse(value)
+        rescue ArgumentError => error
+          raise ExtendedJSON::ParseError, "Invalid date '#{value}'', expected ISO date"
+        end
       when Numeric
         Time.at(value)
       else
@@ -87,20 +100,18 @@ module ParserAction
       end
     end
 
-    def make_regexp(input, start, _end, elements)
+    def make_regexp(_input, _starts_at, _ends_at, elements)
       Regexp.new(elements.first.text, elements.last.text)
     end
 
-    def make_number_long(input, start, _end, elements)
-      value = elements.first
+    def make_number_long(_input, _starts_at, _ends_at, elements)
+      elements.first
     end
 
     private
 
     def _number_from_string(string)
-      if string.include? 'e'
-        return Float(string)
-      end
+      return Float(string) if string.include? 'e'
 
       if string.include? '.'
         string.to_f

data/lib/ejson/parser_action/wrap.rb

@@ -4,40 +4,40 @@ require 'bigdecimal'
 
 module ParserAction
   class Wrap < ParserAction::Ruby
-    def make_object_id(input, start, _end, elements)
+    def make_object_id(_input, _starts_at, _ends_at, elements)
       value = elements.first
 
       ::Wrap::ObjectId.new(value)
     end
 
-    def make_bin_data(input, start, _end, elements)
+    def make_bin_data(_input, _starts_at, _ends_at, elements)
       data = elements.last
       type = elements.first
 
       ::Wrap::BinData.new(type, data)
     end
 
-    def make_timestamp(input, start, _end, elements)
+    def make_timestamp(_input, _starts_at, _ends_at, elements)
       ::Wrap::Timestamp.new(elements.first, elements.last)
     end
 
-    def make_number_decimal(input, start, _end, elements)
+    def make_number_decimal(_input, _starts_at, _ends_at, elements)
       BigDecimal(elements.first)
     end
 
-    def make_db_ref(input, start, _end, elements)
+    def make_db_ref(_input, _starts_at, _ends_at, elements)
       ::Wrap::DBRef.new(elements.first, elements.last)
     end
 
-    def make_min_key(input, start, _end)
+    def make_min_key(_input, _starts_at, _ends_at)
       ::Wrap::MinKey
     end
 
-    def make_max_key(input, start, _end)
+    def make_max_key(_input, _starts_at, _ends_at)
       ::Wrap::MaxKey
     end
 
-    def make_undefined(input, start, _end)
+    def make_undefined(_input, _starts_at, _ends_at)
       ::Wrap::Undefined
     end
   end

data/lib/ejson/parser_action/wrap_types.rb

@@ -3,9 +3,9 @@ module Wrap
   MaxKey = Class.new
   Undefined = Class.new
 
-  ObjectId = Struct.new("ObjectId", :hex)
-  BinData = Struct.new("BinData", :type, :data)
-  Timestamp = Struct.new("Timestamp", :timestamp, :fraction)
+  ObjectId = Struct.new('ObjectId', :hex)
+  BinData = Struct.new('BinData', :type, :data)
+  Timestamp = Struct.new('Timestamp', :timestamp, :fraction)
 
-  DBRef = Struct.new("DBRef", :name, :id)
+  DBRef = Struct.new('DBRef', :name, :id)
 end

data/lib/ejson/version.rb

@@ -1,3 +1,3 @@
 class EJSON
-  VERSION = "0.2.1"
+  VERSION = '0.2.6'.freeze
 end

data/src/ejson.peg

@@ -4,7 +4,7 @@ grammar ExtendedJSON
 
   object                 <- (non_empty_object / empty_object)
 
-  pair                   <- @__ string @assignment value
+  pair                   <- @__ (string / identifier) @assignment value
                           %make_pair
 
   non_empty_object       <- @object_open
@@ -48,18 +48,35 @@ grammar ExtendedJSON
 
   string                 <- double_quote_string / single_quote_string
 
+  identifier             <- (identifier_start identifier_part+)
+                          %make_identifier
+
+  identifier_start       <- unicode_letter / "$" / "_" / "\\" unicode_escape
+  identifier_part        <- unicode_letter / unicode_digit / unicode_conn_punct
+
+  # Not fully compatible with a https://www.ecma-international.org/ecma-262/5.1/#sec-7.6
+  # but enough to cover most failing cases
+  unicode_combining      <- unicode_non_spacing / unicode_comb_spacing
+
+  unicode_escape         <- "u" hex_digit hex_digit hex_digit hex_digit
+
+  unicode_letter         <- [a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]
+  unicode_digit          <- [0-9]
+  unicode_conn_punct     <- [_\u203F\u2040\u2054\uFE33\uFE34\uFE4D-\uFE4F\uFF3F]
+
+  # https://www.ecma-international.org/ecma-262/5.1/#sec-7.8.4
   double_quote_string    <- @double_quote
-                              ("\\" . / [^"])*
+                              ("\\" [^\b\t\n\v\f\r] / [^"\b\t\n\v\f\r])*
                             @double_quote
                           %make_string
 
   single_quote_string    <- @single_quote
-                              ("\\" . / [^'])*
+                              ("\\" [^\b\t\n\v\f\r] / [^'\b\t\n\v\f\r])*
                             @single_quote
                           %make_string
 
   hex_string             <- hex_single_quote / hex_double_quote
-  hex_value              <- [a-fA-F0-9]+
+  hex_value              <- hex_digit+
 
   hex_single_quote       <- @single_quote
                               hex_value
@@ -209,6 +226,8 @@ grammar ExtendedJSON
   space                  <- [\s]
   new_line               <- [\n]
 
+  hex_digit              <- [a-fA-F0-9]
+
   comment                <- "//" [^\n]*
   __                     <- (space / new_line / comment)*
 

data/src/ejson.rb

@@ -18,11 +18,10 @@ module ExtendedJSON
   end
 
   class TreeNode1 < TreeNode
-    attr_reader :string, :value
+    attr_reader :value
 
     def initialize(text, offset, elements)
       super
-      @string = elements[0]
       @value = elements[1]
     end
   end
@@ -64,6 +63,33 @@ module ExtendedJSON
   end
 
   class TreeNode6 < TreeNode
+    attr_reader :identifier_start
+
+    def initialize(text, offset, elements)
+      super
+      @identifier_start = elements[0]
+    end
+  end
+
+  class TreeNode7 < TreeNode
+    attr_reader :unicode_escape
+
+    def initialize(text, offset, elements)
+      super
+      @unicode_escape = elements[1]
+    end
+  end
+
+  class TreeNode8 < TreeNode
+    attr_reader :hex_digit
+
+    def initialize(text, offset, elements)
+      super
+      @hex_digit = elements[4]
+    end
+  end
+
+  class TreeNode9 < TreeNode
     attr_reader :hex_value
 
     def initialize(text, offset, elements)
@@ -72,7 +98,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode7 < TreeNode
+  class TreeNode10 < TreeNode
     attr_reader :hex_value
 
     def initialize(text, offset, elements)
@@ -81,7 +107,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode8 < TreeNode
+  class TreeNode11 < TreeNode
     attr_reader :integer_number
 
     def initialize(text, offset, elements)
@@ -90,7 +116,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode9 < TreeNode
+  class TreeNode12 < TreeNode
     attr_reader :integer_number
 
     def initialize(text, offset, elements)
@@ -99,7 +125,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode10 < TreeNode
+  class TreeNode13 < TreeNode
     attr_reader :number
 
     def initialize(text, offset, elements)
@@ -108,7 +134,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode11 < TreeNode
+  class TreeNode14 < TreeNode
     attr_reader :number
 
     def initialize(text, offset, elements)
@@ -117,7 +143,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode12 < TreeNode
+  class TreeNode15 < TreeNode
     attr_reader :base64_value
 
     def initialize(text, offset, elements)
@@ -126,7 +152,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode13 < TreeNode
+  class TreeNode16 < TreeNode
     attr_reader :base64_value
 
     def initialize(text, offset, elements)
@@ -135,7 +161,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode14 < TreeNode
+  class TreeNode17 < TreeNode
     attr_reader :integer
 
     def initialize(text, offset, elements)
@@ -144,7 +170,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode15 < TreeNode
+  class TreeNode18 < TreeNode
     attr_reader :integer
 
     def initialize(text, offset, elements)
@@ -153,7 +179,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode16 < TreeNode
+  class TreeNode19 < TreeNode
     attr_reader :integer
 
     def initialize(text, offset, elements)
@@ -162,7 +188,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode17 < TreeNode
+  class TreeNode20 < TreeNode
     attr_reader :hex_string
 
     def initialize(text, offset, elements)
@@ -171,7 +197,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode18 < TreeNode
+  class TreeNode21 < TreeNode
     attr_reader :bin_data_type, :base64_string
 
     def initialize(text, offset, elements)
@@ -181,7 +207,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode19 < TreeNode
+  class TreeNode22 < TreeNode
     attr_reader :integer_number
 
     def initialize(text, offset, elements)
@@ -190,7 +216,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode20 < TreeNode
+  class TreeNode23 < TreeNode
     attr_reader :number_long_value
 
     def initialize(text, offset, elements)
@@ -199,7 +225,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode21 < TreeNode
+  class TreeNode24 < TreeNode
     attr_reader :number_decimal_value
 
     def initialize(text, offset, elements)
@@ -208,7 +234,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode22 < TreeNode
+  class TreeNode25 < TreeNode
     attr_reader :date_value
 
     def initialize(text, offset, elements)
@@ -217,7 +243,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode23 < TreeNode
+  class TreeNode26 < TreeNode
     attr_reader :string
 
     def initialize(text, offset, elements)
@@ -226,7 +252,7 @@ module ExtendedJSON
     end
   end
 
-  class TreeNode24 < TreeNode
+  class TreeNode27 < TreeNode
     attr_reader :comma
 
     def initialize(text, offset, elements)
@@ -320,7 +346,15 @@ module ExtendedJSON
       address1 = _read___
       unless address1 == FAILURE
         address2 = FAILURE
+        index2 = @offset
         address2 = _read_string
+        if address2 == FAILURE
+          @offset = index2
+          address2 = _read_identifier
+          if address2 == FAILURE
+            @offset = index2
+          end
+        end
         unless address2 == FAILURE
           elements0 << address2
           address3 = FAILURE
@@ -856,6 +890,353 @@ module ExtendedJSON
       return address0
     end
 
+    def _read_identifier
+      address0, index0 = FAILURE, @offset
+      cached = @cache[:identifier][index0]
+      if cached
+        @offset = cached[1]
+        return cached[0]
+      end
+      index1, elements0 = @offset, []
+      address1 = FAILURE
+      address1 = _read_identifier_start
+      unless address1 == FAILURE
+        elements0 << address1
+        address2 = FAILURE
+        remaining0, index2, elements1, address3 = 1, @offset, [], true
+        until address3 == FAILURE
+          address3 = _read_identifier_part
+          unless address3 == FAILURE
+            elements1 << address3
+            remaining0 -= 1
+          end
+        end
+        if remaining0 <= 0
+          address2 = TreeNode.new(@input[index2...@offset], index2, elements1)
+          @offset = @offset
+        else
+          address2 = FAILURE
+        end
+        unless address2 == FAILURE
+          elements0 << address2
+        else
+          elements0 = nil
+          @offset = index1
+        end
+      else
+        elements0 = nil
+        @offset = index1
+      end
+      if elements0.nil?
+        address0 = FAILURE
+      else
+        address0 = @actions.make_identifier(@input, index1, @offset, elements0)
+        @offset = @offset
+      end
+      @cache[:identifier][index0] = [address0, @offset]
+      return address0
+    end
+
+    def _read_identifier_start
+      address0, index0 = FAILURE, @offset
+      cached = @cache[:identifier_start][index0]
+      if cached
+        @offset = cached[1]
+        return cached[0]
+      end
+      index1 = @offset
+      address0 = _read_unicode_letter
+      if address0 == FAILURE
+        @offset = index1
+        chunk0 = nil
+        if @offset < @input_size
+          chunk0 = @input[@offset...@offset + 1]
+        end
+        if chunk0 == "$"
+          address0 = TreeNode.new(@input[@offset...@offset + 1], @offset)
+          @offset = @offset + 1
+        else
+          address0 = FAILURE
+          if @offset > @failure
+            @failure = @offset
+            @expected = []
+          end
+          if @offset == @failure
+            @expected << "\"$\""
+          end
+        end
+        if address0 == FAILURE
+          @offset = index1
+          chunk1 = nil
+          if @offset < @input_size
+            chunk1 = @input[@offset...@offset + 1]
+          end
+          if chunk1 == "_"
+            address0 = TreeNode.new(@input[@offset...@offset + 1], @offset)
+            @offset = @offset + 1
+          else
+            address0 = FAILURE
+            if @offset > @failure
+              @failure = @offset
+              @expected = []
+            end
+            if @offset == @failure
+              @expected << "\"_\""
+            end
+          end
+          if address0 == FAILURE
+            @offset = index1
+            index2, elements0 = @offset, []
+            address1 = FAILURE
+            chunk2 = nil
+            if @offset < @input_size
+              chunk2 = @input[@offset...@offset + 1]
+            end
+            if chunk2 == "\\"
+              address1 = TreeNode.new(@input[@offset...@offset + 1], @offset)
+              @offset = @offset + 1
+            else
+              address1 = FAILURE
+              if @offset > @failure
+                @failure = @offset
+                @expected = []
+              end
+              if @offset == @failure
+                @expected << "\"\\\\\""
+              end
+            end
+            unless address1 == FAILURE
+              elements0 << address1
+              address2 = FAILURE
+              address2 = _read_unicode_escape
+              unless address2 == FAILURE
+                elements0 << address2
+              else
+                elements0 = nil
+                @offset = index2
+              end
+            else
+              elements0 = nil
+              @offset = index2
+            end
+            if elements0.nil?
+              address0 = FAILURE
+            else
+              address0 = TreeNode7.new(@input[index2...@offset], index2, elements0)
+              @offset = @offset
+            end
+            if address0 == FAILURE
+              @offset = index1
+            end
+          end
+        end
+      end
+      @cache[:identifier_start][index0] = [address0, @offset]
+      return address0
+    end
+
+    def _read_identifier_part
+      address0, index0 = FAILURE, @offset
+      cached = @cache[:identifier_part][index0]
+      if cached
+        @offset = cached[1]
+        return cached[0]
+      end
+      index1 = @offset
+      address0 = _read_unicode_letter
+      if address0 == FAILURE
+        @offset = index1
+        address0 = _read_unicode_digit
+        if address0 == FAILURE
+          @offset = index1
+          address0 = _read_unicode_conn_punct
+          if address0 == FAILURE
+            @offset = index1
+          end
+        end
+      end
+      @cache[:identifier_part][index0] = [address0, @offset]
+      return address0
+    end
+
+    def _read_unicode_combining
+      address0, index0 = FAILURE, @offset
+      cached = @cache[:unicode_combining][index0]
+      if cached
+        @offset = cached[1]
+        return cached[0]
+      end
+      index1 = @offset
+      address0 = _read_unicode_non_spacing
+      if address0 == FAILURE
+        @offset = index1
+        address0 = _read_unicode_comb_spacing
+        if address0 == FAILURE
+          @offset = index1
+        end
+      end
+      @cache[:unicode_combining][index0] = [address0, @offset]
+      return address0
+    end
+
+    def _read_unicode_escape
+      address0, index0 = FAILURE, @offset
+      cached = @cache[:unicode_escape][index0]
+      if cached
+        @offset = cached[1]
+        return cached[0]
+      end
+      index1, elements0 = @offset, []
+      address1 = FAILURE
+      chunk0 = nil
+      if @offset < @input_size
+        chunk0 = @input[@offset...@offset + 1]
+      end
+      if chunk0 == "u"
+        address1 = TreeNode.new(@input[@offset...@offset + 1], @offset)
+        @offset = @offset + 1
+      else
+        address1 = FAILURE
+        if @offset > @failure
+          @failure = @offset
+          @expected = []
+        end
+        if @offset == @failure
+          @expected << "\"u\""
+        end
+      end
+      unless address1 == FAILURE
+        elements0 << address1
+        address2 = FAILURE
+        address2 = _read_hex_digit
+        unless address2 == FAILURE
+          elements0 << address2
+          address3 = FAILURE
+          address3 = _read_hex_digit
+          unless address3 == FAILURE
+            elements0 << address3
+            address4 = FAILURE
+            address4 = _read_hex_digit
+            unless address4 == FAILURE
+              elements0 << address4
+              address5 = FAILURE
+              address5 = _read_hex_digit
+              unless address5 == FAILURE
+                elements0 << address5
+              else
+                elements0 = nil
+                @offset = index1
+              end
+            else
+              elements0 = nil
+              @offset = index1
+            end
+          else
+            elements0 = nil
+            @offset = index1
+          end
+        else
+          elements0 = nil
+          @offset = index1
+        end
+      else
+        elements0 = nil
+        @offset = index1
+      end
+      if elements0.nil?
+        address0 = FAILURE
+      else
+        address0 = TreeNode8.new(@input[index1...@offset], index1, elements0)
+        @offset = @offset
+      end
+      @cache[:unicode_escape][index0] = [address0, @offset]
+      return address0
+    end
+
+    def _read_unicode_letter
+      address0, index0 = FAILURE, @offset
+      cached = @cache[:unicode_letter][index0]
+      if cached
+        @offset = cached[1]
+        return cached[0]
+      end
+      chunk0 = nil
+      if @offset < @input_size
+        chunk0 = @input[@offset...@offset + 1]
+      end
+      if chunk0 =~ /\A[a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]/
+        address0 = TreeNode.new(@input[@offset...@offset + 1], @offset)
+        @offset = @offset + 1
+      else
+        address0 = FAILURE
+        if @offset > @failure
+          @failure = @offset
+          @expected = []
+        end
+        if @offset == @failure
+          @expected << "[a-zA-Z\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]"
+        end
+      end
+      @cache[:unicode_letter][index0] = [address0, @offset]
+      return address0
+    end
+
+    def _read_unicode_digit
+      address0, index0 = FAILURE, @offset
+      cached = @cache[:unicode_digit][index0]
+      if cached
+        @offset = cached[1]
+        return cached[0]
+      end
+      chunk0 = nil
+      if @offset < @input_size
+        chunk0 = @input[@offset...@offset + 1]
+      end
+      if chunk0 =~ /\A[0-9]/
+        address0 = TreeNode.new(@input[@offset...@offset + 1], @offset)
+        @offset = @offset + 1
+      else
+        address0 = FAILURE
+        if @offset > @failure
+          @failure = @offset
+          @expected = []
+        end
+        if @offset == @failure
+          @expected << "[0-9]"
+        end
+      end
+      @cache[:unicode_digit][index0] = [address0, @offset]
+      return address0
+    end
+
+    def _read_unicode_conn_punct
+      address0, index0 = FAILURE, @offset
+      cached = @cache[:unicode_conn_punct][index0]
+      if cached
+        @offset = cached[1]
+        return cached[0]
+      end
+      chunk0 = nil
+      if @offset < @input_size
+        chunk0 = @input[@offset...@offset + 1]
+      end
+      if chunk0 =~ /\A[_\u203F\u2040\u2054\uFE33\uFE34\uFE4D-\uFE4F\uFF3F]/
+        address0 = TreeNode.new(@input[@offset...@offset + 1], @offset)
+        @offset = @offset + 1
+      else
+        address0 = FAILURE
+        if @offset > @failure
+          @failure = @offset
+          @expected = []
+        end
+        if @offset == @failure
+          @expected << "[_\\u203F\\u2040\\u2054\\uFE33\\uFE34\\uFE4D-\\uFE4F\\uFF3F]"
+        end
+      end
+      @cache[:unicode_conn_punct][index0] = [address0, @offset]
+      return address0
+    end
+
     def _read_double_quote_string
       address0, index0 = FAILURE, @offset
       cached = @cache[:double_quote_string][index0]
@@ -893,7 +1274,11 @@ module ExtendedJSON
           unless address4 == FAILURE
             elements2 << address4
             address5 = FAILURE
+            chunk1 = nil
             if @offset < @input_size
+              chunk1 = @input[@offset...@offset + 1]
+            end
+            if chunk1 =~ /\A[^\b\t\n\v\f\r]/
               address5 = TreeNode.new(@input[@offset...@offset + 1], @offset)
               @offset = @offset + 1
             else
@@ -903,7 +1288,7 @@ module ExtendedJSON
                 @expected = []
               end
               if @offset == @failure
-                @expected << "<any char>"
+                @expected << "[^\\b\\t\\n\\v\\f\\r]"
               end
             end
             unless address5 == FAILURE
@@ -924,11 +1309,11 @@ module ExtendedJSON
           end
           if address3 == FAILURE
             @offset = index3
-            chunk1 = nil
+            chunk2 = nil
             if @offset < @input_size
-              chunk1 = @input[@offset...@offset + 1]
+              chunk2 = @input[@offset...@offset + 1]
             end
-            if chunk1 =~ /\A[^"]/
+            if chunk2 =~ /\A[^"\b\t\n\v\f\r]/
               address3 = TreeNode.new(@input[@offset...@offset + 1], @offset)
               @offset = @offset + 1
             else
@@ -938,7 +1323,7 @@ module ExtendedJSON
                 @expected = []
               end
               if @offset == @failure
-                @expected << "[^\"]"
+                @expected << "[^\"\\b\\t\\n\\v\\f\\r]"
               end
             end
             if address3 == FAILURE
@@ -1020,7 +1405,11 @@ module ExtendedJSON
           unless address4 == FAILURE
             elements2 << address4
             address5 = FAILURE
+            chunk1 = nil
             if @offset < @input_size
+              chunk1 = @input[@offset...@offset + 1]
+            end
+            if chunk1 =~ /\A[^\b\t\n\v\f\r]/
               address5 = TreeNode.new(@input[@offset...@offset + 1], @offset)
               @offset = @offset + 1
             else
@@ -1030,7 +1419,7 @@ module ExtendedJSON
                 @expected = []
               end
               if @offset == @failure
-                @expected << "<any char>"
+                @expected << "[^\\b\\t\\n\\v\\f\\r]"
               end
             end
             unless address5 == FAILURE
@@ -1051,11 +1440,11 @@ module ExtendedJSON
           end
           if address3 == FAILURE
             @offset = index3
-            chunk1 = nil
+            chunk2 = nil
             if @offset < @input_size
-              chunk1 = @input[@offset...@offset + 1]
+              chunk2 = @input[@offset...@offset + 1]
             end
-            if chunk1 =~ /\A[^']/
+            if chunk2 =~ /\A[^'\b\t\n\v\f\r]/
               address3 = TreeNode.new(@input[@offset...@offset + 1], @offset)
               @offset = @offset + 1
             else
@@ -1065,7 +1454,7 @@ module ExtendedJSON
                 @expected = []
               end
               if @offset == @failure
-                @expected << "[^']"
+                @expected << "[^'\\b\\t\\n\\v\\f\\r]"
               end
             end
             if address3 == FAILURE
@@ -1139,23 +1528,7 @@ module ExtendedJSON
       end
       remaining0, index1, elements0, address1 = 1, @offset, [], true
       until address1 == FAILURE
-        chunk0 = nil
-        if @offset < @input_size
-          chunk0 = @input[@offset...@offset + 1]
-        end
-        if chunk0 =~ /\A[a-fA-F0-9]/
-          address1 = TreeNode.new(@input[@offset...@offset + 1], @offset)
-          @offset = @offset + 1
-        else
-          address1 = FAILURE
-          if @offset > @failure
-            @failure = @offset
-            @expected = []
-          end
-          if @offset == @failure
-            @expected << "[a-fA-F0-9]"
-          end
-        end
+        address1 = _read_hex_digit
         unless address1 == FAILURE
           elements0 << address1
           remaining0 -= 1
@@ -3513,6 +3886,34 @@ module ExtendedJSON
       return address0
     end
 
+    def _read_hex_digit
+      address0, index0 = FAILURE, @offset
+      cached = @cache[:hex_digit][index0]
+      if cached
+        @offset = cached[1]
+        return cached[0]
+      end
+      chunk0 = nil
+      if @offset < @input_size
+        chunk0 = @input[@offset...@offset + 1]
+      end
+      if chunk0 =~ /\A[a-fA-F0-9]/
+        address0 = TreeNode.new(@input[@offset...@offset + 1], @offset)
+        @offset = @offset + 1
+      else
+        address0 = FAILURE
+        if @offset > @failure
+          @failure = @offset
+          @expected = []
+        end
+        if @offset == @failure
+          @expected << "[a-fA-F0-9]"
+        end
+      end
+      @cache[:hex_digit][index0] = [address0, @offset]
+      return address0
+    end
+
     def _read_comment
       address0, index0 = FAILURE, @offset
       cached = @cache[:comment][index0]
@@ -3662,7 +4063,7 @@ module ExtendedJSON
       if elements0.nil?
         address0 = FAILURE
       else
-        address0 = TreeNode24.new(@input[index1...@offset], index1, elements0)
+        address0 = TreeNode27.new(@input[index1...@offset], index1, elements0)
         @offset = @offset
       end
       @cache[:delimiter][index0] = [address0, @offset]