sass 3.3.0.alpha.149 → 3.3.0.alpha.162

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

@@ -1,6 +1,6 @@
-module Sass::Script
+module Sass::Script::Value
   # A SassScript object representing a boolean (true or false) value.
-  class Bool < Literal
+  class Bool < Base
     # The Ruby value of the boolean.
     #
     # @return [Boolean]

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

@@ -1,4 +1,4 @@
-module Sass::Script
+module Sass::Script::Value
   # A SassScript object representing a CSS color.
   #
   # A color may be represented internally as RGBA, HSLA, or both.
@@ -13,7 +13,7 @@ module Sass::Script
   # It's always stored, as 1 if nothing else is specified.
   # If only the alpha channel is modified using \{#with},
   # the cached RGB and HSL values are retained.
-  class Color < Literal
+  class Color < Base
     class << self; include Sass::Util; end
 
     # A hash from color names to `[red, green, blue]` value arrays.
@@ -345,14 +345,14 @@ module Sass::Script
     end
 
     # The SassScript `==` operation.
-    # **Note that this returns a {Sass::Script::Bool} object,
+    # **Note that this returns a {Sass::Script::Value::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,
+    # @param other [Value] The right-hand side of the operator
+    # @return [Bool] True if this value is the same as the other,
     #   false otherwise
     def eq(other)
-      Sass::Script::Bool.new(
+      Sass::Script::Value::Bool.new(
         other.is_a?(Color) && rgb == other.rgb && alpha == other.alpha)
     end
 
@@ -406,14 +406,14 @@ module Sass::Script
     # {Color}
     # : Adds each of the RGB color channels together.
     #
-    # {Literal}
-    # : See {Literal#plus}.
+    # {Value}
+    # : See {Value#plus}.
     #
-    # @param other [Literal] The right-hand side of the operator
+    # @param other [Value] The right-hand side of the operator
     # @return [Color] The resulting color
     # @raise [Sass::SyntaxError] if `other` is a number with units
     def plus(other)
-      if other.is_a?(Sass::Script::Number) || other.is_a?(Sass::Script::Color)
+      if other.is_a?(Sass::Script::Value::Number) || other.is_a?(Sass::Script::Value::Color)
         piecewise(other, :+)
       else
         super
@@ -429,14 +429,14 @@ module Sass::Script
     # {Color}
     # : Subtracts each of the other color's RGB color channels from this color's.
     #
-    # {Literal}
-    # : See {Literal#minus}.
+    # {Value}
+    # : See {Value#minus}.
     #
-    # @param other [Literal] The right-hand side of the operator
+    # @param other [Value] The right-hand side of the operator
     # @return [Color] The resulting color
     # @raise [Sass::SyntaxError] if `other` is a number with units
     def minus(other)
-      if other.is_a?(Sass::Script::Number) || other.is_a?(Sass::Script::Color)
+      if other.is_a?(Sass::Script::Value::Number) || other.is_a?(Sass::Script::Value::Color)
         piecewise(other, :-)
       else
         super
@@ -456,7 +456,7 @@ module Sass::Script
     # @return [Color] The resulting color
     # @raise [Sass::SyntaxError] if `other` is a number with units
     def times(other)
-      if other.is_a?(Sass::Script::Number) || other.is_a?(Sass::Script::Color)
+      if other.is_a?(Sass::Script::Value::Number) || other.is_a?(Sass::Script::Value::Color)
         piecewise(other, :*)
       else
         raise NoMethodError.new(nil, :times)
@@ -472,14 +472,15 @@ module Sass::Script
     # {Color}
     # : Divides each of this color's RGB color channels by the other color's.
     #
-    # {Literal}
-    # : See {Literal#div}.
+    # {Value}
+    # : See {Value#div}.
     #
-    # @param other [Literal] The right-hand side of the operator
+    # @param other [Value] The right-hand side of the operator
     # @return [Color] The resulting color
     # @raise [Sass::SyntaxError] if `other` is a number with units
     def div(other)
-      if other.is_a?(Sass::Script::Number) || other.is_a?(Sass::Script::Color)
+      if other.is_a?(Sass::Script::Value::Number) ||
+          other.is_a?(Sass::Script::Value::Color)
         piecewise(other, :/)
       else
         super
@@ -499,7 +500,8 @@ module Sass::Script
     # @return [Color] The resulting color
     # @raise [Sass::SyntaxError] if `other` is a number with units
     def mod(other)
-      if other.is_a?(Sass::Script::Number) || other.is_a?(Sass::Script::Color)
+      if other.is_a?(Sass::Script::Value::Number) ||
+          other.is_a?(Sass::Script::Value::Color)
         piecewise(other, :%)
       else
         raise NoMethodError.new(nil, :mod)

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

@@ -1,12 +1,11 @@
-module Sass::Script
+module Sass::Script::Value
   # A SassScript object representing a CSS list.
   # This includes both comma-separated lists and space-separated lists.
-  class List < Literal
+  class List < Base
     # The Ruby array containing the contents of the list.
     #
-    # @return [Array<Literal>]
+    # @return [Array<Value>]
     attr_reader :value
-    alias_method :children, :value
     alias_method :to_a, :value
 
     # The operator separating the values of the list.
@@ -17,34 +16,33 @@ module Sass::Script
 
     # Creates a new list.
     #
-    # @param value [Array<Literal>] See \{#value}
-    # @param separator [String] See \{#separator}
+    # @param value [Array<Value>] See \{#value}
+    # @param separator [Symbol] See \{#separator}
     def initialize(value, separator)
       super(value)
       @separator = separator
     end
 
-    # @see Node#deep_copy
-    def deep_copy
-      node = dup
-      node.instance_variable_set('@value', value.map {|c| c.deep_copy})
-      node
+    # @see Value#options=
+    def options=(options)
+      super
+      value.each {|v| v.options = options}
     end
 
-    # @see Node#eq
+    # @see Value#eq
     def eq(other)
-      Sass::Script::Bool.new(
+      Sass::Script::Value::Bool.new(
         other.is_a?(List) && self.value == other.value &&
         self.separator == other.separator)
     end
 
-    # @see Node#to_s
+    # @see Value#to_s
     def to_s(opts = {})
       raise Sass::SyntaxError.new("() isn't a valid CSS value.") if value.empty?
       return value.reject {|e| e.is_a?(Null) || e.is_a?(List) && e.value.empty?}.map {|e| e.to_s(opts)}.join(sep_str)
     end
 
-    # @see Node#to_sass
+    # @see Value#to_sass
     def to_sass(opts = {})
       return "()" if value.empty?
       precedence = Sass::Script::Parser.precedence_of(separator)
@@ -57,20 +55,9 @@ module Sass::Script
       end.join(sep_str(nil))
     end
 
-    # @see Node#inspect
+    # @see Value#inspect
     def inspect
-      "(#{to_sass})"
-    end
-
-    protected
-
-    # @see Node#_perform
-    def _perform(environment)
-      list = Sass::Script::List.new(
-        value.map {|e| e.perform(environment)},
-        separator)
-      list.options = self.options
-      list
+      "(#{value.map {|e| e.inspect}.join(sep_str(nil))})"
     end
 
     private

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

@@ -1,7 +1,7 @@
-module Sass::Script
+module Sass::Script::Value
   # A SassScript object representing a null value.
-  class Null < Literal
-    # Creates a new null literal.
+  class Null < Base
+    # Creates a new null value.
     def initialize
       super nil
     end

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

@@ -1,4 +1,4 @@
-module Sass::Script
+module Sass::Script::Value
   # A SassScript object representing a number.
   # SassScript numbers can have decimal values,
   # and can also have units.
@@ -7,7 +7,7 @@ module Sass::Script
   #
   # 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 < Literal
+  class Number < Base
     # The Ruby value of the number.
     #
     # @return [Numeric]
@@ -75,11 +75,11 @@ module Sass::Script
     # {Color}
     # : Adds this number to each of the RGB color channels.
     #
-    # {Literal}
-    # : See {Literal#plus}.
+    # {Value}
+    # : See {Value#plus}.
     #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Literal] The result of the operation
+    # @param other [Value] The right-hand side of the operator
+    # @return [Value] 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 +97,11 @@ module Sass::Script
     # {Number}
     # : Subtracts this number from the other, converting units if possible.
     #
-    # {Literal}
-    # : See {Literal#minus}.
+    # {Value}
+    # : See {Value#minus}.
     #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Literal] The result of the operation
+    # @param other [Value] The right-hand side of the operator
+    # @return [Value] 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,11 +153,11 @@ module Sass::Script
     # {Number}
     # : Divides this number by the other, converting units appropriately.
     #
-    # {Literal}
-    # : See {Literal#div}.
+    # {Value}
+    # : See {Value#div}.
     #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Literal] The result of the operation
+    # @param other [Value] The right-hand side of the operator
+    # @return [Value] The result of the operation
     def div(other)
       if other.is_a? Number
         res = operate(other, :/)
@@ -189,10 +189,10 @@ module Sass::Script
 
     # The SassScript `==` operation.
     #
-    # @param other [Literal] The right-hand side of the operator
+    # @param other [Value] The right-hand side of the operator
     # @return [Boolean] Whether this number is equal to the other object
     def eq(other)
-      return Sass::Script::Bool.new(false) unless other.is_a?(Sass::Script::Number)
+      return Sass::Script::Value::Bool.new(false) unless other.is_a?(Sass::Script::Value::Number)
       this = self
       begin
         if unitless?
@@ -201,10 +201,10 @@ module Sass::Script
           other = other.coerce(@numerator_units, @denominator_units)
         end
       rescue Sass::UnitConversionError
-        return Sass::Script::Bool.new(false)
+        return Sass::Script::Value::Bool.new(false)
       end
 
-      Sass::Script::Bool.new(this.value == other.value)
+      Sass::Script::Value::Bool.new(this.value == other.value)
     end
 
     # The SassScript `>` operation.
@@ -288,7 +288,7 @@ module Sass::Script
     # Checks whether the number has the numerator unit specified.
     #
     # @example
-    #   number = Sass::Script::Number.new(10, "px")
+    #   number = Sass::Script::Value::Number.new(10, "px")
     #   number.is_unit?("px") => true
     #   number.is_unit?(nil) => false
     #

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

@@ -1,6 +1,6 @@
-module Sass::Script
+module Sass::Script::Value
   # A SassScript object representing a CSS string *or* a CSS identifier.
-  class String < Literal
+  class String < Base
     # The Ruby value of the string.
     #
     # @return [String]
@@ -22,13 +22,13 @@ module Sass::Script
       @type = type
     end
 
-    # @see Literal#plus
+    # @see Value#plus
     def plus(other)
-      other_str = other.is_a?(Sass::Script::String) ? other.value : other.to_s
-      Sass::Script::String.new(self.value + other_str, self.type)
+      other_str = other.is_a?(Sass::Script::Value::String) ? other.value : other.to_s
+      Sass::Script::Value::String.new(self.value + other_str, self.type)
     end
 
-    # @see Node#to_s
+    # @see Value#to_s
     def to_s(opts = {})
       if @type == :identifier
         return @value.gsub(/\n\s*/, " ")
@@ -41,7 +41,7 @@ module Sass::Script
       "\"#{value.gsub('"', "\\\"")}\"" #'
     end
 
-    # @see Node#to_sass
+    # @see Value#to_sass
     def to_sass(opts = {})
       to_s
     end

data/lib/sass/scss/parser.rb

@@ -45,7 +45,7 @@ module Sass
       # Note that this won't assert that the identifier takes up the entire input string;
       # it's meant to be used with `StringScanner`s as part of other parsers.
       #
-      # @return [Array<String, Sass::Script::Node>, nil]
+      # @return [Array<String, Sass::Script::Tree::Node>, nil]
       #   The interpolated identifier, or nil if none could be parsed
       def parse_interp_ident
         init_scanner!
@@ -903,14 +903,24 @@ module Sass
         value_start_pos = source_position
         @use_property_exception ||= space || !tok?(IDENT)
 
-        return value_start_pos, true, Sass::Script::String.new("") if tok?(/\{/)
+        if tok?(/\{/)
+          str = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(""))
+          str.line = source_position.line
+          str.source_range = range(source_position)
+          return value_start_pos, true, str
+        end
+
+        start_pos = source_position
         # This is a bit of a dirty trick:
         # if the value is completely static,
         # we don't parse it at all, and instead return a plain old string
         # containing the value.
         # This results in a dramatic speed increase.
         if val = tok(STATIC_VALUE, true)
-          return value_start_pos, space, Sass::Script::String.new(val.strip)
+          str = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(val.strip))
+          str.line = start_pos.line
+          str.source_range = range(start_pos)
+          return value_start_pos, space, str
         end
         return value_start_pos, space, sass_script(:parse)
       end
@@ -968,7 +978,7 @@ MESSAGE
       def var_expr
         return unless tok(/\$/)
         line = @line
-        var = Sass::Script::Variable.new(tok!(IDENT))
+        var = Sass::Script::Tree::Variable.new(tok!(IDENT))
         var.line = line
         var
       end

data/lib/sass/selector.rb

@@ -47,10 +47,10 @@ module Sass
     class Class < Simple
       # The class name.
       #
-      # @return [Array<String, Sass::Script::Node>]
+      # @return [Array<String, Sass::Script::Tree::Node>]
       attr_reader :name
 
-      # @param name [Array<String, Sass::Script::Node>] The class name
+      # @param name [Array<String, Sass::Script::Tree::Node>] The class name
       def initialize(name)
         @name = name
       end
@@ -70,10 +70,10 @@ module Sass
     class Id < Simple
       # The id name.
       #
-      # @return [Array<String, Sass::Script::Node>]
+      # @return [Array<String, Sass::Script::Tree::Node>]
       attr_reader :name
 
-      # @param name [Array<String, Sass::Script::Node>] The id name
+      # @param name [Array<String, Sass::Script::Tree::Node>] The id name
       def initialize(name)
         @name = name
       end
@@ -105,10 +105,10 @@ module Sass
     class Placeholder < Simple
       # The placeholder name.
       #
-      # @return [Array<String, Sass::Script::Node>]
+      # @return [Array<String, Sass::Script::Tree::Node>]
       attr_reader :name
 
-      # @param name [Array<String, Sass::Script::Node>] The placeholder name
+      # @param name [Array<String, Sass::Script::Tree::Node>] The placeholder name
       def initialize(name)
         @name = name
       end
@@ -131,10 +131,10 @@ module Sass
       # `[""]` means no namespace,
       # `["*"]` means any namespace.
       #
-      # @return [Array<String, Sass::Script::Node>, nil]
+      # @return [Array<String, Sass::Script::Tree::Node>, nil]
       attr_reader :namespace
 
-      # @param namespace [Array<String, Sass::Script::Node>, nil] See \{#namespace}
+      # @param namespace [Array<String, Sass::Script::Tree::Node>, nil] See \{#namespace}
       def initialize(namespace)
         @namespace = namespace
       end
@@ -195,7 +195,7 @@ module Sass
     class Element < Simple
       # The element name.
       #
-      # @return [Array<String, Sass::Script::Node>]
+      # @return [Array<String, Sass::Script::Tree::Node>]
       attr_reader :name
 
       # The selector namespace.
@@ -203,11 +203,11 @@ module Sass
       # `[""]` means no namespace,
       # `["*"]` means any namespace.
       #
-      # @return [Array<String, Sass::Script::Node>, nil]
+      # @return [Array<String, Sass::Script::Tree::Node>, nil]
       attr_reader :namespace
 
-      # @param name [Array<String, Sass::Script::Node>] The element name
-      # @param namespace [Array<String, Sass::Script::Node>, nil] See \{#namespace}
+      # @param name [Array<String, Sass::Script::Tree::Node>] The element name
+      # @param namespace [Array<String, Sass::Script::Tree::Node>, nil] See \{#namespace}
       def initialize(name, namespace)
         @name = name
         @namespace = namespace
@@ -262,10 +262,10 @@ module Sass
     class Interpolation < Simple
       # The script to run.
       #
-      # @return [Sass::Script::Node]
+      # @return [Sass::Script::Tree::Node]
       attr_reader :script
 
-      # @param script [Sass::Script::Node] The script to run
+      # @param script [Sass::Script::Tree::Node] The script to run
       def initialize(script)
         @script = script
       end
@@ -288,7 +288,7 @@ module Sass
     class Attribute < Simple
       # The attribute name.
       #
-      # @return [Array<String, Sass::Script::Node>]
+      # @return [Array<String, Sass::Script::Tree::Node>]
       attr_reader :name
 
       # The attribute namespace.
@@ -296,7 +296,7 @@ module Sass
       # `[""]` means no namespace,
       # `["*"]` means any namespace.
       #
-      # @return [Array<String, Sass::Script::Node>, nil]
+      # @return [Array<String, Sass::Script::Tree::Node>, nil]
       attr_reader :namespace
 
       # The matching operator, e.g. `"="` or `"^="`.
@@ -306,19 +306,19 @@ module Sass
 
       # The right-hand side of the operator.
       #
-      # @return [Array<String, Sass::Script::Node>]
+      # @return [Array<String, Sass::Script::Tree::Node>]
       attr_reader :value
 
       # Flags for the attribute selector (e.g. `i`).
       #
-      # @return [Array<String, Sass::Script::Node>]
+      # @return [Array<String, Sass::Script::Tree::Node>]
       attr_reader :flags
 
-      # @param name [Array<String, Sass::Script::Node>] The attribute name
-      # @param namespace [Array<String, Sass::Script::Node>, nil] See \{#namespace}
+      # @param name [Array<String, Sass::Script::Tree::Node>] The attribute name
+      # @param namespace [Array<String, Sass::Script::Tree::Node>, nil] See \{#namespace}
       # @param operator [String] The matching operator, e.g. `"="` or `"^="`
-      # @param value [Array<String, Sass::Script::Node>] See \{#value}
-      # @param value [Array<String, Sass::Script::Node>] See \{#flags}
+      # @param value [Array<String, Sass::Script::Tree::Node>] See \{#value}
+      # @param value [Array<String, Sass::Script::Tree::Node>] See \{#flags}
       def initialize(name, namespace, operator, value, flags)
         @name = name
         @namespace = namespace
@@ -362,7 +362,7 @@ module Sass
 
       # The name of the selector.
       #
-      # @return [Array<String, Sass::Script::Node>]
+      # @return [Array<String, Sass::Script::Tree::Node>]
       attr_reader :name
 
       # The argument to the selector,
@@ -372,12 +372,12 @@ module Sass
       # Note that this should not include SassScript nodes
       # after resolution has taken place.
       #
-      # @return [Array<String, Sass::Script::Node>, nil]
+      # @return [Array<String, Sass::Script::Tree::Node>, nil]
       attr_reader :arg
 
       # @param type [Symbol] See \{#type}
-      # @param name [Array<String, Sass::Script::Node>] The name of the selector
-      # @param arg [nil, Array<String, Sass::Script::Node>] The argument to the selector,
+      # @param name [Array<String, Sass::Script::Tree::Node>] The name of the selector
+      # @param arg [nil, Array<String, Sass::Script::Tree::Node>] The argument to the selector,
       #   or nil if no argument was given
       def initialize(type, name, arg)
         @type = type