mongo-ejson 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b1a8b0a13a6a23d0d082bbdc5c9c5ba6ed6b642831bd6d4ed06477c43a0dbb9
-  data.tar.gz: 9d2cbdd8fd9da0154d34f3cb196438e41edb1dbb1ab5ebc019cacf9b250361b4
+  metadata.gz: 5a49c9eb4244ffbc3e86d08db3c5ed6d2d5a01df835beecef11200fa221234cd
+  data.tar.gz: 84caa949ebdf44a5a13dfcf82453c5be1b7e5367c5d705421b6b4d3bce6dfd5d
 SHA512:
-  metadata.gz: b3e75374ea2acd4d42e9fda8f87f2f367995d3d314f714d354be6973b99d7479ac5c6d096a3107570e96974f9473f9af09114a98842ed26c9a1633ac90223823
-  data.tar.gz: 056d295d55e218c3b9813e59bb1af30e845eda19cf494f8cf5a0451224a622e7a675313958c990b0d3b907c5f9a148c8fc8b9424154f8381674a903007ff1892
+  metadata.gz: 36895e58e393acff8d26cfa07fa39c995a4db289c121cba1e0fa9066d3dcc3b5fb6957a6d67f9eb0f4ecac1adfa18c1a05a0b0feb70b192c388de0bdc0176f22
+  data.tar.gz: 6ccba4c55fd658d828eaceca7d482551f3a4278be4054ca27eada96f6c8001f13db9752edd3dfdd24761e602a5c4a3d86943ff89e9dca38a52705eaa9d6dd6f5

data/.travis.yml

@@ -1,15 +1,13 @@
----
 sudo: false
 language: ruby
 cache: bundler
 rvm:
+  - 2.7
   - 2.6
   - 2.5
   - jruby-9.2
-
 before_install:
   - gem install bundler -v 2.0.1
-
 script:
   - bundle exec rspec
   - bundle exec rubocop

data/Gemfile.lock

@@ -11,12 +11,13 @@ GEM
     bson (4.4.2-java)
     diff-lcs (1.3)
     jaro_winkler (1.5.2)
+    jaro_winkler (1.5.2-java)
     parallel (1.13.0)
     parser (2.6.0.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -49,7 +50,7 @@ DEPENDENCIES
   bson
   bundler (~> 2.0)
   mongo-ejson!
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 0.63)
 

data/README.md

@@ -42,50 +42,40 @@ Just add it to your `application.js`
 ## Requirements
 
 Runtime:
-  * Ruby 2.5+
-  * JRuby 9.2+
+
+- Ruby 2.5+
+- JRuby 9.2+
 
 Development:
-  * [canopy](https://github.com/jcoglan/canopy) from master branch
+
+- [canopy](https://github.com/jcoglan/canopy) from master branch
 
 ## Supported literals
 
-* `undefined`
-* `MinKey`
-* `MaxKey`
-* `ObjectId(<object_id_hex_string>)`
-* `BinData(<type_string>, <bindata_base64_string>)`
-* `BinData(<type_integer>, <base64_bindata>)`
-* `Timestamp(<time_interger>, <increment_integer>)`
-* `NumberLong(<value_string>)`
-* `NumberLong(<value_integer>)`
-* `NumberDecimal(<value_string>)`
-* `NumberDecimal(<value_number>)`
-* `ISODate(<time_iso8601_string>)`
-* `ISODate(<time_interger>)`
-* `new Date(<time_iso8601_string>)`
-* `new Date(<time_interger>)`
-* `/<regexp>/<options>`
-* `DBRef(<name_string>, <object_id_hex_string>)`
+- `undefined`
+- `MinKey`
+- `MaxKey`
+- `ObjectId(<object_id_hex_string>)`
+- `BinData(<type_string>, <bindata_base64_string>)`
+- `BinData(<type_integer>, <base64_bindata>)`
+- `Timestamp(<time_interger>, <increment_integer>)`
+- `NumberLong(<value_string>)`
+- `NumberLong(<value_integer>)`
+- `NumberDecimal(<value_string>)`
+- `NumberDecimal(<value_number>)`
+- `ISODate(<time_iso8601_string>)`
+- `ISODate(<time_interger>)`
+- `new Date(<time_iso8601_string>)`
+- `new Date(<time_interger>)`
+- `/<regexp>/<options>`
+- `DBRef(<name_string>, <object_id_hex_string>)`
 
 ## Supported JSON extensions:
 
-* Single quoted strings
-* Single line comments `//`
+- Single quoted strings
+- Single line comments `//`
+- Non-quoted key names: `{_id: 123}`
 
 ## Planned JSON extensions:
 
-* Non-quoted key names: `{_id: 123}`
-* Multi-line comments: `/* */`
-
-## Issues
-
-* String: following not escaped chars should fail, but pass
-
-    * Backspace (must be replaced with `\b`). no fixture
-    * Form feed (must be replaced with `\f`), no fixture
-    * Newline (must be replaced with `\n`)
-    * Carriage return (must be replaced with `\r`), no fixture
-    * Tab (must be replaced with `\t`)
-
-
+- Multi-line comments: `/* */`

data/ejson.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.63'
 

data/lib/ejson/parser_action/abstract_json.rb

@@ -16,6 +16,9 @@ module ParserAction
     def make_string(input, starts_at, _ends_at, elements)
     end
 
+    def make_identifier(input, starts_at, _ends_at, elements)
+    end
+
     def make_array(input, starts_at, _ends_at, elements)
     end
 

data/lib/ejson/parser_action/ruby.rb

@@ -37,6 +37,10 @@ module ParserAction
       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, _starts_at, _ends_at, elements)
       elements.first
     end

data/lib/ejson/version.rb

@@ -1,3 +1,3 @@
 class EJSON
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo-ejson
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Alex Bondar
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ metadata:
   homepage_uri: https://gibhub.com/db-ai/mongo-ejson
   source_code_uri: https://gibhub.com/db-ai/mongo-ejson
   changelog_uri: https://gibhub.com/db-ai/mongo-ejson
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -136,8 +136,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: MongoDB Extended JS(ON) parser
 test_files: []