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

data/lib/sass/tree/rule_node.rb

@@ -9,11 +9,11 @@ module Sass::Tree
     PARENT = '&'
 
     # The CSS selector for this rule,
-    # interspersed with {Sass::Script::Node}s
+    # interspersed with {Sass::Script::Tree::Node}s
     # representing `#{}`-interpolation.
     # Any adjacent strings will be merged together.
     #
-    # @return [Array<String, Sass::Script::Node>]
+    # @return [Array<String, Sass::Script::Tree::Node>]
     attr_accessor :rule
 
     # The CSS selector for this rule,
@@ -60,7 +60,7 @@ module Sass::Tree
     # @return [Array<String>]
     attr_accessor :stack_trace
 
-    # @param rule [Array<String, Sass::Script::Node>]
+    # @param rule [Array<String, Sass::Script::Tree::Node>]
     # @param selector_source_range [Sass::Source::Range]
     #   The CSS rule. See \{#rule}
     def initialize(rule, selector_source_range = nil)

data/lib/sass/tree/variable_node.rb

@@ -9,7 +9,7 @@ module Sass
       attr_reader :name
 
       # The parse tree for the variable value.
-      # @return [Script::Node]
+      # @return [Script::Tree::Node]
       attr_accessor :expr
 
       # Whether this is a guarded variable assignment (`!default`).
@@ -17,7 +17,7 @@ module Sass
       attr_reader :guarded
 
       # @param name [String] The name of the variable
-      # @param expr [Script::Node] See \{#expr}
+      # @param expr [Script::Tree::Node] See \{#expr}
       # @param guarded [Boolean] See \{#guarded}
       def initialize(name, expr, guarded)
         @name = name

data/lib/sass/tree/visitors/convert.rb

@@ -160,7 +160,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_cssimport(node)
-    if node.uri.is_a?(Sass::Script::Node)
+    if node.uri.is_a?(Sass::Script::Tree::Node)
       str = "#{tab_str}@import #{node.uri.to_sass(@options)}"
     else
       str = "#{tab_str}@import #{node.uri}"
@@ -197,7 +197,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   def visit_mixin(node)
     arg_to_sass = lambda do |arg|
       sass = arg.to_sass(@options)
-      sass = "(#{sass})" if arg.is_a?(Sass::Script::List) && arg.separator == :comma
+      sass = "(#{sass})" if arg.is_a?(Sass::Script::Tree::ListLiteral) && arg.separator == :comma
       sass
     end
 

data/lib/sass/tree/visitors/deep_copy.rb

@@ -22,7 +22,7 @@ class Sass::Tree::Visitors::DeepCopy < Sass::Tree::Visitors::Base
   end
 
   def visit_extend(node)
-    node.selector = node.selector.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
+    node.selector = node.selector.map {|c| c.is_a?(Sass::Script::Tree::Node) ? c.deep_copy : c}
     yield
   end
 
@@ -55,7 +55,7 @@ class Sass::Tree::Visitors::DeepCopy < Sass::Tree::Visitors::Base
   end
 
   def visit_prop(node)
-    node.name = node.name.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
+    node.name = node.name.map {|c| c.is_a?(Sass::Script::Tree::Node) ? c.deep_copy : c}
     node.value = node.value.deep_copy
     yield
   end
@@ -66,7 +66,7 @@ class Sass::Tree::Visitors::DeepCopy < Sass::Tree::Visitors::Base
   end
 
   def visit_rule(node)
-    node.rule = node.rule.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
+    node.rule = node.rule.map {|c| c.is_a?(Sass::Script::Tree::Node) ? c.deep_copy : c}
     yield
   end
 
@@ -86,12 +86,12 @@ class Sass::Tree::Visitors::DeepCopy < Sass::Tree::Visitors::Base
   end
 
   def visit_directive(node)
-    node.value = node.value.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
+    node.value = node.value.map {|c| c.is_a?(Sass::Script::Tree::Node) ? c.deep_copy : c}
     yield
   end
 
   def visit_media(node)
-    node.query = node.query.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
+    node.query = node.query.map {|c| c.is_a?(Sass::Script::Tree::Node) ? c.deep_copy : c}
     yield
   end
 

data/lib/sass/tree/visitors/perform.rb

@@ -41,10 +41,10 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     splat_sep = :comma
     if splat
       args += splat.to_a
-      splat_sep = splat.separator if splat.is_a?(Sass::Script::List)
+      splat_sep = splat.separator if splat.is_a?(Sass::Script::Value::List)
       # If the splat argument exists, there won't be any keywords passed in
       # manually, so we can safely overwrite rather than merge here.
-      keywords = splat.keywords if splat.is_a?(Sass::Script::ArgList)
+      keywords = splat.keywords if splat.is_a?(Sass::Script::Value::ArgList)
     end
 
     keywords = keywords.dup
@@ -62,7 +62,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
     if callable.splat
       rest = args[callable.args.length..-1]
-      arg_list = Sass::Script::ArgList.new(rest, keywords.dup, splat_sep)
+      arg_list = Sass::Script::Value::ArgList.new(rest, keywords.dup, splat_sep)
       arg_list.options = env.options
       env.set_local_var(callable.splat.name, arg_list)
     end
@@ -142,7 +142,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   # Prints the expression to STDERR.
   def visit_debug(node)
     res = node.expr.perform(@environment)
-    res = res.value if res.is_a?(Sass::Script::String)
+    res = res.value if res.is_a?(Sass::Script::Value::String)
     if node.filename
       $stderr.puts "#{node.filename}:#{node.line} DEBUG: #{res}"
     else
@@ -185,7 +185,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     with_environment Sass::Environment.new(@environment) do
       range.map do |i|
         @environment.set_local_var(node.var,
-          Sass::Script::Number.new(i, from.numerator_units, from.denominator_units))
+          Sass::Script::Value::Number.new(i, from.numerator_units, from.denominator_units))
         node.children.map {|c| visit(c)}
       end.flatten
     end
@@ -343,7 +343,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   def visit_warn(node)
     @stack.push(:filename => node.filename, :line => node.line)
     res = node.expr.perform(@environment)
-    res = res.value if res.is_a?(Sass::Script::String)
+    res = res.value if res.is_a?(Sass::Script::Value::String)
     msg = "WARNING: #{res}\n         "
     msg << stack_trace.join("\n         ") << "\n"
     Sass::Util.sass_warn msg
@@ -409,7 +409,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       next r if r.is_a?(String)
       val = r.perform(@environment)
       # Interpolated strings should never render with quotes
-      next val.value if val.is_a?(Sass::Script::String)
+      next val.value if val.is_a?(Sass::Script::Value::String)
       val.to_s
     end.join
   end

data/lib/sass/tree/visitors/set_options.rb

@@ -26,7 +26,7 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
   end
 
   def visit_extend(node)
-    node.selector.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
+    node.selector.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)}
     yield
   end
 
@@ -73,7 +73,7 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
   end
 
   def visit_prop(node)
-    node.name.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
+    node.name.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)}
     node.value.options = @options
     yield
   end
@@ -84,7 +84,7 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
   end
 
   def visit_rule(node)
-    node.rule.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
+    node.rule.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)}
     yield
   end
 
@@ -104,17 +104,17 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
   end
 
   def visit_directive(node)
-    node.value.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
+    node.value.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)}
     yield
   end
 
   def visit_media(node)
-    node.query.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
+    node.query.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)}
     yield
   end
 
   def visit_cssimport(node)
-    node.query.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)} if node.query
+    node.query.each {|c| c.options = @options if c.is_a?(Sass::Script::Tree::Node)} if node.query
     yield
   end
 

data/lib/sass/tree/visitors/to_css.rb

@@ -343,7 +343,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
                 false)
             ])
         ])
-      prop = Sass::Tree::PropNode.new([""], Sass::Script::String.new(''), :new)
+      prop = Sass::Tree::PropNode.new([""], Sass::Script::Value::String.new(''), :new)
       prop.resolved_name = "font-family"
       prop.resolved_value = Sass::SCSS::RX.escape_ident(v.to_s)
       rule << prop

data/lib/sass/tree/warn_node.rb

@@ -5,10 +5,10 @@ module Sass
     # @see Sass::Tree
     class WarnNode < Node
       # The expression to print.
-      # @return [Script::Node]
+      # @return [Script::Tree::Node]
       attr_accessor :expr
 
-      # @param expr [Script::Node] The expression to print
+      # @param expr [Script::Tree::Node] The expression to print
       def initialize(expr)
         @expr = expr
         super()

data/lib/sass/tree/while_node.rb

@@ -6,10 +6,10 @@ module Sass::Tree
   # @see Sass::Tree
   class WhileNode < Node
     # The parse tree for the continuation expression.
-    # @return [Script::Node]
+    # @return [Script::Tree::Node]
     attr_accessor :expr
 
-    # @param expr [Script::Node] See \{#expr}
+    # @param expr [Script::Tree::Node] See \{#expr}
     def initialize(expr)
       @expr = expr
       super()

data/lib/sass/util.rb

@@ -289,14 +289,14 @@ module Sass
     #
     # @param name [String] The name of the value. Used in the error message.
     # @param range [Range] The allowed range of values.
-    # @param value [Numeric, Sass::Script::Number] The value to check.
+    # @param value [Numeric, Sass::Script::Value::Number] The value to check.
     # @param unit [String] The unit of the value. Used in error reporting.
     # @return [Numeric] `value` adjusted to fall within range, if it
     #   was outside by a floating-point margin.
     def check_range(name, range, value, unit='')
       grace = (-0.00001..0.00001)
       str = value.to_s
-      value = value.value if value.is_a?(Sass::Script::Number)
+      value = value.value if value.is_a?(Sass::Script::Value::Number)
       return value if range.include?(value)
       return range.first if grace.include?(value - range.first)
       return range.last if grace.include?(value - range.last)

data/test/sass/engine_test.rb

@@ -9,16 +9,16 @@ require 'pathname'
 
 module Sass::Script::Functions::UserFunctions
   def option(name)
-    Sass::Script::String.new(@options[name.value.to_sym].to_s)
+    Sass::Script::Value::String.new(@options[name.value.to_sym].to_s)
   end
 
   def set_a_variable(name, value)
     environment.set_var(name.value, value)
-    return Sass::Script::Null.new
+    return Sass::Script::Value::Null.new
   end
 
   def get_a_variable(name)
-    environment.var(name.value) || Sass::Script::String.new("undefined")
+    environment.var(name.value) || Sass::Script::Value::String.new("undefined")
   end
 end
 
@@ -3032,9 +3032,9 @@ SCSS
   end
 
   def test_changing_precision
-    old_precision = Sass::Script::Number.precision
+    old_precision = Sass::Script::Value::Number.precision
     begin
-      Sass::Script::Number.precision = 8
+      Sass::Script::Value::Number.precision = 8
       assert_equal <<CSS, render(<<SASS)
 div {
   maximum: 1.00000001;
@@ -3045,7 +3045,7 @@ div
   too-much: 1.000000001
 SASS
     ensure
-      Sass::Script::Number.precision = old_precision
+      Sass::Script::Value::Number.precision = old_precision
     end
   end
 

data/test/sass/functions_test.rb

@@ -5,33 +5,33 @@ require 'sass/script'
 
 module Sass::Script::Functions
   def no_kw_args
-    Sass::Script::String.new("no-kw-args")
+    Sass::Script::Value::String.new("no-kw-args")
   end
 
   def only_var_args(*args)
-    Sass::Script::String.new("only-var-args("+args.map{|a| a.plus(Sass::Script::Number.new(1)).to_s }.join(", ")+")")
+    Sass::Script::Value::String.new("only-var-args("+args.map{|a| a.plus(Sass::Script::Value::Number.new(1)).to_s }.join(", ")+")")
   end
   declare :only_var_args, [], :var_args => true
 
   def only_kw_args(kwargs)
-    Sass::Script::String.new("only-kw-args(" + kwargs.keys.map {|a| a.to_s}.sort.join(", ") + ")")
+    Sass::Script::Value::String.new("only-kw-args(" + kwargs.keys.map {|a| a.to_s}.sort.join(", ") + ")")
   end
   declare :only_kw_args, [], :var_kwargs => true
 end
 
 module Sass::Script::Functions::UserFunctions
-  def call_options_on_new_literal
-    str = Sass::Script::String.new("foo")
+  def call_options_on_new_value
+    str = Sass::Script::Value::String.new("foo")
     str.options[:foo]
     str
   end
 
   def user_defined
-    Sass::Script::String.new("I'm a user-defined string!")
+    Sass::Script::Value::String.new("I'm a user-defined string!")
   end
 
   def _preceding_underscore
-    Sass::Script::String.new("I'm another user-defined string!")
+    Sass::Script::Value::String.new("I'm another user-defined string!")
   end
 
   def fetch_the_variable
@@ -954,16 +954,16 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def test_user_defined_function_using_environment
-    environment = env('variable' => Sass::Script::String.new('The variable'))
+    environment = env('variable' => Sass::Script::Value::String.new('The variable'))
     assert_equal("The variable", evaluate("fetch_the_variable()", environment))
   end
 
-  def test_options_on_new_literals_fails
-    assert_error_message(<<MSG, "call-options-on-new-literal()")
-The #options attribute is not set on this Sass::Script::String.
+  def test_options_on_new_values_fails
+    assert_error_message(<<MSG, "call-options-on-new-value()")
+The #options attribute is not set on this Sass::Script::Value::String.
   This error is probably occurring because #to_s was called
-  on this literal within a custom Sass function without first
-  setting the #option attribute.
+  on this value within a custom Sass function without first
+  setting the #options attribute.
 MSG
   end
 
@@ -1199,32 +1199,32 @@ MSG
 
   def test_assert_unit
     ctx = Sass::Script::Functions::EvaluationContext.new(Sass::Environment.new(nil, {}))
-    ctx.assert_unit Sass::Script::Number.new(10, ["px"], []), "px"
-    ctx.assert_unit Sass::Script::Number.new(10, [], []), nil
+    ctx.assert_unit Sass::Script::Value::Number.new(10, ["px"], []), "px"
+    ctx.assert_unit Sass::Script::Value::Number.new(10, [], []), nil
 
     begin
-      ctx.assert_unit Sass::Script::Number.new(10, [], []), "px"
+      ctx.assert_unit Sass::Script::Value::Number.new(10, [], []), "px"
       fail
     rescue ArgumentError => e
       assert_equal "Expected 10 to have a unit of px", e.message
     end
 
     begin
-      ctx.assert_unit Sass::Script::Number.new(10, ["px"], []), nil
+      ctx.assert_unit Sass::Script::Value::Number.new(10, ["px"], []), nil
       fail
     rescue ArgumentError => e
       assert_equal "Expected 10px to be unitless", e.message
     end
 
     begin
-      ctx.assert_unit Sass::Script::Number.new(10, [], []), "px", "arg"
+      ctx.assert_unit Sass::Script::Value::Number.new(10, [], []), "px", "arg"
       fail
     rescue ArgumentError => e
       assert_equal "Expected $arg to have a unit of px but got 10", e.message
     end
 
     begin
-      ctx.assert_unit Sass::Script::Number.new(10, ["px"], []), nil, "arg"
+      ctx.assert_unit Sass::Script::Value::Number.new(10, ["px"], []), nil, "arg"
       fail
     rescue ArgumentError => e
       assert_equal "Expected $arg to be unitless but got 10px", e.message
@@ -1246,7 +1246,7 @@ MSG
 
   def evaluate(value, environment = env)
     result = perform(value, environment)
-    assert_kind_of Sass::Script::Literal, result
+    assert_kind_of Sass::Script::Value::Base, result
     return result.to_s
   end
 

data/test/sass/plugin_test.rb

@@ -7,13 +7,13 @@ require 'fileutils'
 module Sass::Script::Functions
   def filename
     filename = options[:filename].gsub(%r{.*((/[^/]+){4})}, '\1')
-    Sass::Script::String.new(filename)
+    Sass::Script::Value::String.new(filename)
   end
 
   def whatever
     custom = options[:custom]
     whatever = custom && custom[:whatever]
-    Sass::Script::String.new(whatever || "incorrect")
+    Sass::Script::Value::String.new(whatever || "incorrect")
   end
 end
 

data/test/sass/script_test.rb

@@ -5,7 +5,7 @@ require 'sass/engine'
 module Sass::Script::Functions::UserFunctions
   def assert_options(val)
     val.options[:foo]
-    Sass::Script::String.new("Options defined!")
+    Sass::Script::Value::String.new("Options defined!")
   end
 
   def arg_error
@@ -21,13 +21,13 @@ class SassScriptTest < Test::Unit::TestCase
   include Sass::Script
 
   def test_color_checks_input
-    assert_raise_message(ArgumentError, "Blue value -1 must be between 0 and 255") {Color.new([1, 2, -1])}
-    assert_raise_message(ArgumentError, "Red value 256 must be between 0 and 255") {Color.new([256, 2, 3])}
+    assert_raise_message(ArgumentError, "Blue value -1 must be between 0 and 255") {Sass::Script::Value::Color.new([1, 2, -1])}
+    assert_raise_message(ArgumentError, "Red value 256 must be between 0 and 255") {Sass::Script::Value::Color.new([256, 2, 3])}
   end
 
   def test_color_checks_rgba_input
-    assert_raise_message(ArgumentError, "Alpha channel 1.1 must be between 0 and 1") {Color.new([1, 2, 3, 1.1])}
-    assert_raise_message(ArgumentError, "Alpha channel -0.1 must be between 0 and 1") {Color.new([1, 2, 3, -0.1])}
+    assert_raise_message(ArgumentError, "Alpha channel 1.1 must be between 0 and 1") {Sass::Script::Value::Color.new([1, 2, 3, 1.1])}
+    assert_raise_message(ArgumentError, "Alpha channel -0.1 must be between 0 and 1") {Sass::Script::Value::Color.new([1, 2, 3, -0.1])}
   end
 
   def test_string_escapes
@@ -51,14 +51,14 @@ class SassScriptTest < Test::Unit::TestCase
   end
 
   def test_rgba_color_literals
-    assert_equal Sass::Script::Color.new([1, 2, 3, 0.75]), eval("rgba(1, 2, 3, 0.75)")
+    assert_equal Sass::Script::Value::Color.new([1, 2, 3, 0.75]), eval("rgba(1, 2, 3, 0.75)")
     assert_equal "rgba(1, 2, 3, 0.75)", resolve("rgba(1, 2, 3, 0.75)")
 
-    assert_equal Sass::Script::Color.new([1, 2, 3, 0]), eval("rgba(1, 2, 3, 0)")
+    assert_equal Sass::Script::Value::Color.new([1, 2, 3, 0]), eval("rgba(1, 2, 3, 0)")
     assert_equal "rgba(1, 2, 3, 0)", resolve("rgba(1, 2, 3, 0)")
 
-    assert_equal Sass::Script::Color.new([1, 2, 3]), eval("rgba(1, 2, 3, 1)")
-    assert_equal Sass::Script::Color.new([1, 2, 3, 1]), eval("rgba(1, 2, 3, 1)")
+    assert_equal Sass::Script::Value::Color.new([1, 2, 3]), eval("rgba(1, 2, 3, 1)")
+    assert_equal Sass::Script::Value::Color.new([1, 2, 3, 1]), eval("rgba(1, 2, 3, 1)")
     assert_equal "#010203", resolve("rgba(1, 2, 3, 1)")
     assert_equal "white", resolve("rgba(255, 255, 255, 1)")
   end
@@ -107,8 +107,8 @@ class SassScriptTest < Test::Unit::TestCase
   end
 
   def test_implicit_strings
-    assert_equal Sass::Script::String.new("foo"), eval("foo")
-    assert_equal Sass::Script::String.new("foo/bar"), eval("foo/bar")
+    assert_equal Sass::Script::Value::String.new("foo"), eval("foo")
+    assert_equal Sass::Script::Value::String.new("foo/bar"), eval("foo/bar")
   end
 
   def test_basic_interpolation
@@ -232,9 +232,9 @@ SASS
   end
 
   def test_dynamic_url
-    assert_equal "url(foo-bar)", resolve("url($foo)", {}, env('foo' => Sass::Script::String.new("foo-bar")))
-    assert_equal "url(foo-bar baz)", resolve("url($foo $bar)", {}, env('foo' => Sass::Script::String.new("foo-bar"), 'bar' => Sass::Script::String.new("baz")))
-    assert_equal "url(foo baz)", resolve("url(foo $bar)", {}, env('bar' => Sass::Script::String.new("baz")))
+    assert_equal "url(foo-bar)", resolve("url($foo)", {}, env('foo' => Sass::Script::Value::String.new("foo-bar")))
+    assert_equal "url(foo-bar baz)", resolve("url($foo $bar)", {}, env('foo' => Sass::Script::Value::String.new("foo-bar"), 'bar' => Sass::Script::Value::String.new("baz")))
+    assert_equal "url(foo baz)", resolve("url(foo $bar)", {}, env('bar' => Sass::Script::Value::String.new("baz")))
     assert_equal "url(foo bar)", resolve("url(foo    bar)")
   end
 
@@ -246,7 +246,7 @@ SASS
   end
 
   def test_hyphenated_variables
-    assert_equal("a-b", resolve("$a-b", {}, env("a-b" => Sass::Script::String.new("a-b"))))
+    assert_equal("a-b", resolve("$a-b", {}, env("a-b" => Sass::Script::Value::String.new("a-b"))))
   end
 
   def test_ruby_equality
@@ -376,7 +376,7 @@ SASS
 
   def test_equals
     assert_equal("true", resolve('"foo" == $foo', {},
-        env("foo" => Sass::Script::String.new("foo"))))
+        env("foo" => Sass::Script::Value::String.new("foo"))))
     assert_equal "true", resolve("1 == 1.0")
     assert_equal "true", resolve("false != true")
     assert_equal "false", resolve("1em == 1px")
@@ -507,8 +507,8 @@ SASS
   end
 
   def test_boolean_ops_short_circuit
-    assert_equal "false", resolve("$ie and $ie <= 7", {}, env('ie' => Sass::Script::Bool.new(false)))
-    assert_equal "true", resolve("$ie or $undef", {}, env('ie' => Sass::Script::Bool.new(true)))
+    assert_equal "false", resolve("$ie and $ie <= 7", {}, env('ie' => Sass::Script::Value::Bool.new(false)))
+    assert_equal "true", resolve("$ie or $undef", {}, env('ie' => Sass::Script::Value::Bool.new(true)))
   end
 
   # Regression Tests
@@ -542,16 +542,25 @@ SASS
   end
 
   def test_number_initialization
-    assert_equal Sass::Script::Number.new(10, ["px"]), Sass::Script::Number.new(10, "px")
-    assert_equal Sass::Script::Number.new(10, ["px"], ["em"]), Sass::Script::Number.new(10, "px", "em")
+    assert_equal Sass::Script::Value::Number.new(10, ["px"]), Sass::Script::Value::Number.new(10, "px")
+    assert_equal Sass::Script::Value::Number.new(10, ["px"], ["em"]), Sass::Script::Value::Number.new(10, "px", "em")
   end
 
   def test_is_unit
-    assert Sass::Script::Number.new(10, "px").is_unit?("px")
-    assert Sass::Script::Number.new(10).is_unit?(nil)
-    assert !Sass::Script::Number.new(10, "px", "em").is_unit?("px")
-    assert !Sass::Script::Number.new(10, [], "em").is_unit?("em")
-    assert !Sass::Script::Number.new(10, ["px", "em"]).is_unit?("px")
+    assert Sass::Script::Value::Number.new(10, "px").is_unit?("px")
+    assert Sass::Script::Value::Number.new(10).is_unit?(nil)
+    assert !Sass::Script::Value::Number.new(10, "px", "em").is_unit?("px")
+    assert !Sass::Script::Value::Number.new(10, [], "em").is_unit?("em")
+    assert !Sass::Script::Value::Number.new(10, ["px", "em"]).is_unit?("px")
+  end
+
+  def test_rename_redirect
+    assert_no_warning do
+      assert_equal Sass::Script::Value::Base, Sass::Script::Literal
+      assert_equal Sass::Script::Tree::Node, Sass::Script::Node
+      assert_equal Sass::Script::Tree::Operation, Sass::Script::Operation
+      assert_equal Sass::Script::Value::String, Sass::Script::String
+    end
   end
 
   private
@@ -559,21 +568,21 @@ SASS
   def resolve(str, opts = {}, environment = env)
     munge_filename opts
     val = eval(str, opts, environment)
-    assert_kind_of Sass::Script::Literal, val
-    val.is_a?(Sass::Script::String) ? val.value : val.to_s
+    assert_kind_of Sass::Script::Value::Base, val
+    val.is_a?(Sass::Script::Value::String) ? val.value : val.to_s
   end
 
   def assert_unquoted(str, opts = {}, environment = env)
     munge_filename opts
     val = eval(str, opts, environment)
-    assert_kind_of Sass::Script::String, val
+    assert_kind_of Sass::Script::Value::String, val
     assert_equal :identifier, val.type
   end
 
   def assert_quoted(str, opts = {}, environment = env)
     munge_filename opts
     val = eval(str, opts, environment)
-    assert_kind_of Sass::Script::String, val
+    assert_kind_of Sass::Script::Value::String, val
     assert_equal :string, val.type
   end