opal 1.3.2 → 1.4.0.alpha1

data/opal/corelib/string/encoding.rb

@@ -1,6 +1,6 @@
 require 'corelib/string'
 
-class Encoding
+class ::Encoding
   def self.register(name, options = {}, &block)
     names = [name] + (options[:aliases] || [])
     ascii = options[:ascii] || false
@@ -94,18 +94,18 @@ class Encoding
   end
 
   def each_byte(*)
-    raise NotImplementedError
+    ::Kernel.raise ::NotImplementedError
   end
 
   def bytesize(*)
-    raise NotImplementedError
+    ::Kernel.raise ::NotImplementedError
   end
 
-  class EncodingError < StandardError; end
-  class CompatibilityError < EncodingError; end
+  class ::EncodingError < ::StandardError; end
+  class ::CompatibilityError < ::EncodingError; end
 end
 
-Encoding.register 'UTF-8', aliases: ['CP65001'], ascii: true do
+::Encoding.register 'UTF-8', aliases: ['CP65001'], ascii: true do
   def each_byte(string, &block)
     %x{
       // Taken from: https://github.com/feross/buffer/blob/f52dffd9df0445b93c0c9065c2f8f0f46b2c729a/index.js#L1954-L2032
@@ -201,7 +201,7 @@ Encoding.register 'UTF-8', aliases: ['CP65001'], ascii: true do
   end
 end
 
-Encoding.register 'UTF-16LE' do
+::Encoding.register 'UTF-16LE' do
   def each_byte(string, &block)
     %x{
       for (var i = 0, length = string.length; i < length; i++) {
@@ -218,7 +218,7 @@ Encoding.register 'UTF-16LE' do
   end
 end
 
-Encoding.register 'UTF-16BE', inherits: Encoding::UTF_16LE do
+::Encoding.register 'UTF-16BE', inherits: ::Encoding::UTF_16LE do
   def each_byte(string, &block)
     %x{
       for (var i = 0, length = string.length; i < length; i++) {
@@ -231,7 +231,7 @@ Encoding.register 'UTF-16BE', inherits: Encoding::UTF_16LE do
   end
 end
 
-Encoding.register 'UTF-32LE' do
+::Encoding.register 'UTF-32LE' do
   def each_byte(string, &block)
     %x{
       for (var i = 0, length = string.length; i < length; i++) {
@@ -250,7 +250,7 @@ Encoding.register 'UTF-32LE' do
   end
 end
 
-Encoding.register 'UTF-32BE', inherits: Encoding::UTF_32LE do
+::Encoding.register 'UTF-32BE', inherits: ::Encoding::UTF_32LE do
   def each_byte(string, &block)
     %x{
       for (var i = 0, length = string.length; i < length; i++) {
@@ -265,7 +265,7 @@ Encoding.register 'UTF-32BE', inherits: Encoding::UTF_32LE do
   end
 end
 
-Encoding.register 'ASCII-8BIT', aliases: ['BINARY'], ascii: true do
+::Encoding.register 'ASCII-8BIT', aliases: ['BINARY'], ascii: true do
   def each_char(string, &block)
     %x{
       for (var i = 0, length = string.length; i < length; i++) {
@@ -298,15 +298,15 @@ Encoding.register 'ASCII-8BIT', aliases: ['BINARY'], ascii: true do
   end
 end
 
-Encoding.register 'ISO-8859-1', aliases: ['ISO8859-1'], ascii: true, inherits: Encoding::ASCII_8BIT
-Encoding.register 'US-ASCII', aliases: ['ASCII'], ascii: true, inherits: Encoding::ASCII_8BIT
+::Encoding.register 'ISO-8859-1', aliases: ['ISO8859-1'], ascii: true, inherits: ::Encoding::ASCII_8BIT
+::Encoding.register 'US-ASCII', aliases: ['ASCII'], ascii: true, inherits: ::Encoding::ASCII_8BIT
 
-class String
+class ::String
   attr_reader :encoding
   attr_reader :internal_encoding
-  `Opal.defineProperty(String.prototype, 'bytes', nil)`
-  `Opal.defineProperty(String.prototype, 'encoding', #{Encoding::UTF_8})`
-  `Opal.defineProperty(String.prototype, 'internal_encoding', #{Encoding::UTF_8})`
+  `Opal.prop(String.prototype, 'bytes', nil)`
+  `Opal.prop(String.prototype, 'encoding', #{::Encoding::UTF_8})`
+  `Opal.prop(String.prototype, 'internal_encoding', #{::Encoding::UTF_8})`
 
   def b
     dup.force_encoding('binary')
@@ -377,8 +377,8 @@ class String
 
       if (encoding === str.encoding) { return str; }
 
-      encoding = #{Opal.coerce_to!(encoding, String, :to_s)};
-      encoding = #{Encoding.find(encoding)};
+      encoding = #{::Opal.coerce_to!(encoding, ::String, :to_s)};
+      encoding = #{::Encoding.find(encoding)};
 
       if (encoding === str.encoding) { return str; }
 
@@ -390,7 +390,7 @@ class String
 
   def getbyte(idx)
     string_bytes = bytes
-    idx = Opal.coerce_to!(idx, Integer, :to_int)
+    idx = ::Opal.coerce_to!(idx, ::Integer, :to_int)
     return if string_bytes.length < idx
 
     string_bytes[idx]
@@ -415,4 +415,4 @@ class String
   end
 end
 
-Encoding.default_external = __ENCODING__
+::Encoding.default_external = __ENCODING__

data/opal/corelib/string/unpack.rb

@@ -1,7 +1,7 @@
 require 'base64'
 require 'corelib/pack_unpack/format_string_parser'
 
-class String
+class ::String
   %x{
     // Format Parser
     var eachDirectiveAndCount = Opal.PackUnpack.eachDirectiveAndCount;
@@ -305,7 +305,7 @@ class String
       }
 
       if (c >> 6 == 0x02) {
-        #{raise ArgumentError, 'malformed UTF-8 character'}
+        #{::Kernel.raise ::ArgumentError, 'malformed UTF-8 character'}
       }
 
       if (c >> 5 == 0x06) {
@@ -324,14 +324,14 @@ class String
         // 1111 110x (six bytes)
         extraLength = 5;
       } else {
-        #{raise 'malformed UTF-8 character'}
+        #{::Kernel.raise 'malformed UTF-8 character'}
       }
 
       if (extraLength > bytesLength) {
         #{
           expected = `extraLength + 1`
           given = `bytesLength + 1`
-          raise ArgumentError, "malformed UTF-8 character (expected #{expected} bytes, given #{given} bytes)"
+          ::Kernel.raise ::ArgumentError, "malformed UTF-8 character (expected #{expected} bytes, given #{given} bytes)"
         }
       }
 
@@ -343,7 +343,7 @@ class String
         c = readByte();
 
         if (c >> 6 != 0x02) {
-          #{raise 'Invalid multibyte sequence'}
+          #{::Kernel.raise 'Invalid multibyte sequence'}
         }
 
         result = (result << 6) | (c & 0x3f);
@@ -675,8 +675,9 @@ class String
     alias('L', 'V');
   }
 
-  def unpack(format)
-    format = Opal.coerce_to!(format, String, :to_str).gsub(/\s/, '').delete("\000")
+  def unpack(format, offset: 0)
+    ::Kernel.raise ::ArgumentError, "offset can't be negative" if offset < 0
+    format = ::Opal.coerce_to!(format, ::String, :to_str).gsub(/\s/, '').delete("\000")
 
     %x{
       var output = [];
@@ -689,7 +690,7 @@ class String
         var cp, j = 0;
 
         output = new Array(self.length);
-        for (var i = 0; i < self.length; i++) {
+        for (var i = offset; i < self.length; i++) {
           cp = output[j++] = self.codePointAt(i);
           if (cp > 0xffff) i++;
         }
@@ -698,6 +699,10 @@ class String
 
       var buffer = self.$bytes();
 
+      #{::Kernel.raise ::ArgumentError, 'offset outside of string' if offset > `buffer`.length}
+
+      buffer = buffer.slice(offset);
+
 
       // optimization
       var optimizedHandler = optimized[format];
@@ -718,7 +723,7 @@ class String
             chunkReader = readChunk[directive];
 
         if (chunkReader == null) {
-          #{raise "Unsupported unpack directive #{`directive`.inspect} (no chunk reader defined)"}
+          #{::Kernel.raise "Unsupported unpack directive #{`directive`.inspect} (no chunk reader defined)"}
         }
 
         var chunkData = chunkReader(buffer, count);
@@ -728,7 +733,7 @@ class String
         var handler = handlers[directive];
 
         if (handler == null) {
-          #{raise "Unsupported unpack directive #{`directive`.inspect} (no handler defined)"}
+          #{::Kernel.raise "Unsupported unpack directive #{`directive`.inspect} (no handler defined)"}
         }
 
         return handler(chunk);
@@ -741,7 +746,7 @@ class String
           var shouldAutocomplete = autocompletion[directive];
 
           if (shouldAutocomplete == null) {
-            #{raise "Unsupported unpack directive #{`directive`.inspect} (no autocompletion rule defined)"}
+            #{::Kernel.raise "Unsupported unpack directive #{`directive`.inspect} (no autocompletion rule defined)"}
           }
 
           if (shouldAutocomplete) {
@@ -756,9 +761,9 @@ class String
     }
   end
 
-  def unpack1(format)
-    format = Opal.coerce_to!(format, String, :to_str).gsub(/\s/, '').delete("\000")
+  def unpack1(format, offset: 0)
+    format = ::Opal.coerce_to!(format, ::String, :to_str).gsub(/\s/, '').delete("\000")
 
-    unpack(format[0])[0]
+    unpack(format[0], offset: offset)[0]
   end
 end