sass 3.4.25 → 3.5.0

data/lib/sass/util/multibyte_string_scanner.rb

@@ -1,155 +1,151 @@
 require 'strscan'
 
-if Sass::Util.ruby1_8?
-  Sass::Util::MultibyteStringScanner = StringScanner
-else
-  if Sass::Util.rbx?
-    # Rubinius's StringScanner class implements some of its methods in terms of
-    # others, which causes us to double-count bytes in some cases if we do
-    # straightforward inheritance. To work around this, we use a delegate class.
-    require 'delegate'
-    class Sass::Util::MultibyteStringScanner < DelegateClass(StringScanner)
-      def initialize(str)
-        super(StringScanner.new(str))
-        @mb_pos = 0
-        @mb_matched_size = nil
-        @mb_last_pos = nil
-      end
-
-      def is_a?(klass)
-        __getobj__.is_a?(klass) || super
-      end
+if Sass::Util.rbx?
+  # Rubinius's StringScanner class implements some of its methods in terms of
+  # others, which causes us to double-count bytes in some cases if we do
+  # straightforward inheritance. To work around this, we use a delegate class.
+  require 'delegate'
+  class Sass::Util::MultibyteStringScanner < DelegateClass(StringScanner)
+    def initialize(str)
+      super(StringScanner.new(str))
+      @mb_pos = 0
+      @mb_matched_size = nil
+      @mb_last_pos = nil
     end
-  else
-    class Sass::Util::MultibyteStringScanner < StringScanner
-      def initialize(str)
-        super
-        @mb_pos = 0
-        @mb_matched_size = nil
-        @mb_last_pos = nil
-      end
+
+    def is_a?(klass)
+      __getobj__.is_a?(klass) || super
     end
   end
-
-  # A wrapper of the native StringScanner class that works correctly with
-  # multibyte character encodings. The native class deals only in bytes, not
-  # characters, for methods like [#pos] and [#matched_size]. This class deals
-  # only in characters, instead.
-  class Sass::Util::MultibyteStringScanner
-    def self.new(str)
-      return StringScanner.new(str) if str.ascii_only?
+else
+  class Sass::Util::MultibyteStringScanner < StringScanner
+    def initialize(str)
       super
+      @mb_pos = 0
+      @mb_matched_size = nil
+      @mb_last_pos = nil
     end
+  end
+end
 
-    alias_method :byte_pos, :pos
-    alias_method :byte_matched_size, :matched_size
-
-    def check(pattern); _match super; end
-    def check_until(pattern); _matched super; end
-    def getch; _forward _match super; end
-    def match?(pattern); _size check(pattern); end
-    def matched_size; @mb_matched_size; end
-    def peek(len); string[@mb_pos, len]; end
-    alias_method :peep, :peek
-    def pos; @mb_pos; end
-    alias_method :pointer, :pos
-    def rest_size; rest.size; end
-    def scan(pattern); _forward _match super; end
-    def scan_until(pattern); _forward _matched super; end
-    def skip(pattern); _size scan(pattern); end
-    def skip_until(pattern); _matched _size scan_until(pattern); end
-
-    def get_byte
-      raise "MultibyteStringScanner doesn't support #get_byte."
-    end
+# A wrapper of the native StringScanner class that works correctly with
+# multibyte character encodings. The native class deals only in bytes, not
+# characters, for methods like [#pos] and [#matched_size]. This class deals
+# only in characters, instead.
+class Sass::Util::MultibyteStringScanner
+  def self.new(str)
+    return StringScanner.new(str) if str.ascii_only?
+    super
+  end
 
-    def getbyte
-      raise "MultibyteStringScanner doesn't support #getbyte."
-    end
+  alias_method :byte_pos, :pos
+  alias_method :byte_matched_size, :matched_size
+
+  def check(pattern); _match super; end
+  def check_until(pattern); _matched super; end
+  def getch; _forward _match super; end
+  def match?(pattern); _size check(pattern); end
+  def matched_size; @mb_matched_size; end
+  def peek(len); string[@mb_pos, len]; end
+  alias_method :peep, :peek
+  def pos; @mb_pos; end
+  alias_method :pointer, :pos
+  def rest_size; rest.size; end
+  def scan(pattern); _forward _match super; end
+  def scan_until(pattern); _forward _matched super; end
+  def skip(pattern); _size scan(pattern); end
+  def skip_until(pattern); _matched _size scan_until(pattern); end
+
+  def get_byte
+    raise "MultibyteStringScanner doesn't support #get_byte."
+  end
 
-    def pos=(n)
-      @mb_last_pos = nil
+  def getbyte
+    raise "MultibyteStringScanner doesn't support #getbyte."
+  end
 
-      # We set position kind of a lot during parsing, so we want it to be as
-      # efficient as possible. This is complicated by the fact that UTF-8 is a
-      # variable-length encoding, so it's difficult to find the byte length that
-      # corresponds to a given character length.
-      #
-      # Our heuristic here is to try to count the fewest possible characters. So
-      # if the new position is close to the current one, just count the
-      # characters between the two; if the new position is closer to the
-      # beginning of the string, just count the characters from there.
-      if @mb_pos - n < @mb_pos / 2
-        # New position is close to old position
-        byte_delta = @mb_pos > n ? -string[n...@mb_pos].bytesize : string[@mb_pos...n].bytesize
-        super(byte_pos + byte_delta)
-      else
-        # New position is close to BOS
-        super(string[0...n].bytesize)
-      end
-      @mb_pos = n
-    end
+  def pos=(n)
+    @mb_last_pos = nil
+
+    # We set position kind of a lot during parsing, so we want it to be as
+    # efficient as possible. This is complicated by the fact that UTF-8 is a
+    # variable-length encoding, so it's difficult to find the byte length that
+    # corresponds to a given character length.
+    #
+    # Our heuristic here is to try to count the fewest possible characters. So
+    # if the new position is close to the current one, just count the
+    # characters between the two; if the new position is closer to the
+    # beginning of the string, just count the characters from there.
+    if @mb_pos - n < @mb_pos / 2
+      # New position is close to old position
+      byte_delta = @mb_pos > n ? -string[n...@mb_pos].bytesize : string[@mb_pos...n].bytesize
+      super(byte_pos + byte_delta)
+    else
+      # New position is close to BOS
+      super(string[0...n].bytesize)
+    end
+    @mb_pos = n
+  end
 
-    def reset
-      @mb_pos = 0
-      @mb_matched_size = nil
-      @mb_last_pos = nil
-      super
-    end
+  def reset
+    @mb_pos = 0
+    @mb_matched_size = nil
+    @mb_last_pos = nil
+    super
+  end
 
-    def scan_full(pattern, advance_pointer_p, return_string_p)
-      res = _match super(pattern, advance_pointer_p, true)
-      _forward res if advance_pointer_p
-      return res if return_string_p
-    end
+  def scan_full(pattern, advance_pointer_p, return_string_p)
+    res = _match super(pattern, advance_pointer_p, true)
+    _forward res if advance_pointer_p
+    return res if return_string_p
+  end
 
-    def search_full(pattern, advance_pointer_p, return_string_p)
-      res = super(pattern, advance_pointer_p, true)
-      _forward res if advance_pointer_p
-      _matched((res if return_string_p))
-    end
+  def search_full(pattern, advance_pointer_p, return_string_p)
+    res = super(pattern, advance_pointer_p, true)
+    _forward res if advance_pointer_p
+    _matched((res if return_string_p))
+  end
 
-    def string=(str)
-      @mb_pos = 0
-      @mb_matched_size = nil
-      @mb_last_pos = nil
-      super
-    end
+  def string=(str)
+    @mb_pos = 0
+    @mb_matched_size = nil
+    @mb_last_pos = nil
+    super
+  end
 
-    def terminate
-      @mb_pos = string.size
-      @mb_matched_size = nil
-      @mb_last_pos = nil
-      super
-    end
-    alias_method :clear, :terminate
+  def terminate
+    @mb_pos = string.size
+    @mb_matched_size = nil
+    @mb_last_pos = nil
+    super
+  end
+  alias_method :clear, :terminate
 
-    def unscan
-      super
-      @mb_pos = @mb_last_pos
-      @mb_last_pos = @mb_matched_size = nil
-    end
+  def unscan
+    super
+    @mb_pos = @mb_last_pos
+    @mb_last_pos = @mb_matched_size = nil
+  end
 
-    private
+  private
 
-    def _size(str)
-      str && str.size
-    end
+  def _size(str)
+    str && str.size
+  end
 
-    def _match(str)
-      @mb_matched_size = str && str.size
-      str
-    end
+  def _match(str)
+    @mb_matched_size = str && str.size
+    str
+  end
 
-    def _matched(res)
-      _match matched
-      res
-    end
+  def _matched(res)
+    _match matched
+    res
+  end
 
-    def _forward(str)
-      @mb_last_pos = @mb_pos
-      @mb_pos += str.size if str
-      str
-    end
+  def _forward(str)
+    @mb_last_pos = @mb_pos
+    @mb_pos += str.size if str
+    str
   end
 end

data/lib/sass/util/normalized_map.rb

@@ -5,12 +5,11 @@ module Sass
     # A hash that normalizes its string keys while still allowing you to get back
     # to the original keys that were stored. If several different values normalize
     # to the same value, whichever is stored last wins.
-    require 'sass/util/ordered_hash' if ruby1_8?
     class NormalizedMap
       # Create a normalized map
       def initialize(map = nil)
         @key_strings = {}
-        @map = Util.ruby1_8? ? OrderedHash.new : {}
+        @map = {}
 
         map.each {|key, value| self[key] = value} if map
       end
@@ -115,12 +114,6 @@ module Sass
         @map.send(method, *args, &block)
       end
 
-      if Sass::Util.ruby1_8?
-        def respond_to?(method, include_private = false)
-          super || @map.respond_to?(method, include_private)
-        end
-      end
-
       def respond_to_missing?(method, include_private = false)
         @map.respond_to?(method, include_private)
       end