multi_json 1.15.0 → 1.16.0

data/lib/multi_json/vendor/okjson.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-#
 # Copyright 2011, 2012 Keith Rarick
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -22,17 +20,16 @@
 
 # See https://github.com/kr/okjson for updates.
 
-require 'stringio'
+require "stringio"
 
 module MultiJson
   # Some parts adapted from
   # https://golang.org/src/encoding/json/decode.go and
   # https://golang.org/src/unicode/utf8/utf8.go
   module OkJson
-    Upstream = '45'
+    Upstream = "45"
     extend self
 
-
     # Decodes a json document in string s and
     # returns the corresponding ruby value.
     # String s must be valid UTF-8. If you have
@@ -44,13 +41,11 @@ module MultiJson
     def decode(s)
       ts = lex(s)
       v, ts = textparse(ts)
-      if ts.length > 0
-        raise Error, 'trailing garbage'
-      end
+      raise Error, "trailing garbage" unless ts.empty?
+
       v
     end
 
-
     # Encodes x into a json text. It may contain only
     # Array, Hash, String, Numeric, true, false, nil.
     # (Note, this list excludes Symbol.)
@@ -62,172 +57,140 @@ module MultiJson
     # Strings contained in x must be valid UTF-8.
     def encode(x)
       case x
-      when Hash    then objenc(x)
-      when Array   then arrenc(x)
+      when Hash then objenc(x)
+      when Array then arrenc(x)
       else
-        raise Error, 'root value must be an Array or a Hash'
+        raise Error, "root value must be an Array or a Hash"
       end
     end
 
-
     def valenc(x)
       case x
-      when Hash    then objenc(x)
-      when Array   then arrenc(x)
-      when String  then strenc(x)
+      when Hash then objenc(x)
+      when Array then arrenc(x)
+      when String then strenc(x)
       when Numeric then numenc(x)
-      when true    then "true"
-      when false   then "false"
-      when nil     then "null"
+      when true then "true"
+      when false then "false"
+      when nil then "null"
       else
-        if x.respond_to?(:to_json)
-          x.to_json
-        else
-          raise Error, "cannot encode #{x.class}: #{x.inspect}"
-        end
+        raise Error, "cannot encode #{x.class}: #{x.inspect}" unless x.respond_to?(:to_json)
+
+        x.to_json
       end
     end
 
-
-  private
-
+    private
 
     # Parses a "json text" in the sense of RFC 4627.
     # Returns the parsed value and any trailing tokens.
     # Note: this is almost the same as valparse,
     # except that it does not accept atomic values.
     def textparse(ts)
-      if ts.length <= 0
-        raise Error, 'empty'
-      end
+      raise Error, "empty" if ts.length <= 0
 
       typ, _, val = ts[0]
       case typ
-      when '{' then objparse(ts)
-      when '[' then arrparse(ts)
+      when "{" then objparse(ts)
+      when "[" then arrparse(ts)
       else
         raise Error, "unexpected #{val.inspect}"
       end
     end
 
-
     # Parses a "value" in the sense of RFC 4627.
     # Returns the parsed value and any trailing tokens.
     def valparse(ts)
-      if ts.length <= 0
-        raise Error, 'empty'
-      end
+      raise Error, "empty" if ts.length <= 0
 
       typ, _, val = ts[0]
       case typ
-      when '{' then objparse(ts)
-      when '[' then arrparse(ts)
-      when :val,:str then [val, ts[1..-1]]
+      when "{" then objparse(ts)
+      when "[" then arrparse(ts)
+      when :val, :str then [val, ts[1..]]
       else
         raise Error, "unexpected #{val.inspect}"
       end
     end
 
-
     # Parses an "object" in the sense of RFC 4627.
     # Returns the parsed value and any trailing tokens.
     def objparse(ts)
-      ts = eat('{', ts)
+      ts = eat("{", ts)
       obj = {}
 
-      if ts[0][0] == '}'
-        return obj, ts[1..-1]
-      end
+      return obj, ts[1..] if ts[0][0] == "}"
 
       k, v, ts = pairparse(ts)
       obj[k] = v
 
-      if ts[0][0] == '}'
-        return obj, ts[1..-1]
-      end
+      return obj, ts[1..] if ts[0][0] == "}"
 
       loop do
-        ts = eat(',', ts)
+        ts = eat(",", ts)
 
         k, v, ts = pairparse(ts)
         obj[k] = v
 
-        if ts[0][0] == '}'
-          return obj, ts[1..-1]
-        end
+        return obj, ts[1..] if ts[0][0] == "}"
       end
     end
 
-
     # Parses a "member" in the sense of RFC 4627.
     # Returns the parsed values and any trailing tokens.
     def pairparse(ts)
-      (typ, _, k), ts = ts[0], ts[1..-1]
-      if typ != :str
-        raise Error, "unexpected #{k.inspect}"
-      end
-      ts = eat(':', ts)
+      (typ, _, k) = ts[0]
+      ts = ts[1..]
+      raise Error, "unexpected #{k.inspect}" if typ != :str
+
+      ts = eat(":", ts)
       v, ts = valparse(ts)
       [k, v, ts]
     end
 
-
     # Parses an "array" in the sense of RFC 4627.
     # Returns the parsed value and any trailing tokens.
     def arrparse(ts)
-      ts = eat('[', ts)
+      ts = eat("[", ts)
       arr = []
 
-      if ts[0][0] == ']'
-        return arr, ts[1..-1]
-      end
+      return arr, ts[1..] if ts[0][0] == "]"
 
       v, ts = valparse(ts)
       arr << v
 
-      if ts[0][0] == ']'
-        return arr, ts[1..-1]
-      end
+      return arr, ts[1..] if ts[0][0] == "]"
 
       loop do
-        ts = eat(',', ts)
+        ts = eat(",", ts)
 
         v, ts = valparse(ts)
         arr << v
 
-        if ts[0][0] == ']'
-          return arr, ts[1..-1]
-        end
+        return arr, ts[1..] if ts[0][0] == "]"
       end
     end
 
-
     def eat(typ, ts)
-      if ts[0][0] != typ
-        raise Error, "expected #{typ} (got #{ts[0].inspect})"
-      end
-      ts[1..-1]
-    end
+      raise Error, "expected #{typ} (got #{ts[0].inspect})" if ts[0][0] != typ
 
+      ts[1..]
+    end
 
     # Scans s and returns a list of json tokens,
     # excluding white space (as defined in RFC 4627).
     def lex(s)
       ts = []
-      while s.length > 0
+      until s.empty?
         typ, lexeme, val = tok(s)
-        if typ == nil
-          raise Error, "invalid character at #{s[0,10].inspect}"
-        end
-        if typ != :space
-          ts << [typ, lexeme, val]
-        end
-        s = s[lexeme.length..-1]
+        raise Error, "invalid character at #{s[0, 10].inspect}" if typ.nil?
+
+        ts << [typ, lexeme, val] if typ != :space
+        s = s[lexeme.length..]
       end
       ts
     end
 
-
     # Scans the first token in s and
     # returns a 3-element list, or nil
     # if s does not begin with a valid token.
@@ -243,62 +206,58 @@ module MultiJson
     # it is the lexeme.
     def tok(s)
       case s[0]
-      when ?{ then ['{', s[0,1], s[0,1]]
-      when ?} then ['}', s[0,1], s[0,1]]
-      when ?: then [':', s[0,1], s[0,1]]
-      when ?, then [',', s[0,1], s[0,1]]
-      when ?[ then ['[', s[0,1], s[0,1]]
-      when ?] then [']', s[0,1], s[0,1]]
-      when ?n then nulltok(s)
-      when ?t then truetok(s)
-      when ?f then falsetok(s)
-      when ?" then strtok(s)
-      when Spc, ?\t, ?\n, ?\r then [:space, s[0,1], s[0,1]]
+      when "{" then ["{", s[0, 1], s[0, 1]]
+      when "}" then ["}", s[0, 1], s[0, 1]]
+      when ":" then [":", s[0, 1], s[0, 1]]
+      when "," then [",", s[0, 1], s[0, 1]]
+      when "[" then ["[", s[0, 1], s[0, 1]]
+      when "]" then ["]", s[0, 1], s[0, 1]]
+      when "n" then nulltok(s)
+      when "t" then truetok(s)
+      when "f" then falsetok(s)
+      when '"' then strtok(s)
+      when Spc, "\t", "\n", "\r" then [:space, s[0, 1], s[0, 1]]
       else
         numtok(s)
       end
     end
 
+    def nulltok(s) = (s[0, 4] == "null") ? [:val, "null", nil] : []
 
-    def nulltok(s);  s[0,4] == 'null'  ? [:val, 'null',  nil]   : [] end
-    def truetok(s);  s[0,4] == 'true'  ? [:val, 'true',  true]  : [] end
-    def falsetok(s); s[0,5] == 'false' ? [:val, 'false', false] : [] end
+    def truetok(s) = (s[0, 4] == "true") ? [:val, "true", true] : []
 
+    def falsetok(s) = (s[0, 5] == "false") ? [:val, "false", false] : []
 
     def numtok(s)
       m = /(-?(?:[1-9][0-9]+|[0-9]))([.][0-9]+)?([eE][+-]?[0-9]+)?/.match(s)
-      if m && m.begin(0) == 0
+      if m&.begin(0)&.zero?
         if !m[2] && !m[3]
           [:val, m[0], Integer(m[0])]
         elsif m[2]
           [:val, m[0], Float(m[0])]
         else
-          [:val, m[0], Integer(m[1])*(10**m[3][1..-1].to_i(10))]
+          [:val, m[0], Integer(m[1]) * (10**m[3][1..].to_i(10))]
         end
       else
         []
       end
     end
 
-
     def strtok(s)
-      m = /"([^"\\]|\\["\/\\bfnrt]|\\u[0-9a-fA-F]{4})*"/.match(s)
-      if ! m
-        raise Error, "invalid string literal at #{abbrev(s)}"
-      end
+      m = %r{"([^"\\]|\\["/\\bfnrt]|\\u[0-9a-fA-F]{4})*"}.match(s)
+      raise Error, "invalid string literal at #{abbrev(s)}" unless m
+
       [:str, m[0], unquote(m[0])]
     end
 
-
     def abbrev(s)
-      t = s[0,10]
-      p = t['`']
-      t = t[0,p] if p
-      t = t + '...' if t.length < s.length
-      '`' + t + '`'
+      t = s[0, 10]
+      p = t["`"]
+      t = t[0, p] if p
+      t += "..." if t.length < s.length
+      "`" + t + "`"
     end
 
-
     # Converts a quoted json string literal q into a UTF-8-encoded string.
     # The rules are different than for Ruby, so we cannot use eval.
     # Unquote will raise an error if q contains control characters.
@@ -306,47 +265,42 @@ module MultiJson
       q = q[1...-1]
       a = q.dup # allocate a big enough string
       # In ruby >= 1.9, a[w] is a codepoint, not a byte.
-      if rubydoesenc?
-        a.force_encoding('UTF-8')
-      end
-      r, w = 0, 0
+      a.force_encoding("UTF-8") if rubydoesenc?
+      r = 0
+      w = 0
       while r < q.length
         c = q[r]
-        if c == ?\\
+        if c == "\\"
           r += 1
-          if r >= q.length
-            raise Error, "string literal ends with a \"\\\": \"#{q}\""
-          end
+          raise Error, "string literal ends with a \"\\\": \"#{q}\"" if r >= q.length
 
           case q[r]
-          when ?",?\\,?/,?'
+          when '"', "\\", "/", "'"
             a[w] = q[r]
             r += 1
             w += 1
-          when ?b,?f,?n,?r,?t
+          when "b", "f", "n", "r", "t"
             a[w] = Unesc[q[r]]
             r += 1
             w += 1
-          when ?u
+          when "u"
             r += 1
             uchar = begin
-              hexdec4(q[r,4])
+              hexdec4(q[r, 4])
             rescue RuntimeError => e
-              raise Error, "invalid escape sequence \\u#{q[r,4]}: #{e}"
+              raise Error, "invalid escape sequence \\u#{q[r, 4]}: #{e}"
             end
             r += 4
-            if surrogate? uchar
-              if q.length >= r+6
-                uchar1 = hexdec4(q[r+2,4])
-                uchar = subst(uchar, uchar1)
-                if uchar != Ucharerr
-                  # A valid pair; consume.
-                  r += 6
-                end
+            if surrogate?(uchar) && (q.length >= r + 6)
+              uchar1 = hexdec4(q[r + 2, 4])
+              uchar = subst(uchar, uchar1)
+              if uchar != Ucharerr
+                # A valid pair; consume.
+                r += 6
               end
             end
             if rubydoesenc?
-              a[w] = '' << uchar
+              a[w] = "" << uchar
               w += 1
             else
               w += ucharenc(a, w, uchar)
@@ -354,7 +308,7 @@ module MultiJson
           else
             raise Error, "invalid escape char #{q[r]} in \"#{q}\""
           end
-        elsif c == ?" || c < Spc
+        elsif c == '"' || c < Spc
           raise Error, "invalid character in string literal \"#{q}\""
         else
           # Copy anything else byte-for-byte.
@@ -367,10 +321,9 @@ module MultiJson
           w += 1
         end
       end
-      a[0,w]
+      a[0, w]
     end
 
-
     # Encodes unicode character u as UTF-8
     # bytes in string a at position i.
     # Returns the number of bytes written.
@@ -379,65 +332,56 @@ module MultiJson
         a[i] = (u & 0xff).chr
         1
       elsif u <= Uchar2max
-        a[i+0] = (Utag2 | ((u>>6)&0xff)).chr
-        a[i+1] = (Utagx | (u&Umaskx)).chr
+        a[i + 0] = (Utag2 | ((u >> 6) & 0xff)).chr
+        a[i + 1] = (Utagx | (u & Umaskx)).chr
         2
       elsif u <= Uchar3max
-        a[i+0] = (Utag3 | ((u>>12)&0xff)).chr
-        a[i+1] = (Utagx | ((u>>6)&Umaskx)).chr
-        a[i+2] = (Utagx | (u&Umaskx)).chr
+        a[i + 0] = (Utag3 | ((u >> 12) & 0xff)).chr
+        a[i + 1] = (Utagx | ((u >> 6) & Umaskx)).chr
+        a[i + 2] = (Utagx | (u & Umaskx)).chr
         3
       else
-        a[i+0] = (Utag4 | ((u>>18)&0xff)).chr
-        a[i+1] = (Utagx | ((u>>12)&Umaskx)).chr
-        a[i+2] = (Utagx | ((u>>6)&Umaskx)).chr
-        a[i+3] = (Utagx | (u&Umaskx)).chr
+        a[i + 0] = (Utag4 | ((u >> 18) & 0xff)).chr
+        a[i + 1] = (Utagx | ((u >> 12) & Umaskx)).chr
+        a[i + 2] = (Utagx | ((u >> 6) & Umaskx)).chr
+        a[i + 3] = (Utagx | (u & Umaskx)).chr
         4
       end
     end
 
-
     def hexdec4(s)
-      if s.length != 4
-        raise Error, 'short'
-      end
-      (nibble(s[0])<<12) | (nibble(s[1])<<8) | (nibble(s[2])<<4) | nibble(s[3])
-    end
+      raise Error, "short" if s.length != 4
 
+      (nibble(s[0]) << 12) | (nibble(s[1]) << 8) | (nibble(s[2]) << 4) | nibble(s[3])
+    end
 
     def subst(u1, u2)
-      if Usurr1 <= u1 && u1 < Usurr2 && Usurr2 <= u2 && u2 < Usurr3
-        return ((u1-Usurr1)<<10) | (u2-Usurr2) + Usurrself
-      end
-      return Ucharerr
-    end
+      return ((u1 - Usurr1) << 10) | ((u2 - Usurr2) + Usurrself) if u1 >= Usurr1 && u1 < Usurr2 && u2 >= Usurr2 && u2 < Usurr3
 
+      Ucharerr
+    end
 
     def surrogate?(u)
-      Usurr1 <= u && u < Usurr3
+      u >= Usurr1 && u < Usurr3
     end
 
-
     def nibble(c)
-      if ?0 <= c && c <= ?9 then c.ord - ?0.ord
-      elsif ?a <= c && c <= ?z then c.ord - ?a.ord + 10
-      elsif ?A <= c && c <= ?Z then c.ord - ?A.ord + 10
+      if c >= "0" && c <= "9" then c.ord - "0".ord
+      elsif c >= "a" && c <= "z" then c.ord - "a".ord + 10
+      elsif c >= "A" && c <= "Z" then c.ord - "A".ord + 10
       else
         raise Error, "invalid hex code #{c}"
       end
     end
 
-
     def objenc(x)
-      '{' + x.map{|k,v| keyenc(k) + ':' + valenc(v)}.join(',') + '}'
+      "{" + x.map { |k, v| keyenc(k) + ":" + valenc(v) }.join(",") + "}"
     end
 
-
     def arrenc(a)
-      '[' + a.map{|x| valenc(x)}.join(',') + ']'
+      "[" + a.map { |x| valenc(x) }.join(",") + "]"
     end
 
-
     def keyenc(k)
       case k
       when String then strenc(k)
@@ -446,37 +390,34 @@ module MultiJson
       end
     end
 
-
     def strenc(s)
       t = StringIO.new
-      t.putc(?")
+      t.putc('"')
       r = 0
 
       while r < s.length
         case s[r]
-        when ?"  then t.print('\\"')
-        when ?\\ then t.print('\\\\')
-        when ?\b then t.print('\\b')
-        when ?\f then t.print('\\f')
-        when ?\n then t.print('\\n')
-        when ?\r then t.print('\\r')
-        when ?\t then t.print('\\t')
+        when '"' then t.print('\\"')
+        when "\\" then t.print("\\\\")
+        when "\b" then t.print('\\b')
+        when "\f" then t.print('\\f')
+        when "\n" then t.print('\\n')
+        when "\r" then t.print('\\r')
+        when "\t" then t.print('\\t')
         else
           c = s[r]
           # In ruby >= 1.9, s[r] is a codepoint, not a byte.
           if rubydoesenc?
             begin
               # c.ord will raise an error if c is invalid UTF-8
-              if c.ord < Spc.ord
-                c = "\\u%04x" % [c.ord]
-              end
+              c = "\\u%04x" % [c.ord] if c.ord < Spc.ord
               t.write(c)
             rescue
               t.write(Ustrerr)
             end
           elsif c < Spc
             t.write("\\u%04x" % c)
-          elsif Spc <= c && c <= ?~
+          elsif c >= Spc && c <= "~"
             t.putc(c)
           else
             n = ucharcopy(t, s, r) # ensure valid UTF-8 output
@@ -485,18 +426,15 @@ module MultiJson
         end
         r += 1
       end
-      t.putc(?")
+      t.putc('"')
       t.string
     end
 
-
     def numenc(x)
-      if ((x.nan? || x.infinite?) rescue false)
-        raise Error, "Numeric cannot be represented: #{x}"
-      end
-      "#{x}"
-    end
+      raise Error, "Numeric cannot be represented: #{x}" if (x.nan? || x.infinite? rescue false)
 
+      x.to_s
+    end
 
     # Copies the valid UTF-8 bytes of a single character
     # from string s at position i to I/O object t, and
@@ -518,12 +456,14 @@ module MultiJson
       raise Utf8Error if c0 < Utag2 # unexpected continuation byte?
 
       raise Utf8Error if n < 2 # need continuation byte
-      c1 = s[i+1].ord
-      raise Utf8Error if c1 < Utagx || Utag2 <= c1
+
+      c1 = s[i + 1].ord
+      raise Utf8Error if c1 < Utagx || c1 >= Utag2
 
       # 2-byte, 11-bit sequence?
       if c0 < Utag3
-        raise Utf8Error if ((c0&Umask2)<<6 | (c1&Umaskx)) <= Uchar1max
+        raise Utf8Error if (((c0 & Umask2) << 6) | (c1 & Umaskx)) <= Uchar1max
+
         t.putc(c0)
         t.putc(c1)
         return 2
@@ -532,13 +472,14 @@ module MultiJson
       # need second continuation byte
       raise Utf8Error if n < 3
 
-      c2 = s[i+2].ord
-      raise Utf8Error if c2 < Utagx || Utag2 <= c2
+      c2 = s[i + 2].ord
+      raise Utf8Error if c2 < Utagx || c2 >= Utag2
 
       # 3-byte, 16-bit sequence?
       if c0 < Utag4
-        u = (c0&Umask3)<<12 | (c1&Umaskx)<<6 | (c2&Umaskx)
+        u = ((c0 & Umask3) << 12) | ((c1 & Umaskx) << 6) | (c2 & Umaskx)
         raise Utf8Error if u <= Uchar2max
+
         t.putc(c0)
         t.putc(c1)
         t.putc(c2)
@@ -547,13 +488,15 @@ module MultiJson
 
       # need third continuation byte
       raise Utf8Error if n < 4
-      c3 = s[i+3].ord
-      raise Utf8Error if c3 < Utagx || Utag2 <= c3
+
+      c3 = s[i + 3].ord
+      raise Utf8Error if c3 < Utagx || c3 >= Utag2
 
       # 4-byte, 21-bit sequence?
       if c0 < Utag5
-        u = (c0&Umask4)<<18 | (c1&Umaskx)<<12 | (c2&Umaskx)<<6 | (c3&Umaskx)
+        u = ((c0 & Umask4) << 18) | ((c1 & Umaskx) << 12) | ((c2 & Umaskx) << 6) | (c3 & Umaskx)
         raise Utf8Error if u <= Uchar3max
+
         t.putc(c0)
         t.putc(c1)
         t.putc(c2)
@@ -564,23 +507,19 @@ module MultiJson
       raise Utf8Error
     rescue Utf8Error
       t.write(Ustrerr)
-      return 1
+      1
     end
 
-
     def rubydoesenc?
       ::String.method_defined?(:force_encoding)
     end
 
-
     class Utf8Error < ::StandardError
     end
 
-
     class Error < ::StandardError
     end
 
-
     Utagx = 0b1000_0000
     Utag2 = 0b1100_0000
     Utag3 = 0b1110_0000
@@ -590,9 +529,9 @@ module MultiJson
     Umask2 = 0b0001_1111
     Umask3 = 0b0000_1111
     Umask4 = 0b0000_0111
-    Uchar1max = (1<<7) - 1
-    Uchar2max = (1<<11) - 1
-    Uchar3max = (1<<16) - 1
+    Uchar1max = (1 << 7) - 1
+    Uchar2max = (1 << 11) - 1
+    Uchar3max = (1 << 16) - 1
     Ucharerr = 0xFFFD # unicode "replacement char"
     Ustrerr = "\xef\xbf\xbd" # unicode "replacement char"
     Usurrself = 0x10000
@@ -600,7 +539,7 @@ module MultiJson
     Usurr2 = 0xdc00
     Usurr3 = 0xe000
 
-    Spc = ' '[0]
-    Unesc = {?b=>?\b, ?f=>?\f, ?n=>?\n, ?r=>?\r, ?t=>?\t}
+    Spc = " "[0]
+    Unesc = {"b" => "\b", "f" => "\f", "n" => "\n", "r" => "\r", "t" => "\t"}
   end
 end