oreorenasass 3.4.4 → 3.4.5

data/lib/sass/script/literal.rb

@@ -0,0 +1,221 @@
+module Sass::Script
+  # The abstract superclass for SassScript objects.
+  #
+  # Many of these methods, especially the ones that correspond to SassScript operations,
+  # are designed to be overridden by subclasses which may change the semantics somewhat.
+  # The operations listed here are just the defaults.
+  class Literal < Node
+    require 'sass/script/string'
+    require 'sass/script/number'
+    require 'sass/script/color'
+    require 'sass/script/bool'
+    require 'sass/script/null'
+    require 'sass/script/list'
+    require 'sass/script/arg_list'
+
+    # Returns the Ruby value of the literal.
+    # The type of this value varies based on the subclass.
+    #
+    # @return [Object]
+    attr_reader :value
+
+    # Creates a new literal.
+    #
+    # @param value [Object] The object for \{#value}
+    def initialize(value = nil)
+      @value = value
+      super()
+    end
+
+    # Returns an empty array.
+    #
+    # @return [Array<Node>] empty
+    # @see Node#children
+    def children
+      []
+    end
+
+    # @see Node#deep_copy
+    def deep_copy
+      dup
+    end
+
+    # Returns the options hash for this node.
+    #
+    # @return [{Symbol => Object}]
+    # @raise [Sass::SyntaxError] if the options hash hasn't been set.
+    #   This should only happen when the literal was created
+    #   outside of the parser and \{#to\_s} was called on it
+    def options
+      opts = super
+      return opts if opts
+      raise Sass::SyntaxError.new(<<MSG)
+The #options attribute is not set on this #{self.class}.
+  This error is probably occurring because #to_s was called
+  on this literal within a custom Sass function without first
+  setting the #option attribute.
+MSG
+    end
+
+    # The SassScript `==` operation.
+    # **Note that this returns a {Sass::Script::Bool} object,
+    # not a Ruby boolean**.
+    #
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Bool] True if this literal is the same as the other,
+    #   false otherwise
+    def eq(other)
+      Sass::Script::Bool.new(self.class == other.class && self.value == other.value)
+    end
+
+    # The SassScript `!=` operation.
+    # **Note that this returns a {Sass::Script::Bool} object,
+    # not a Ruby boolean**.
+    #
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Bool] False if this literal is the same as the other,
+    #   true otherwise
+    def neq(other)
+      Sass::Script::Bool.new(!eq(other).to_bool)
+    end
+
+    # The SassScript `==` operation.
+    # **Note that this returns a {Sass::Script::Bool} object,
+    # not a Ruby boolean**.
+    #
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Bool] True if this literal is the same as the other,
+    #   false otherwise
+    def unary_not
+      Sass::Script::Bool.new(!to_bool)
+    end
+
+    # The SassScript `=` operation
+    # (used for proprietary MS syntax like `alpha(opacity=20)`).
+    #
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Script::String] A string containing both literals
+    #   separated by `"="`
+    def single_eq(other)
+      Sass::Script::String.new("#{self.to_s}=#{other.to_s}")
+    end
+
+    # The SassScript `+` operation.
+    #
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Script::String] A string containing both literals
+    #   without any separation
+    def plus(other)
+      if other.is_a?(Sass::Script::String)
+        return Sass::Script::String.new(self.to_s + other.value, other.type)
+      end
+      Sass::Script::String.new(self.to_s + other.to_s)
+    end
+
+    # The SassScript `-` operation.
+    #
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Script::String] A string containing both literals
+    #   separated by `"-"`
+    def minus(other)
+      Sass::Script::String.new("#{self.to_s}-#{other.to_s}")
+    end
+
+    # The SassScript `/` operation.
+    #
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Script::String] A string containing both literals
+    #   separated by `"/"`
+    def div(other)
+      Sass::Script::String.new("#{self.to_s}/#{other.to_s}")
+    end
+
+    # The SassScript unary `+` operation (e.g. `+$a`).
+    #
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Script::String] A string containing the literal
+    #   preceded by `"+"`
+    def unary_plus
+      Sass::Script::String.new("+#{self.to_s}")
+    end
+
+    # The SassScript unary `-` operation (e.g. `-$a`).
+    #
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Script::String] A string containing the literal
+    #   preceded by `"-"`
+    def unary_minus
+      Sass::Script::String.new("-#{self.to_s}")
+    end
+
+    # The SassScript unary `/` operation (e.g. `/$a`).
+    #
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Script::String] A string containing the literal
+    #   preceded by `"/"`
+    def unary_div
+      Sass::Script::String.new("/#{self.to_s}")
+    end
+
+    # @return [String] A readable representation of the literal
+    def inspect
+      value.inspect
+    end
+
+    # @return [Boolean] `true` (the Ruby boolean value)
+    def to_bool
+      true
+    end
+
+    # Compares this object with another.
+    #
+    # @param other [Object] The object to compare with
+    # @return [Boolean] Whether or not this literal is equivalent to `other`
+    def ==(other)
+      eq(other).to_bool
+    end
+
+    # @return [Fixnum] The integer value of this literal
+    # @raise [Sass::SyntaxError] if this literal isn't an integer
+    def to_i
+      raise Sass::SyntaxError.new("#{self.inspect} is not an integer.")
+    end
+
+    # @raise [Sass::SyntaxError] if this literal isn't an integer
+    def assert_int!; to_i; end
+
+    # Returns the value of this literal as a list.
+    # Single literals are considered the same as single-element lists.
+    #
+    # @return [Array<Literal>] The of this literal as a list
+    def to_a
+      [self]
+    end
+
+    # Returns the string representation of this literal
+    # as it would be output to the CSS document.
+    #
+    # @return [String]
+    def to_s(opts = {})
+      raise Sass::SyntaxError.new("[BUG] All subclasses of Sass::Literal must implement #to_s.")
+    end
+    alias_method :to_sass, :to_s
+
+    # Returns whether or not this object is null.
+    #
+    # @return [Boolean] `false`
+    def null?
+      false
+    end
+
+    protected
+
+    # Evaluates the literal.
+    #
+    # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
+    # @return [Literal] This literal
+    def _perform(environment)
+      self
+    end
+  end
+end

data/lib/sass/script/{tree/node.rb → node.rb}

@@ -1,4 +1,4 @@
-module Sass::Script::Tree
+module Sass::Script
   # The abstract superclass for SassScript parse tree nodes.
   #
   # Use \{#perform} to evaluate a parse tree.
@@ -13,16 +13,6 @@ module Sass::Script::Tree
     # @return [Fixnum]
     attr_accessor :line
 
-    # The source range in the document on which this node appeared.
-    #
-    # @return [Sass::Source::Range]
-    attr_accessor :source_range
-
-    # The file name of the document on which this node appeared.
-    #
-    # @return [String]
-    attr_accessor :filename
-
     # Sets the options hash for this node,
     # as well as for all child nodes.
     # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
@@ -32,7 +22,7 @@ module Sass::Script::Tree
       @options = options
       children.each do |c|
         if c.is_a? Hash
-          c.values.each {|v| v.options = options}
+          c.values.each {|v| v.options = options }
         else
           c.options = options
         end
@@ -45,7 +35,7 @@ module Sass::Script::Tree
     # instead, override \{#\_perform}.
     #
     # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
-    # @return [Sass::Script::Value] The SassScript object that is the value of the SassScript
+    # @return [Literal] The SassScript object that is the value of the SassScript
     def perform(environment)
       _perform(environment)
     rescue Sass::SyntaxError => e
@@ -80,30 +70,30 @@ module Sass::Script::Tree
     # Converts underscores to dashes if the :dasherize option is set.
     def dasherize(s, opts)
       if opts[:dasherize]
-        s.gsub(/_/, '-')
+        s.gsub(/_/,'-')
       else
         s
       end
     end
 
     # Evaluates this node.
-    # Note that all {Sass::Script::Value} objects created within this method
+    # Note that all {Literal} objects created within this method
     # should have their \{#options} attribute set, probably via \{#opts}.
     #
     # @param environment [Sass::Environment] The environment in which to evaluate the SassScript
-    # @return [Sass::Script::Value] The SassScript object that is the value of the SassScript
+    # @return [Literal] The SassScript object that is the value of the SassScript
     # @see #perform
     def _perform(environment)
       Sass::Util.abstract(self)
     end
 
-    # Sets the \{#options} field on the given value and returns it.
+    # Sets the \{#options} field on the given literal and returns it
     #
-    # @param value [Sass::Script::Value]
-    # @return [Sass::Script::Value]
-    def opts(value)
-      value.options = options
-      value
+    # @param literal [Literal]
+    # @return [Literal]
+    def opts(literal)
+      literal.options = options
+      literal
     end
   end
 end

data/lib/sass/script/{value/null.rb → null.rb}

@@ -1,18 +1,11 @@
-module Sass::Script::Value
-  # A SassScript object representing a null value.
-  class Null < Base
-    # The null value in SassScript.
-    #
-    # This is assigned before new is overridden below so that we use the default implementation.
-    NULL = new(nil)
+require 'sass/script/literal'
 
-    # We override object creation so that users of the core API
-    # will not need to know that null is a specific constant.
-    #
-    # @private
-    # @return [Null] the {NULL} constant.
-    def self.new
-      NULL
+module Sass::Script
+  # A SassScript object representing a null value.
+  class Null < Literal
+    # Creates a new null literal.
+    def initialize
+      super nil
     end
 
     # @return [Boolean] `false` (the Ruby boolean value)

data/lib/sass/script/{value/number.rb → number.rb}

@@ -1,4 +1,6 @@
-module Sass::Script::Value
+require 'sass/script/literal'
+
+module Sass::Script
   # A SassScript object representing a number.
   # SassScript numbers can have decimal values,
   # and can also have units.
@@ -7,7 +9,7 @@ module Sass::Script::Value
   #
   # Numbers can also have more complex units, such as `1px*em/in`.
   # These cannot be inputted directly in Sass code at the moment.
-  class Number < Base
+  class Number < Literal
     # The Ruby value of the number.
     #
     # @return [Numeric]
@@ -15,7 +17,7 @@ module Sass::Script::Value
 
     # A list of units in the numerator of the number.
     # For example, `1px*em/in*cm` would return `["px", "em"]`
-    # @return [Array<String>]
+    # @return [Array<String>] 
     attr_reader :numerator_units
 
     # A list of units in the denominator of the number.
@@ -51,15 +53,24 @@ module Sass::Script::Value
       @precision_factor ||= 10.0**precision
     end
 
+    # Handles the deprecation warning for the PRECISION constant
+    # This can be removed in 3.2.
+    def self.const_missing(const)
+      if const == :PRECISION
+        Sass::Util.sass_warn("Sass::Script::Number::PRECISION is deprecated and will be removed in a future release. Use Sass::Script::Number.precision_factor instead.")
+        const_set(:PRECISION, self.precision_factor)
+      else
+        super
+      end
+    end
+
     # Used so we don't allocate two new arrays for each new number.
     NO_UNITS  = []
 
     # @param value [Numeric] The value of the number
-    # @param numerator_units [::String, Array<::String>] See \{#numerator\_units}
-    # @param denominator_units [::String, Array<::String>] See \{#denominator\_units}
+    # @param numerator_units [Array<String>] See \{#numerator\_units}
+    # @param denominator_units [Array<String>] See \{#denominator\_units}
     def initialize(value, numerator_units = NO_UNITS, denominator_units = NO_UNITS)
-      numerator_units = [numerator_units] if numerator_units.is_a?(::String)
-      denominator_units = [denominator_units] if denominator_units.is_a?(::String)
       super(value)
       @numerator_units = numerator_units
       @denominator_units = denominator_units
@@ -75,11 +86,11 @@ module Sass::Script::Value
     # {Color}
     # : Adds this number to each of the RGB color channels.
     #
-    # {Value}
-    # : See {Value::Base#plus}.
+    # {Literal}
+    # : See {Literal#plus}.
     #
-    # @param other [Value] The right-hand side of the operator
-    # @return [Value] The result of the operation
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Literal] The result of the operation
     # @raise [Sass::UnitConversionError] if `other` is a number with incompatible units
     def plus(other)
       if other.is_a? Number
@@ -97,11 +108,11 @@ module Sass::Script::Value
     # {Number}
     # : Subtracts this number from the other, converting units if possible.
     #
-    # {Value}
-    # : See {Value::Base#minus}.
+    # {Literal}
+    # : See {Literal#minus}.
     #
-    # @param other [Value] The right-hand side of the operator
-    # @return [Value] The result of the operation
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Literal] The result of the operation
     # @raise [Sass::UnitConversionError] if `other` is a number with incompatible units
     def minus(other)
       if other.is_a? Number
@@ -153,16 +164,16 @@ module Sass::Script::Value
     # {Number}
     # : Divides this number by the other, converting units appropriately.
     #
-    # {Value}
-    # : See {Value::Base#div}.
+    # {Literal}
+    # : See {Literal#div}.
     #
-    # @param other [Value] The right-hand side of the operator
-    # @return [Value] The result of the operation
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Literal] The result of the operation
     def div(other)
       if other.is_a? Number
         res = operate(other, :/)
-        if original && other.original
-          res.original = "#{original}/#{other.original}"
+        if self.original && other.original
+          res.original = "#{self.original}/#{other.original}"
         end
         res
       else
@@ -175,9 +186,12 @@ module Sass::Script::Value
     # @param other [Number] The right-hand side of the operator
     # @return [Number] This number modulo the other
     # @raise [NoMethodError] if `other` is an invalid type
-    # @raise [Sass::UnitConversionError] if `other` has incompatible units
+    # @raise [Sass::UnitConversionError] if `other` has any units
     def mod(other)
       if other.is_a?(Number)
+        unless other.unitless?
+          raise Sass::UnitConversionError.new("Cannot modulo by a number with units: #{other.inspect}.")
+        end
         operate(other, :%)
       else
         raise NoMethodError.new(nil, :mod)
@@ -186,10 +200,10 @@ module Sass::Script::Value
 
     # The SassScript `==` operation.
     #
-    # @param other [Value] The right-hand side of the operator
+    # @param other [Literal] The right-hand side of the operator
     # @return [Boolean] Whether this number is equal to the other object
     def eq(other)
-      return Bool::FALSE unless other.is_a?(Sass::Script::Value::Number)
+      return Sass::Script::Bool.new(false) unless other.is_a?(Sass::Script::Number)
       this = self
       begin
         if unitless?
@@ -198,21 +212,10 @@ module Sass::Script::Value
           other = other.coerce(@numerator_units, @denominator_units)
         end
       rescue Sass::UnitConversionError
-        return Bool::FALSE
+        return Sass::Script::Bool.new(false)
       end
-      Bool.new(this.value == other.value)
-    end
-
-    def hash
-      [value, numerator_units, denominator_units].hash
-    end
 
-    # Hash-equality works differently than `==` equality for numbers.
-    # Hash-equality must be transitive, so it just compares the exact value,
-    # numerator units, and denominator units.
-    def eql?(other)
-      value == other.value && numerator_units == other.numerator_units &&
-        denominator_units == other.denominator_units
+      Sass::Script::Bool.new(this.value == other.value)
     end
 
     # The SassScript `>` operation.
@@ -271,17 +274,8 @@ module Sass::Script::Value
     #
     # @return [String] The representation
     def inspect(opts = {})
-      return original if original
-
       value = self.class.round(self.value)
-      str = value.to_s
-
-      # Ruby will occasionally print in scientific notation if the number is
-      # small enough. That's technically valid CSS, but it's not well-supported
-      # and confusing.
-      str = ("%0.#{self.class.precision}f" % value).gsub(/0*$/, '') if str.include?('e')
-
-      unitless? ? str : "#{str}#{unit_str}"
+      unitless? ? value.to_s : "#{value}#{unit_str}"
     end
     alias_method :to_sass, :inspect
 
@@ -289,7 +283,7 @@ module Sass::Script::Value
     # @raise [Sass::SyntaxError] if the number isn't an integer
     def to_i
       super unless int?
-      value
+      return value
     end
 
     # @return [Boolean] Whether or not this number is an integer.
@@ -302,24 +296,6 @@ module Sass::Script::Value
       @numerator_units.empty? && @denominator_units.empty?
     end
 
-    # Checks whether the number has the numerator unit specified.
-    #
-    # @example
-    #   number = Sass::Script::Value::Number.new(10, "px")
-    #   number.is_unit?("px") => true
-    #   number.is_unit?(nil) => false
-    #
-    # @param unit [::String, nil] The unit the number should have or nil if the number
-    #   should be unitless.
-    # @see Number#unitless? The unitless? method may be more readable.
-    def is_unit?(unit)
-      if unit
-        denominator_units.size == 0 && numerator_units.size == 1 && numerator_units.first == unit
-      else
-        unitless?
-      end
-    end
-
     # @return [Boolean] Whether or not this number has units that can be represented in CSS
     #   (that is, zero or one \{#numerator\_units}).
     def legal_units?
@@ -344,9 +320,9 @@ module Sass::Script::Value
     #   current units
     def coerce(num_units, den_units)
       Number.new(if unitless?
-                   value
+                   self.value
                  else
-                   value * coercion_factor(@numerator_units, num_units) /
+                   self.value * coercion_factor(@numerator_units, num_units) /
                      coercion_factor(@denominator_units, den_units)
                  end, num_units, den_units)
     end
@@ -354,10 +330,12 @@ module Sass::Script::Value
     # @param other [Number] A number to decide if it can be compared with this number.
     # @return [Boolean] Whether or not this number can be compared with the other.
     def comparable_to?(other)
-      operate(other, :+)
-      true
-    rescue Sass::UnitConversionError
-      false
+      begin
+        operate(other, :+)
+        true
+      rescue Sass::UnitConversionError
+        false
+      end
     end
 
     # Returns a human readable representation of the units in this number.
@@ -382,11 +360,11 @@ module Sass::Script::Value
       elsif num % 1 == 0.0
         num.to_i
       else
-        ((num * precision_factor).round / precision_factor).to_f
+        ((num * self.precision_factor).round / self.precision_factor).to_f
       end
     end
 
-    OPERATIONS = [:+, :-, :<=, :<, :>, :>=, :%]
+    OPERATIONS = [:+, :-, :<=, :<, :>, :>=]
 
     def operate(other, operation)
       this = self
@@ -398,7 +376,7 @@ module Sass::Script::Value
         end
       end
       # avoid integer division
-      value = :/ == operation ? this.value.to_f : this.value
+      value = (:/ == operation) ? this.value.to_f : this.value
       result = value.send(operation, other.value)
 
       if result.is_a?(Numeric)
@@ -413,33 +391,29 @@ module Sass::Script::Value
       from_units, to_units = sans_common_units(from_units, to_units)
 
       if from_units.size != to_units.size || !convertable?(from_units | to_units)
-        raise Sass::UnitConversionError.new(
-          "Incompatible units: '#{from_units.join('*')}' and '#{to_units.join('*')}'.")
+        raise Sass::UnitConversionError.new("Incompatible units: '#{from_units.join('*')}' and '#{to_units.join('*')}'.")
       end
 
-      from_units.zip(to_units).inject(1) {|m, p| m * conversion_factor(p[0], p[1])}
+      from_units.zip(to_units).inject(1) {|m,p| m * conversion_factor(p[0], p[1]) }
     end
 
     def compute_units(this, other, operation)
       case operation
       when :*
-        [this.numerator_units + other.numerator_units,
-         this.denominator_units + other.denominator_units]
+        [this.numerator_units + other.numerator_units, this.denominator_units + other.denominator_units]
       when :/
-        [this.numerator_units + other.denominator_units,
-         this.denominator_units + other.numerator_units]
-      else
+        [this.numerator_units + other.denominator_units, this.denominator_units + other.numerator_units]
+      else  
         [this.numerator_units, this.denominator_units]
       end
     end
 
     def normalize!
       return if unitless?
-      @numerator_units, @denominator_units =
-        sans_common_units(@numerator_units, @denominator_units)
+      @numerator_units, @denominator_units = sans_common_units(@numerator_units, @denominator_units)
 
       @denominator_units.each_with_index do |d, i|
-        if convertable?(d) && (u = @numerator_units.find(&method(:convertable?)))
+        if convertable?(d) && (u = @numerator_units.detect(&method(:convertable?)))
           @value /= conversion_factor(d, u)
           @denominator_units.delete_at(i)
           @numerator_units.delete_at(@numerator_units.index(u))
@@ -447,84 +421,33 @@ module Sass::Script::Value
       end
     end
 
-    # This is the source data for all the unit logic. It's pre-processed to make
-    # it efficient to figure out whether a set of units is mutually compatible
-    # and what the conversion ratio is between two units.
-    #
-    # These come from http://www.w3.org/TR/2012/WD-css3-values-20120308/.
-    relative_sizes = [
-      {
-        'in' => Rational(1),
-        'cm' => Rational(1, 2.54),
-        'pc' => Rational(1, 6),
-        'mm' => Rational(1, 25.4),
-        'pt' => Rational(1, 72),
-        'px' => Rational(1, 96)
-      },
-      {
-        'deg'  => Rational(1, 360),
-        'grad' => Rational(1, 400),
-        'rad'  => Rational(1, 2 * Math::PI),
-        'turn' => Rational(1)
-      },
-      {
-        's'  => Rational(1),
-        'ms' => Rational(1, 1000)
-      },
-      {
-        'Hz'  => Rational(1),
-        'kHz' => Rational(1000)
-      },
-      {
-        'dpi'  => Rational(1),
-        'dpcm' => Rational(1, 2.54),
-        'dppx' => Rational(1, 96)
-      }
-    ]
-
-    # A hash from each known unit to the set of units that it's mutually
-    # convertible with.
-    MUTUALLY_CONVERTIBLE = {}
-    relative_sizes.map do |values|
-      set = values.keys.to_set
-      values.keys.each {|name| MUTUALLY_CONVERTIBLE[name] = set}
-    end
-
-    # A two-dimensional hash from two units to the conversion ratio between
-    # them. Multiply `X` by `CONVERSION_TABLE[X][Y]` to convert it to `Y`.
-    CONVERSION_TABLE = {}
-    relative_sizes.each do |values|
-      values.each do |(name1, value1)|
-        CONVERSION_TABLE[name1] ||= {}
-        values.each do |(name2, value2)|
-          value = value1 / value2
-          CONVERSION_TABLE[name1][name2] = value.denominator == 1 ? value.to_i : value.to_f
-        end
-      end
-    end
+    # A hash of unit names to their index in the conversion table
+    CONVERTABLE_UNITS = {"in" => 0,        "cm" => 1,    "pc" => 2,    "mm" => 3,   "pt" => 4,  "px" => 5    }
+    CONVERSION_TABLE = [[ 1,                2.54,         6,            25.4,        72        , 96          ], # in
+                        [ nil,              1,            2.36220473,   10,          28.3464567, 37.795275591], # cm
+                        [ nil,              nil,          1,            4.23333333,  12        , 16          ], # pc
+                        [ nil,              nil,          nil,          1,           2.83464567, 3.7795275591], # mm
+                        [ nil,              nil,          nil,          nil,         1         , 1.3333333333], # pt
+                        [ nil,              nil,          nil,          nil,         nil       , 1           ]] # px
 
     def conversion_factor(from_unit, to_unit)
-      CONVERSION_TABLE[from_unit][to_unit]
+      res = CONVERSION_TABLE[CONVERTABLE_UNITS[from_unit]][CONVERTABLE_UNITS[to_unit]]
+      return 1.0 / conversion_factor(to_unit, from_unit) if res.nil?
+      res
     end
 
     def convertable?(units)
-      units = Array(units).to_set
-      return true if units.empty?
-      return false unless (mutually_convertible = MUTUALLY_CONVERTIBLE[units.first])
-      units.subset?(mutually_convertible)
+      Array(units).all? {|u| CONVERTABLE_UNITS.include?(u)}
     end
 
     def sans_common_units(units1, units2)
       units2 = units2.dup
       # Can't just use -, because we want px*px to coerce properly to px*mm
-      units1 = units1.map do |u|
-        j = units2.index(u)
-        next u unless j
+      return units1.map do |u|
+        next u unless j = units2.index(u)
         units2.delete_at(j)
         nil
-      end
-      units1.compact!
-      return units1, units2
+      end.compact, units2
     end
   end
 end