compass-core 1.0.0.alpha.15 → 1.0.0.alpha.16

data/RELEASE_VERSION

@@ -1 +1 @@
-1.0.0.alpha.15
+1.0.0.alpha.16

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha.14
+1.0.0.alpha.15

data/lib/compass/configuration.rb

@@ -63,6 +63,7 @@ module Compass
       attributes_for_directory(:extensions, nil),
       # Compilation options
       :output_style,
+      :sourcemap,
       :environment,
       :relative_assets,
       :additional_import_paths,

data/lib/compass/core/sass_extensions/functions/colors.rb

@@ -35,14 +35,14 @@ module Compass::Core::SassExtensions::Functions::Colors
   def shade(color, percentage)
     assert_type color, :Color
     assert_type percentage, :Number
-    black = Sass::Script::Color.new([0, 0, 0])
+    black = rgb_color(0, 0, 0)
     mix(black, color, percentage)
   end
 
   def tint(color, percentage)
     assert_type color, :Color
     assert_type percentage, :Number
-    white = Sass::Script::Color.new([255, 255, 255])
+    white = rgb_color(255, 255, 255)
     mix(white, color, percentage)
   end
 
@@ -52,7 +52,7 @@ module Compass::Core::SassExtensions::Functions::Colors
     assert_type color, :Color
     alpha = (color.alpha * 255).round
     alphastr = alpha.to_s(16).rjust(2, '0')
-    Sass::Script::String.new("##{alphastr}#{color.send(:hex_str)[1..-1]}".upcase)
+    identifier("##{alphastr}#{color.send(:hex_str)[1..-1]}".upcase)
   end
   
   private

data/lib/compass/core/sass_extensions/functions/constants.rb

@@ -2,20 +2,20 @@ module Compass::Core::SassExtensions::Functions::Constants
   POSITIONS = /top|bottom|left|right|center/
   if defined?(Sass::Script::Value::List)
     def is_position(position)
-      Sass::Script::Bool.new(position.is_a?(Sass::Script::String) && !!(position.value =~ POSITIONS))
+      bool(position.is_a?(Sass::Script::Value::String) && !!(position.value =~ POSITIONS))
     end
     def is_position_list(position_list)
-      Sass::Script::Bool.new(position_list.is_a?(Sass::Script::List) && position_list.value.all?{|p| is_position(p).to_bool})
+      bool(position_list.is_a?(Sass::Script::Value::List) && position_list.value.all?{|p| is_position(p).to_bool})
     end
     # returns the opposite position of a side or corner.
     def opposite_position(position)
-      position = unless position.is_a?(Sass::Script::List)
-        Sass::Script::List.new([position], :space)
+      position = unless position.is_a?(Sass::Script::Value::List)
+        list(position, :space)
       else
-        Sass::Script::List.new(position.value.dup, position.separator)
+        list(position.value.dup, position.separator)
       end
-      position = Sass::Script::List.new(position.value.map do |pos|
-        if pos.is_a? Sass::Script::String
+      position = list(position.value.map do |pos|
+        if pos.is_a? Sass::Script::Value::String
           opposite = case pos.value
           when "top" then "bottom"
           when "bottom" then "top"
@@ -26,10 +26,10 @@ module Compass::Core::SassExtensions::Functions::Constants
             Compass::Util.compass_warn("Cannot determine the opposite position of: #{pos}")
             pos.value
           end
-          Sass::Script::String.new(opposite)
-        elsif pos.is_a? Sass::Script::Number
+          identifier(opposite)
+        elsif pos.is_a? Sass::Script::Value::Number
           if pos.numerator_units == ["%"] && pos.denominator_units == []
-            Sass::Script::Number.new(100-pos.value, ["%"])
+            number(100-pos.value, "%")
           else
             Compass::Util.compass_warn("Cannot determine the opposite position of: #{pos}")
             pos
@@ -47,11 +47,11 @@ module Compass::Core::SassExtensions::Functions::Constants
     end
 
     def is_url(string)
-      if string.is_a?(Sass::Script::String)
+      if string.is_a?(Sass::Script::Value::String)
         is_url = !!(string.value =~ /^url\(.*\)$/)
-        Sass::Script::Bool.new(is_url)
+        bool(is_url)
       else
-        Sass::Script::Bool.new(false)
+        bool(false)
       end
     end
   else
@@ -68,7 +68,7 @@ module Compass::Core::SassExtensions::Functions::Constants
           pos
         end
       end
-      Sass::Script::String.new(opposite.join(" "), position.type)
+      identifier(opposite.join(" "))
     end
   end
 end

data/lib/compass/core/sass_extensions/functions/cross_browser_support.rb

@@ -1,6 +1,7 @@
 module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
+  extend Compass::Core::SassExtensions::Functions::SassDeclarationHelper
 
-  class CSS2FallbackValue < Sass::Script::Literal
+  class CSS2FallbackValue < Sass::Script::Value::Base
     attr_accessor :value, :css2_value
     def children
       [value, css2_value]
@@ -31,7 +32,7 @@ module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
     assert_type prefix, :String
     aspect = prefix.value.sub(/^-/,"")
     needed = args.any?{|a| a.respond_to?(:supports?) && a.supports?(aspect)}
-    Sass::Script::Bool.new(needed)
+    bool(needed)
   end
 
   %w(webkit moz o ms svg css2).each do |prefix|
@@ -46,14 +47,14 @@ module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
 
   def prefix(prefix, *objects)
     assert_type prefix, :String if prefix.is_a?(Sass::Script::Value::Base)
-    prefix = prefix.value if prefix.is_a?(Sass::Script::String)
+    prefix = prefix.value if prefix.is_a?(Sass::Script::Value::String)
     prefix = prefix[1..-1] if prefix[0] == ?-
     if objects.size > 1
-      self.prefix(prefix, Sass::Script::List.new(objects, :comma))
+      self.prefix(prefix, list(objects, :comma))
     else
       object = objects.first
-      if object.is_a?(Sass::Script::List)
-        Sass::Script::List.new(object.value.map{|e|
+      if object.is_a?(Sass::Script::Value::List)
+        list(object.value.map{|e|
           self.prefix(prefix, e)
         }, object.separator)
       elsif object.respond_to?(:supports?) && object.supports?(prefix) && object.respond_to?(:"to_#{prefix}")
@@ -81,14 +82,14 @@ module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
                end
     list(browsers.map{|b| identifier(b)}, :comma)
   end
-  Sass::Script::Functions.declare(:browsers, [])
-  Sass::Script::Functions.declare(:browsers, [:prefix])
+  declare(:browsers, [])
+  declare(:browsers, [:prefix])
 
   # The known capabilities of browsers.
   def browser_capabilities
     list(Compass::Core::CanIUse.instance.capabilities.map{|c| identifier(c)}, :comma)
   end
-  Sass::Script::Functions.declare(:browser_capabilities, [])
+  declare(:browser_capabilities, [])
 
   # The versions for the given browser.
   def browser_versions(browser)
@@ -97,7 +98,7 @@ module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
   rescue ArgumentError => e
     raise Sass::SyntaxError.new(e.message)
   end
-  Sass::Script::Functions.declare(:browser_versions, [:browser])
+  declare(:browser_versions, [:browser])
 
   # whether the browser uses a prefix for the given capability at the version
   # specified or a later version. Returns the prefix it requires, or null.
@@ -113,7 +114,7 @@ module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
   rescue ArgumentError => e
     raise Sass::SyntaxError.new(e.message)
   end
-  Sass::Script::Functions.declare(:browser_requires_prefix, [:browser, :version, :capability])
+  declare(:browser_requires_prefix, [:browser, :version, :capability])
 
   # the prefix for the given browser.
   def browser_prefix(browser, version = nil)
@@ -122,8 +123,8 @@ module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
   rescue ArgumentError => e
     raise Sass::SyntaxError.new(e.message)
   end
-  Sass::Script::Functions.declare(:browser_prefix, [:browser])
-  Sass::Script::Functions.declare(:browser_prefix, [:browser, :version])
+  declare(:browser_prefix, [:browser])
+  declare(:browser_prefix, [:browser, :version])
 
   # The prefixes used by the given browsers.
   def browser_prefixes(browsers)
@@ -135,7 +136,7 @@ module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
   rescue ArgumentError => e
     raise Sass::SyntaxError.new(e.message)
   end
-  Sass::Script::Functions.declare(:browser_prefixes, [:browsers])
+  declare(:browser_prefixes, [:browsers])
 
   # The percent of users that are omitted by setting the min_version of browser
   # as specified.
@@ -147,8 +148,8 @@ module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
     versions << max_version.value if max_version
     number(Compass::Core::CanIUse.instance.omitted_usage(browser.value, *versions))
   end
-  Sass::Script::Functions.declare(:omitted_usage, [:browser, :min_version])
-  Sass::Script::Functions.declare(:omitted_usage, [:browser, :min_version, :max_version])
+  declare(:omitted_usage, [:browser, :min_version])
+  declare(:omitted_usage, [:browser, :min_version, :max_version])
 
   # The version before the version for the browser specified
   def previous_version(browser, version)
@@ -157,7 +158,7 @@ module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
     previous = Compass::Core::CanIUse.instance.previous_version(browser.value, version.value)
     previous.nil? ? null() : quoted_string(previous)
   end
-  Sass::Script::Functions.declare(:previous_version, [:browser, :version])
+  declare(:previous_version, [:browser, :version])
 
   # The version before the version for the browser specified
   def next_version(browser, version)
@@ -166,7 +167,7 @@ module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
     next_version = Compass::Core::CanIUse.instance.next_version(browser.value, version.value)
     next_version.nil? ? null() : quoted_string(next_version)
   end
-  Sass::Script::Functions.declare(:next_version, [:browser, :version])
+  declare(:next_version, [:browser, :version])
 
   # The percent of users relying on a particular prefix
   def prefix_usage(prefix, capability, capability_options)
@@ -178,7 +179,7 @@ module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
   rescue ArgumentError => e
     raise Sass::SyntaxError.new(e.message)
   end
-  Sass::Script::Functions.declare(:prefix_usage, [:prefix, :capability])
+  declare(:prefix_usage, [:prefix, :capability])
 
   # Compares two browser versions. Returning:
   #
@@ -203,7 +204,7 @@ module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
     end
     number(index1 <=> index2)
   end
-  Sass::Script::Functions.declare(:compare_browser_versions, [:browser, :version1, :version2])
+  declare(:compare_browser_versions, [:browser, :version1, :version2])
 
   # Returns a map of browsers to the first version the capability became available
   # without a prefix.
@@ -224,8 +225,8 @@ module Compass::Core::SassExtensions::Functions::CrossBrowserSupport
       m
     end)
   end
-  Sass::Script::Functions.declare(:browser_minimums, [:capability])
-  Sass::Script::Functions.declare(:browser_minimums, [:capability, :prefix])
+  declare(:browser_minimums, [:capability])
+  declare(:browser_minimums, [:capability, :prefix])
 
   private
 

data/lib/compass/core/sass_extensions/functions/display.rb

@@ -27,6 +27,6 @@ module Compass::Core::SassExtensions::Functions::Display
   # returns a comma delimited string for all the
   # elements according to their default css3 display value.
   def elements_of_type(display)
-    Sass::Script::String.new(DEFAULT_DISPLAY.fetch(display.value.to_s).join(", "))
+    identifier(DEFAULT_DISPLAY.fetch(display.value.to_s).join(", "))
   end
 end

data/lib/compass/core/sass_extensions/functions/enumerate.rb

@@ -1,7 +1,7 @@
 module Compass::Core::SassExtensions::Functions::Enumerate
   def enumerate(prefix, from, through, separator = nil)
-    separator ||= Sass::Script::String.new("-", :string)
+    separator ||= identifier("-")
     selectors = (from.value..through.value).map{|i| "#{prefix.value}#{separator.value}#{i}"}.join(", ")
-    Sass::Script::String.new(selectors)
+    identifier(selectors)
   end
 end

data/lib/compass/core/sass_extensions/functions/env.rb

@@ -1,60 +1,52 @@
 module Compass::Core::SassExtensions::Functions::Env
   extend Compass::Core::SassExtensions::Functions::SassDeclarationHelper
+  extend Sass::Script::Value::Helpers
 
   def compass_env
     compass_opts = options[:compass] || {}
-    Sass::Script::String.new((compass_opts[:environment] || "development").to_s)
+    identifier((compass_opts[:environment] || "development").to_s)
   end
   declare :compass_env, []
 
-  DEFAULT_TIME = Sass::Script::String.new("%T%:z")
+  DEFAULT_TIME = identifier("%T%:z")
   def current_time(format = DEFAULT_TIME)
     assert_type format, :String
-    Sass::Script::String.new(Time.now.strftime(format.value))
+    identifier(Time.now.strftime(format.value))
   end
   declare :current_time, []
   declare :current_time, [:format]
 
-  DEFAULT_DATE = Sass::Script::String.new("%F")
+  DEFAULT_DATE = identifier("%F")
   def current_date(format = DEFAULT_DATE)
     current_time(format)
   end
   declare :current_date, []
   declare :current_date, [:format]
 
-  NOT_ABSOLUTE = Sass::Script::Bool.new(false)
+  NOT_ABSOLUTE = bool(false)
   def current_source_file(absolute = NOT_ABSOLUTE)
     if absolute.to_bool
-      Sass::Script::String.new(options[:original_filename].to_s)
+      identifier(options[:original_filename].to_s)
     else
       filename = Pathname.new(options[:original_filename].to_s)
       sass_path = Pathname.new(Compass.configuration.sass_path)
       relative_filename = filename.relative_path_from(sass_path).to_s rescue filename
-      Sass::Script::String.new(relative_filename.to_s)
+      identifier(relative_filename.to_s)
     end
   end
   declare :current_source_file, []
   declare :current_source_file, [:absolute]
 
   def current_output_file(absolute = NOT_ABSOLUTE)
-    Sass::Script::String.new(options[:css_filename].to_s)
     if absolute.to_bool
-      Sass::Script::String.new(options[:css_filename].to_s)
+      identifier(options[:css_filename].to_s)
     else
       filename = Pathname.new(options[:css_filename].to_s)
       css_path = Pathname.new(Compass.configuration.css_path)
       relative_filename = filename.relative_path_from(css_path).to_s rescue filename
-      Sass::Script::String.new(relative_filename.to_s)
+      identifier(relative_filename.to_s)
     end
   end
   declare :current_output_file, []
   declare :current_output_file, [:absolute]
-
-  unless Sass::Util.has?(:public_instance_method, Sass::Script::Functions, :inspect)
-    # This is going to be in sass 3.3, just here temporarily.
-    def inspect(value)
-      unquoted_string(value.to_sass)
-    end
-    declare :inspect, [:value]
-  end
 end

data/lib/compass/core/sass_extensions/functions/font_files.rb

@@ -12,17 +12,18 @@ module Compass::Core::SassExtensions::Functions::FontFiles
   def font_formats(*args)
     formats = []
     with_each_font_file(*args) do |path, type|
-      formats << Sass::Script::String.new(type)
+      formats << identifier(type)
     end
-    return Sass::Script::List.new(formats, :comma)
+    return list(formats, :comma)
   end
 
   def font_files(*args)
+    return null unless args.any?
     files = []
     with_each_font_file(*args) do |path, type|
-      files << "#{font_url(path)} format('#{type}')"
+      files << list(font_url(path), identifier("format('#{type}')"), :space)
     end
-    Sass::Script::String.new(files.join(", "))
+    list(files, :comma)
   end
 
 protected

data/lib/compass/core/sass_extensions/functions/gradient_support.rb

@@ -2,19 +2,20 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
 
   GRADIENT_ASPECTS = %w(webkit moz svg css2 o owg).freeze
 
-  class ColorStop < Sass::Script::Literal
+  class ColorStop < Sass::Script::Value::Base
+    include Sass::Script::Value::Helpers
     attr_accessor :color, :stop
     def children
       [color, stop].compact
     end
     def initialize(color, stop = nil)
-      unless Sass::Script::Color === color ||
-             Sass::Script::Funcall === color ||
-             (Sass::Script::String === color && color.value == "currentColor")||
-             (Sass::Script::String === color && color.value == "transparent")
+      unless Sass::Script::Value::Color === color ||
+             Sass::Script::Tree::Funcall === color ||
+             (Sass::Script::Value::String === color && color.value == "currentColor")||
+             (Sass::Script::Value::String === color && color.value == "transparent")
         raise Sass::SyntaxError, "Expected a color. Got: #{color}"
       end
-      if stop && !stop.is_a?(Sass::Script::Number)
+      if stop && !stop.is_a?(Sass::Script::Value::Number)
         raise Sass::SyntaxError, "Expected a number. Got: #{stop}"
       end
       self.color, self.stop = color, stop
@@ -26,9 +27,9 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     def self.color_to_svg_s(c)
       # svg doesn't support the "transparent" keyword; we need to manually
       # refactor it into "transparent black"
-      if c.is_a?(Sass::Script::String) && c.value == "transparent"
+      if c.is_a?(Sass::Script::Value::String) && c.value == "transparent"
         "black"
-      elsif c.is_a?(Sass::Script::String)
+      elsif c.is_a?(Sass::Script::Value::String)
         c.value.dup
       else
         self.color_to_s(c.with(:alpha => 1))
@@ -38,9 +39,9 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     def self.color_to_svg_alpha(c)
       # svg doesn't support the "transparent" keyword; we need to manually
       # refactor it into "transparent black"
-      if c.is_a?(Sass::Script::String) && c.value == "transparent"
+      if c.is_a?(Sass::Script::Value::String) && c.value == "transparent"
         0
-      elsif c.is_a?(Sass::Script::String) && c.value == "currentColor"
+      elsif c.is_a?(Sass::Script::Value::String) && c.value == "currentColor"
         1
       else
         c.alpha
@@ -48,7 +49,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     end
 
     def self.color_to_s(c)
-      if c.is_a?(Sass::Script::String)
+      if c.is_a?(Sass::Script::Value::String)
         c.value.dup
       else
         c.inspect.dup
@@ -60,7 +61,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
       if stop
         s << " "
         if stop.unitless?
-          s << stop.times(Sass::Script::Number.new(100, ["%"])).inspect
+          s << stop.times(number(100, "%")).inspect
         else
           s << stop.inspect
         end
@@ -69,11 +70,12 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     end
 
     def to_sass(options = nil)
-      Sass::Script::String.new("color-stop(#{color.to_sass rescue nil}, #{stop.to_sass rescue nil})")
+      identifier("color-stop(#{color.to_sass rescue nil}, #{stop.to_sass rescue nil})")
     end
   end
 
   module Gradient
+    include Sass::Script::Value::Helpers
 
     def self.included(base)
       base.extend ClassMethods
@@ -83,7 +85,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
       def standardized_prefix(prefix)
         class_eval %Q{
           def to_#{prefix}(options = self.options)
-            Sass::Script::String.new("-#{prefix}-\#{to_s_prefixed(options)}")
+            identifier("-#{prefix}-\#{to_s_prefixed(options)}")
           end
         }
       end
@@ -106,7 +108,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     end
 
     def angle?(value)
-      value.is_a?(Sass::Script::Number) &&
+      value.is_a?(Sass::Script::Value::Number) &&
       value.numerator_units.size == 1 &&
       value.numerator_units.first == "deg" &&
       value.denominator_units.empty?
@@ -114,7 +116,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
 
   end
 
-  class RadialGradient < Sass::Script::Literal
+  class RadialGradient < Sass::Script::Value::Base
     include Gradient
 
     attr_accessor :position, :shape_and_size, :color_stops
@@ -157,11 +159,11 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     end
 
     def to_css2(options = self.options)
-      Sass::Script::String.new("")
+      null
     end
   end
 
-  class LinearGradient < Sass::Script::Literal
+  class LinearGradient < Sass::Script::Value::Base
     include Gradient
 
     attr_accessor :color_stops, :position_or_angle, :legacy
@@ -191,10 +193,10 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     end
 
     def convert_to_or_from_legacy(position_or_angle, options = self.options)
-      input = if position_or_angle.is_a?(Sass::Script::Number)
+      input = if position_or_angle.is_a?(Sass::Script::Value::Number)
           position_or_angle
         else
-          opts(Sass::Script::List.new(position_or_angle.to_s.split(' ').map {|s| Sass::Script::String.new(s) }, :space))
+          opts(list(position_or_angle.to_s.split(' ').map {|s| identifier(s) }, :space))
         end
       return convert_angle_from_offical(input).to_s(options)
     end
@@ -216,7 +218,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
 
     def supports?(aspect)
       # I don't know how to support degree-based gradients in old webkit gradients (owg) or svg so we just disable them.
-      if %w(owg svg).include?(aspect) && position_or_angle.is_a?(Sass::Script::Number) && position_or_angle.numerator_units.include?("deg")
+      if %w(owg svg).include?(aspect) && position_or_angle.is_a?(Sass::Script::Value::Number) && position_or_angle.numerator_units.include?("deg")
         false
       else
         super
@@ -224,35 +226,36 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     end
 
     def to_svg(options = self.options)
-      linear_svg_gradient(color_stops, position_or_angle || Sass::Script::String.new("top"))
+      linear_svg_gradient(color_stops, position_or_angle || identifier("top"))
     end
 
     def to_css2(options = self.options)
-      Sass::Script::String.new("")
+      null
     end
   end
 
   module Functions
+    include Sass::Script::Value::Helpers
 
     def convert_angle_from_offical(deg)
-      if deg.is_a?(Sass::Script::Number)
-        return Sass::Script::Number.new((deg.value.to_f - 450).abs % 360, ['deg'])
+      if deg.is_a?(Sass::Script::Value::Number)
+        return number((deg.value.to_f - 450).abs % 360, 'deg')
       else
         args = deg.value
         direction = []
-        if args[0] == Sass::Script::String.new('to')
+        if args[0] == identifier('to')
           if args.size < 2
             direction = args
           else
             direction << opposite_position(args[1])
           end
         else
-          direction << Sass::Script::String.new('to')
+          direction << identifier('to')
           args.each do |pos|
             direction << opposite_position(pos)
           end
         end
-        return Sass::Script::String.new(direction.join(' '))
+        return opts(list(direction, :space))
       end
     end
 
@@ -260,10 +263,10 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     # otherwise, returns the original argument
     def grad_point(position)
       original_value = position
-      position = unless position.is_a?(Sass::Script::List)
-        opts(Sass::Script::List.new([position], :space))
+      position = unless position.is_a?(Sass::Script::Value::List)
+        opts(list([position], :space))
       else
-        opts(Sass::Script::List.new(position.value.dup, position.separator))
+        opts(list(position.value.dup, position.separator))
       end
       # Handle unknown arguments by passing them along untouched.
       unless position.value.all?{|p| is_position(p) }
@@ -271,43 +274,41 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
       end
       if (position.value.first.value =~ /top|bottom/) or (position.value.last.value =~ /left|right/)
         # browsers are pretty forgiving of reversed positions so we are too.
-        position = Sass::Script::List.new(position.value.reverse, position.separator)
+        position = opts(list(position.value.reverse, position.separator))
       end
       if position.value.size == 1
         if position.value.first.value =~ /top|bottom/
-          position = Sass::Script::List.new(
-            [Sass::Script::String.new("center"), position.value.first], position.separator)
+          position = opts(list(identifier("center"), position.value.first, position.separator))
         elsif position.value.first.value =~ /left|right/
-          position = Sass::Script::List.new(
-            [position.value.first, Sass::Script::String.new("center")], position.separator)
+          position = opts(list(position.value.first, identifier("center"), position.separator))
         end
       end
-      position = Sass::Script::List.new(position.value.map do |p|
+      position = opts(list(position.value.map do |p|
         case p.value
         when /top|left/
-          Sass::Script::Number.new(0, ["%"])
+          number(0, "%")
         when /bottom|right/
-          Sass::Script::Number.new(100, ["%"])
+          number(100, "%")
         when /center/
-          Sass::Script::Number.new(50, ["%"])
+          number(50, "%")
         else
           p
         end
-      end, position.separator)
+      end, position.separator))
       position
     end
 
     def color_stops(*args)
-      opts(Sass::Script::List.new(args.map do |arg|
+      opts(list(args.map do |arg|
         if ColorStop === arg
           arg
-        elsif Sass::Script::Color === arg
+        elsif Sass::Script::Value::Color === arg
           ColorStop.new(arg)
-        elsif Sass::Script::List === arg
+        elsif Sass::Script::Value::List === arg
           ColorStop.new(*arg.value)
-        elsif Sass::Script::String === arg && arg.value == "transparent"
+        elsif Sass::Script::Value::String === arg && arg.value == "transparent"
           ColorStop.new(arg)
-        elsif Sass::Script::String === arg && arg.value == "currentColor"
+        elsif Sass::Script::Value::String === arg && arg.value == "currentColor"
           ColorStop.new(arg)
         else
           raise Sass::SyntaxError, "Not a valid color stop: #{arg.class.name}: #{arg}"
@@ -375,7 +376,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
       stops = color_stops_in_percentages(color_list).map do |stop, color|
         "color-stop(#{stop.inspect}, #{ColorStop.color_to_s(color)})"
       end
-      Sass::Script::String.new(stops.join(", "))
+      opts(list(stops, :comma))
     end
 
     def color_stops_in_percentages(color_list)
@@ -386,7 +387,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
       color_stops = color_list.value.map do |pos|
         # have to convert absolute units to percentages for use in color stop functions.
         stop = pos.stop
-        stop = stop.div(max).times(Sass::Script::Number.new(100,["%"])) if stop.numerator_units == max.numerator_units && max.numerator_units != ["%"]
+        stop = stop.div(max).times(number(100, "%")) if stop.numerator_units == max.numerator_units && max.numerator_units != ["%"]
         # Make sure the color stops are specified in the right order.
         if last_value && stop.numerator_units == last_value.numerator_units && stop.denominator_units == last_value.denominator_units && (stop.value * 1000).round < (last_value.value * 1000).round
           raise Sass::SyntaxError.new("Color stops must be specified in increasing order. #{stop.value} came after #{last_value.value}.")
@@ -398,31 +399,31 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
 
     # only used for webkit
     def linear_end_position(position_or_angle, color_list)
-      start_point = grad_point(position_or_angle || Sass::Script::String.new("top"))
-      end_point = grad_point(opposite_position(position_or_angle || Sass::Script::String.new("top")))
+      start_point = grad_point(position_or_angle || identifier("top"))
+      end_point = grad_point(opposite_position(position_or_angle || identifier("top")))
       end_target = color_list.value.last.stop
 
       if color_list.value.last.stop && color_list.value.last.stop.numerator_units == ["px"]
         new_end = color_list.value.last.stop.value
         if start_point.value.first == end_point.value.first && start_point.value.last.value == 0
           # this means top-to-bottom
-          end_point.value[1] = Sass::Script::Number.new(end_target.value)
+          end_point.value[1] = number(end_target.value)
         elsif start_point.value.last == end_point.value.last && start_point.value.first.value == 0
           # this implies left-to-right
-          end_point.value[0] = Sass::Script::Number.new(end_target.value)
+          end_point.value[0] = number(end_target.value)
         end
       end
       end_point
     end
 
     # returns the end position of the gradient from the color stop
-    def grad_end_position(color_list, radial = Sass::Script::Bool.new(false))
+    def grad_end_position(color_list, radial = bool(false))
       assert_type color_list, :List
-      default = Sass::Script::Number.new(100)
-      grad_position(color_list, Sass::Script::Number.new(color_list.value.size), default, radial)
+      default = number(100)
+      grad_position(color_list, number(color_list.value.size), default, radial)
     end
 
-    def grad_position(color_list, index, default, radial = Sass::Script::Bool.new(false))
+    def grad_position(color_list, index, default, radial = bool(false))
       assert_type color_list, :List
       stop = color_list.value[index.value - 1].stop
       if stop && radial.to_bool
@@ -430,17 +431,17 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
         if stop.unitless?
           if stop.value <= 1
             # A unitless number is assumed to be a percentage when it's between 0 and 1
-            stop = stop.times(Sass::Script::Number.new(100, ["%"]))
+            stop = stop.times(number(100, "%"))
           else
             # Otherwise, a unitless number is assumed to be in pixels
-            stop = stop.times(Sass::Script::Number.new(1, ["px"]))
+            stop = stop.times(number(1, "px"))
           end
         end
         if stop.numerator_units == ["%"] && color_list.value.last.stop && color_list.value.last.stop.numerator_units == ["px"]
-          stop = stop.times(color_list.value.last.stop).div(Sass::Script::Number.new(100, ["%"]))
+          stop = stop.times(color_list.value.last.stop).div(number(100, "%"))
         end
         Compass::Logger.new.record(:warning, "Webkit only supports pixels for the start and end stops for radial gradients. Got: #{orig_stop}") if stop.numerator_units != ["px"]
-        stop.div(Sass::Script::Number.new(1, stop.numerator_units, stop.denominator_units))
+        stop.div(Sass::Script::Value::Number.new(1, stop.numerator_units, stop.denominator_units))
       elsif stop
         stop
       else
@@ -459,7 +460,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
 
     def radial_svg_gradient(color_stops, center)
       cx, cy = *grad_point(center).value
-      r = grad_end_position(color_stops,  Sass::Script::Bool.new(true))
+      r = grad_end_position(color_stops,  bool(true))
       stops = color_stops_in_percentages(color_stops)
 
       svg = radial_svg(stops, cx, cy, r)
@@ -470,7 +471,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
 
     def color_stop?(arg)
       arg.is_a?(ColorStop) ||
-      (arg.is_a?(Sass::Script::List) && ColorStop.new(*arg.value)) ||
+      (arg.is_a?(Sass::Script::Value::List) && ColorStop.new(*arg.value)) ||
       ColorStop.new(arg)
     rescue
       nil
@@ -479,15 +480,15 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     def normalize_stops(color_list)
       positions = color_list.value.map{|obj| obj.dup}
       # fill in the start and end positions, if unspecified
-      positions.first.stop = Sass::Script::Number.new(0) unless positions.first.stop
-      positions.last.stop = Sass::Script::Number.new(100, ["%"]) unless positions.last.stop
+      positions.first.stop = number(0) unless positions.first.stop
+      positions.last.stop = number(100, "%") unless positions.last.stop
       # fill in empty values
       for i in 0...positions.size
         if positions[i].stop.nil?
           num = 2.0
           for j in (i+1)...positions.size
             if positions[j].stop
-              positions[i].stop = positions[i-1].stop.plus((positions[j].stop.minus(positions[i-1].stop)).div(Sass::Script::Number.new(num)))
+              positions[i].stop = positions[i-1].stop.plus((positions[j].stop.minus(positions[i-1].stop)).div(number(num)))
               break
             else
               num += 1
@@ -498,33 +499,29 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
       # normalize unitless numbers
       positions.each do |pos|
         if pos.stop.unitless? && pos.stop.value <= 1
-          pos.stop = pos.stop.times(Sass::Script::Number.new(100, ["%"]))
+          pos.stop = pos.stop.times(number(100, "%"))
         elsif pos.stop.unitless?
-          pos.stop = pos.stop.times(Sass::Script::Number.new(1, ["px"]))
+          pos.stop = pos.stop.times(number(1, "px"))
         end
       end
-      if (positions.last.stop.eq(Sass::Script::Number.new(0, ["px"])).to_bool ||
-         positions.last.stop.eq(Sass::Script::Number.new(0, ["%"])).to_bool)
+      if (positions.last.stop.eq(number(0, "px")).to_bool ||
+         positions.last.stop.eq(number(0, "%")).to_bool)
          raise Sass::SyntaxError.new("Color stops must be specified in increasing order")
        end
-      if defined?(Sass::Script::List)
-        opts(Sass::Script::List.new(positions, color_list.separator))
-      else
-        color_list.class.new(*positions)
-      end
+       opts(list(positions, color_list.separator))
     end
 
     def parse_color_stop(arg)
-      return ColorStop.new(arg) if arg.is_a?(Sass::Script::Color)
-      return nil unless arg.is_a?(Sass::Script::String)
+      return ColorStop.new(arg) if arg.is_a?(Sass::Script::Value::Color)
+      return nil unless arg.is_a?(Sass::Script::Value::String)
       color = stop = nil
       expr = Sass::Script::Parser.parse(arg.value, 0, 0)
       case expr
-      when Sass::Script::Color
+      when Sass::Script::Value::Color
         color = expr
-      when Sass::Script::Funcall
+      when Sass::Script::Tree::Funcall
         color = expr
-      when Sass::Script::Operation
+      when Sass::Script::Tree::Operation
         unless [:concat, :space].include?(expr.instance_variable_get("@operator"))
           # This should never happen.
           raise Sass::SyntaxError, "Couldn't parse a color stop from: #{arg.value}"
@@ -578,10 +575,7 @@ EOS
     end
 
     def _center_position
-      opts(Sass::Script::List.new([
-        Sass::Script::String.new("center"),
-        Sass::Script::String.new("center")
-      ],:space))
+      opts(list(identifier("center"), identifier("center"), :space))
     end
 
     def opts(v)
@@ -600,14 +594,14 @@ EOS
     end
   end
 
-  class LinearGradient < Sass::Script::Literal
+  class LinearGradient < Sass::Script::Value::Base
     include Assertions
     include Functions
     include Compass::Core::SassExtensions::Functions::Constants
     include Compass::Core::SassExtensions::Functions::InlineImage
   end
 
-  class RadialGradient < Sass::Script::Literal
+  class RadialGradient < Sass::Script::Value::Base
     include Assertions
     include Functions
     include Compass::Core::SassExtensions::Functions::Constants