oreorenasass 3.4.4 → 3.4.5

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

@@ -16,18 +16,13 @@ class Sass::Tree::Visitors::DeepCopy < Sass::Tree::Visitors::Base
     yield
   end
 
-  def visit_error(node)
-    node.expr = node.expr.deep_copy
-    yield
-  end
-
   def visit_each(node)
     node.list = node.list.deep_copy
     yield
   end
 
   def visit_extend(node)
-    node.selector = node.selector.map {|c| c.is_a?(Sass::Script::Tree::Node) ? c.deep_copy : c}
+    node.selector = node.selector.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
     yield
   end
 
@@ -60,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::Tree::Node) ? c.deep_copy : c}
+    node.name = node.name.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
     node.value = node.value.deep_copy
     yield
   end
@@ -71,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::Tree::Node) ? c.deep_copy : c}
+    node.rule = node.rule.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
     yield
   end
 
@@ -91,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::Tree::Node) ? c.deep_copy : c}
+    node.value = node.value.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
     yield
   end
 
   def visit_media(node)
-    node.query = node.query.map {|c| c.is_a?(Sass::Script::Tree::Node) ? c.deep_copy : c}
+    node.query = node.query.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
     yield
   end
 

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

@@ -49,7 +49,7 @@ class Sass::Tree::Visitors::Extend < Sass::Tree::Visitors::Base
   def self.check_extends_fired!(extends)
     extends.each_value do |ex|
       next if ex.result == :succeeded || ex.node.optional?
-      message = "\"#{ex.extender}\" failed to @extend \"#{ex.target.join}\"."
+      warn = "\"#{ex.extender}\" failed to @extend \"#{ex.target.join}\"."
       reason =
         if ex.result == :not_found
           "The selector \"#{ex.target.join}\" was not found."
@@ -57,12 +57,12 @@ class Sass::Tree::Visitors::Extend < Sass::Tree::Visitors::Base
           "No selectors matching \"#{ex.target.join}\" could be unified with \"#{ex.extender}\"."
         end
 
-      # TODO(nweiz): this should use the Sass stack trace of the extend node.
-      raise Sass::SyntaxError.new(<<MESSAGE, :filename => ex.node.filename, :line => ex.node.line)
-#{message}
-#{reason}
-Use "@extend #{ex.target.join} !optional" if the extend should be able to fail.
-MESSAGE
+      Sass::Util.sass_warn <<WARN
+WARNING on line #{ex.node.line}#{" of #{ex.node.filename}" if ex.node.filename}: #{warn}
+  #{reason}
+  This will be an error in future releases of Sass.
+  Use "@extend #{ex.target.join} !optional" if the extend should be able to fail.
+WARN
     end
   end
 end

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

@@ -1,155 +1,103 @@
 # A visitor for converting a dynamic Sass tree into a static Sass tree.
 class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
-  class << self
-    # @param root [Tree::Node] The root node of the tree to visit.
-    # @param environment [Sass::Environment] The lexical environment.
-    # @return [Tree::Node] The resulting tree of static nodes.
-    def visit(root, environment = nil)
-      new(environment).send(:visit, root)
-    end
-
-    # @api private
-    # @comment
-    #   rubocop:disable MethodLength
-    def perform_arguments(callable, args, splat)
-      desc = "#{callable.type.capitalize} #{callable.name}"
-      downcase_desc = "#{callable.type} #{callable.name}"
-
-      # All keywords are contained in splat.keywords for consistency,
-      # even if there were no splats passed in.
-      old_keywords_accessed = splat.keywords_accessed
-      keywords = splat.keywords
-      splat.keywords_accessed = old_keywords_accessed
-
-      begin
-        unless keywords.empty?
-          unknown_args = Sass::Util.array_minus(keywords.keys,
-            callable.args.map {|var| var.first.underscored_name})
-          if callable.splat && unknown_args.include?(callable.splat.underscored_name)
-            raise Sass::SyntaxError.new("Argument $#{callable.splat.name} of #{downcase_desc} " +
-                                        "cannot be used as a named argument.")
-          elsif unknown_args.any?
-            description = unknown_args.length > 1 ? 'the following arguments:' : 'an argument named'
-            raise Sass::SyntaxError.new("#{desc} doesn't have #{description} " +
-                                        "#{unknown_args.map {|name| "$#{name}"}.join ', '}.")
-          end
-        end
-      rescue Sass::SyntaxError => keyword_exception
-      end
-
-      # If there's no splat, raise the keyword exception immediately. The actual
-      # raising happens in the ensure clause at the end of this function.
-      return if keyword_exception && !callable.splat
-
-      if args.size > callable.args.size && !callable.splat
-        takes = callable.args.size
-        passed = args.size
-        raise Sass::SyntaxError.new(
-          "#{desc} takes #{takes} argument#{'s' unless takes == 1} " +
-          "but #{passed} #{passed == 1 ? 'was' : 'were'} passed.")
-      end
+  # @param root [Tree::Node] The root node of the tree to visit.
+  # @param environment [Sass::Environment] The lexical environment.
+  # @return [Tree::Node] The resulting tree of static nodes.
+  def self.visit(root, environment = Sass::Environment.new)
+    new(environment).send(:visit, root)
+  end
 
-      splat_sep = :comma
-      if splat
-        args += splat.to_a
-        splat_sep = splat.separator
-      end
+  # @api private
+  def self.perform_arguments(callable, args, keywords, splat)
+    desc = "#{callable.type.capitalize} #{callable.name}"
+    downcase_desc = "#{callable.type} #{callable.name}"
 
-      env = Sass::Environment.new(callable.environment)
-      callable.args.zip(args[0...callable.args.length]) do |(var, default), value|
-        if value && keywords.has_key?(var.name)
-          raise Sass::SyntaxError.new("#{desc} was passed argument $#{var.name} " +
-                                      "both by position and by name.")
+    begin
+      unless keywords.empty?
+        unknown_args = Sass::Util.array_minus(keywords.keys,
+          callable.args.map {|var| var.first.underscored_name})
+        if callable.splat && unknown_args.include?(callable.splat.underscored_name)
+          raise Sass::SyntaxError.new("Argument $#{callable.splat.name} of #{downcase_desc} cannot be used as a named argument.")
+        elsif unknown_args.any?
+          description = unknown_args.length > 1 ? 'the following arguments:' : 'an argument named'
+          raise Sass::SyntaxError.new("#{desc} doesn't have #{description} #{unknown_args.map {|name| "$#{name}"}.join ', '}.")
         end
-
-        value ||= keywords.delete(var.name)
-        value ||= default && default.perform(env)
-        raise Sass::SyntaxError.new("#{desc} is missing argument #{var.inspect}.") unless value
-        env.set_local_var(var.name, value)
       end
+    rescue Sass::SyntaxError => keyword_exception
+    end
 
-      if callable.splat
-        rest = args[callable.args.length..-1] || []
-        arg_list = Sass::Script::Value::ArgList.new(rest, keywords, splat_sep)
-        arg_list.options = env.options
-        env.set_local_var(callable.splat.name, arg_list)
-      end
+    # If there's no splat, raise the keyword exception immediately. The actual
+    # raising happens in the ensure clause at the end of this function.
+    return if keyword_exception && !callable.splat
 
-      yield env
-    rescue StandardError => e
-    ensure
-      # If there's a keyword exception, we don't want to throw it immediately,
-      # because the invalid keywords may be part of a glob argument that should be
-      # passed on to another function. So we only raise it if we reach the end of
-      # this function *and* the keywords attached to the argument list glob object
-      # haven't been accessed.
-      #
-      # The keyword exception takes precedence over any Sass errors, but not over
-      # non-Sass exceptions.
-      if keyword_exception &&
-          !(arg_list && arg_list.keywords_accessed) &&
-          (e.nil? || e.is_a?(Sass::SyntaxError))
-        raise keyword_exception
-      elsif e
-        raise e
-      end
+    if args.size > callable.args.size && !callable.splat
+      takes = callable.args.size
+      passed = args.size
+      raise Sass::SyntaxError.new(
+        "#{desc} takes #{takes} argument#{'s' unless takes == 1} " +
+        "but #{passed} #{passed == 1 ? 'was' : 'were'} passed.")
     end
 
-    # @api private
-    # @return [Sass::Script::Value::ArgList]
-    def perform_splat(splat, performed_keywords, kwarg_splat, environment)
-      args, kwargs, separator = [], nil, :comma
-
-      if splat
-        splat = splat.perform(environment)
-        separator = splat.separator || separator
-        if splat.is_a?(Sass::Script::Value::ArgList)
-          args = splat.to_a
-          kwargs = splat.keywords
-        elsif splat.is_a?(Sass::Script::Value::Map)
-          kwargs = arg_hash(splat)
-        else
-          args = splat.to_a
-        end
-      end
-      kwargs ||= Sass::Util::NormalizedMap.new
-      kwargs.update(performed_keywords)
-
-      if kwarg_splat
-        kwarg_splat = kwarg_splat.perform(environment)
-        unless kwarg_splat.is_a?(Sass::Script::Value::Map)
-          raise Sass::SyntaxError.new("Variable keyword arguments must be a map " +
-                                      "(was #{kwarg_splat.inspect}).")
-        end
-        kwargs.update(arg_hash(kwarg_splat))
+    splat_sep = :comma
+    if splat
+      args += splat.to_a
+      splat_sep = splat.separator if splat.is_a?(Sass::Script::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)
+    end
+
+    keywords = keywords.dup
+    env = Sass::Environment.new(callable.environment)
+    callable.args.zip(args[0...callable.args.length]) do |(var, default), value|
+      if value && keywords.include?(var.underscored_name)
+        raise Sass::SyntaxError.new("#{desc} was passed argument $#{var.name} both by position and by name.")
       end
 
-      Sass::Script::Value::ArgList.new(args, kwargs, separator)
+      value ||= keywords.delete(var.underscored_name)
+      value ||= default && default.perform(env)
+      raise Sass::SyntaxError.new("#{desc} is missing argument #{var.inspect}.") unless value
+      env.set_local_var(var.name, value)
     end
 
-    private
+    if callable.splat
+      rest = args[callable.args.length..-1]
+      arg_list = Sass::Script::ArgList.new(rest, keywords.dup, splat_sep)
+      arg_list.options = env.options
+      env.set_local_var(callable.splat.name, arg_list)
+    end
 
-    def arg_hash(map)
-      Sass::Util.map_keys(map.to_h) do |key|
-        next key.value if key.is_a?(Sass::Script::Value::String)
-        raise Sass::SyntaxError.new("Variable keyword argument map must have string keys.\n" +
-          "#{key.inspect} is not a string in #{map.inspect}.")
-      end
+    yield env
+  rescue Exception => e
+  ensure
+    # If there's a keyword exception, we don't want to throw it immediately,
+    # because the invalid keywords may be part of a glob argument that should be
+    # passed on to another function. So we only raise it if we reach the end of
+    # this function *and* the keywords attached to the argument list glob object
+    # haven't been accessed.
+    #
+    # The keyword exception takes precedence over any Sass errors, but not over
+    # non-Sass exceptions.
+    if keyword_exception &&
+        !(arg_list && arg_list.keywords_accessed) &&
+        (e.nil? || e.is_a?(Sass::SyntaxError))
+      raise keyword_exception
+    elsif e
+      raise e
     end
   end
-  # @comment
-  #   rubocop:enable MethodLength
 
   protected
 
   def initialize(env)
     @environment = env
+    # Stack trace information, including mixin includes and imports.
+    @stack = []
   end
 
   # If an exception is raised, this adds proper metadata to the backtrace.
   def visit(node)
-    return super(node.dup) unless @environment
-    @environment.stack.with_base(node.filename, node.line) {super(node.dup)}
+    super(node.dup)
   rescue Sass::SyntaxError => e
     e.modify_backtrace(:filename => node.filename, :line => node.line)
     raise e
@@ -194,11 +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)
-    if res.is_a?(Sass::Script::Value::String)
-      res = res.value
-    else
-      res = res.to_sass
-    end
+    res = res.value if res.is_a?(Sass::Script::String)
     if node.filename
       Sass::Util.sass_warn "#{node.filename}:#{node.line} DEBUG: #{res}"
     else
@@ -207,30 +151,13 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     []
   end
 
-  # Throws the expression as an error.
-  def visit_error(node)
-    res = node.expr.perform(@environment)
-    if res.is_a?(Sass::Script::Value::String)
-      res = res.value
-    else
-      res = res.to_sass
-    end
-    raise Sass::SyntaxError.new(res)
-  end
-
   # Runs the child nodes once for each value in the list.
   def visit_each(node)
     list = node.list.perform(@environment)
 
     with_environment Sass::Environment.new(@environment) do
-      list.to_a.map do |value|
-        if node.vars.length == 1
-          @environment.set_local_var(node.vars.first, value)
-        else
-          node.vars.zip(value.to_a) do |(var, sub_value)|
-            @environment.set_local_var(var, sub_value || Sass::Script::Value::Null.new)
-          end
-        end
+      list.to_a.map do |v|
+        @environment.set_local_var(node.var, v)
         node.children.map {|c| visit(c)}
       end.flatten
     end
@@ -239,8 +166,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   # Runs SassScript interpolation in the selector,
   # and then parses the result into a {Sass::Selector::CommaSequence}.
   def visit_extend(node)
-    parser = Sass::SCSS::StaticParser.new(run_interp(node.selector),
-      node.filename, node.options[:importer], node.line)
+    parser = Sass::SCSS::StaticParser.new(run_interp(node.selector), node.filename, node.line)
     node.resolved_selector = parser.parse_selector
     node
   end
@@ -253,14 +179,12 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     to.assert_int!
 
     to = to.coerce(from.numerator_units, from.denominator_units)
-    direction = from.to_i > to.to_i ? -1 : 1
-    range = Range.new(direction * from.to_i, direction * to.to_i, node.exclusive)
+    range = Range.new(from.to_i, to.to_i, node.exclusive)
 
     with_environment Sass::Environment.new(@environment) do
       range.map do |i|
         @environment.set_local_var(node.var,
-          Sass::Script::Value::Number.new(direction * i,
-            from.numerator_units, from.denominator_units))
+          Sass::Script::Number.new(i, from.numerator_units, from.denominator_units))
         node.children.map {|c| visit(c)}
       end.flatten
     end
@@ -270,8 +194,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   def visit_function(node)
     env = Sass::Environment.new(@environment, node.options)
     @environment.set_local_function(node.name,
-      Sass::Callable.new(node.name, node.args, node.splat, env,
-                         node.children, !:has_content, "function"))
+      Sass::Callable.new(node.name, node.args, node.splat, env, node.children, !:has_content, "function"))
     []
   end
 
@@ -291,84 +214,82 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   # Returns a static DirectiveNode if this is importing a CSS file,
   # or parses and includes the imported Sass file.
   def visit_import(node)
-    if (path = node.css_import?)
-      resolved_node = Sass::Tree::CssImportNode.resolved("url(#{path})")
-      resolved_node.source_range = node.source_range
-      return resolved_node
+    if path = node.css_import?
+      return Sass::Tree::CssImportNode.resolved("url(#{path})")
     end
     file = node.imported_file
-    if @environment.stack.frames.any? {|f| f.is_import? && f.filename == file.options[:filename]}
-      handle_import_loop!(node)
-    end
+    handle_import_loop!(node) if @stack.any? {|e| e[:filename] == file.options[:filename]}
 
     begin
-      @environment.stack.with_import(node.filename, node.line) do
-        root = file.to_tree
-        Sass::Tree::Visitors::CheckNesting.visit(root)
-        node.children = root.children.map {|c| visit(c)}.flatten
-        node
-      end
+      @stack.push(:filename => node.filename, :line => node.line)
+      root = file.to_tree
+      Sass::Tree::Visitors::CheckNesting.visit(root)
+      node.children = root.children.map {|c| visit(c)}.flatten
+      node
     rescue Sass::SyntaxError => e
       e.modify_backtrace(:filename => node.imported_file.options[:filename])
       e.add_backtrace(:filename => node.filename, :line => node.line)
       raise e
     end
+  ensure
+    @stack.pop unless path
   end
 
   # Loads a mixin into the environment.
   def visit_mixindef(node)
     env = Sass::Environment.new(@environment, node.options)
     @environment.set_local_mixin(node.name,
-      Sass::Callable.new(node.name, node.args, node.splat, env,
-                         node.children, node.has_content, "mixin"))
+      Sass::Callable.new(node.name, node.args, node.splat, env, node.children, node.has_content, "mixin"))
     []
   end
 
   # Runs a mixin.
   def visit_mixin(node)
-    @environment.stack.with_mixin(node.filename, node.line, node.name) do
-      mixin = @environment.mixin(node.name)
-      raise Sass::SyntaxError.new("Undefined mixin '#{node.name}'.") unless mixin
+    include_loop = true
+    handle_include_loop!(node) if @stack.any? {|e| e[:name] == node.name}
+    include_loop = false
 
-      if node.children.any? && !mixin.has_content
-        raise Sass::SyntaxError.new(%Q{Mixin "#{node.name}" does not accept a content block.})
-      end
+    @stack.push(:filename => node.filename, :line => node.line, :name => node.name)
+    raise Sass::SyntaxError.new("Undefined mixin '#{node.name}'.") unless mixin = @environment.mixin(node.name)
 
-      args = node.args.map {|a| a.perform(@environment)}
-      keywords = Sass::Util.map_vals(node.keywords) {|v| v.perform(@environment)}
-      splat = self.class.perform_splat(node.splat, keywords, node.kwarg_splat, @environment)
+    if node.children.any? && !mixin.has_content
+      raise Sass::SyntaxError.new(%Q{Mixin "#{node.name}" does not accept a content block.})
+    end
 
-      self.class.perform_arguments(mixin, args, splat) do |env|
-        env.caller = Sass::Environment.new(@environment)
-        env.content = [node.children, @environment] if node.has_children
+    args = node.args.map {|a| a.perform(@environment)}
+    keywords = Sass::Util.map_hash(node.keywords) {|k, v| [k, v.perform(@environment)]}
+    splat = node.splat.perform(@environment) if node.splat
 
-        trace_node = Sass::Tree::TraceNode.from_node(node.name, node)
-        with_environment(env) {trace_node.children = mixin.tree.map {|c| visit(c)}.flatten}
-        trace_node
-      end
+    self.class.perform_arguments(mixin, args, keywords, splat) do |env|
+      env.caller = Sass::Environment.new(@environment)
+      env.content = node.children if node.has_children
+
+      trace_node = Sass::Tree::TraceNode.from_node(node.name, node)
+      with_environment(env) {trace_node.children = mixin.tree.map {|c| visit(c)}.flatten}
+      trace_node
     end
   rescue Sass::SyntaxError => e
-    e.modify_backtrace(:mixin => node.name, :line => node.line)
-    e.add_backtrace(:line => node.line)
+    unless include_loop
+      e.modify_backtrace(:mixin => node.name, :line => node.line)
+      e.add_backtrace(:line => node.line)
+    end
     raise e
+  ensure
+    @stack.pop unless include_loop
   end
 
   def visit_content(node)
-    content, content_env = @environment.content
-    return [] unless content
-    @environment.stack.with_mixin(node.filename, node.line, '@content') do
-      trace_node = Sass::Tree::TraceNode.from_node('@content', node)
-      content_env = Sass::Environment.new(content_env)
-      content_env.caller = Sass::Environment.new(@environment)
-      with_environment(content_env) do
-        trace_node.children = content.map {|c| visit(c.dup)}.flatten
-      end
-      trace_node
-    end
+    return [] unless content = @environment.content
+    @stack.push(:filename => node.filename, :line => node.line, :name => '@content')
+    trace_node = Sass::Tree::TraceNode.from_node('@content', node)
+    with_environment(@environment.caller) {trace_node.children = content.map {|c| visit(c.dup)}.flatten}
+    trace_node
   rescue Sass::SyntaxError => e
     e.modify_backtrace(:mixin => '@content', :line => node.line)
     e.add_backtrace(:line => node.line)
     raise e
+  ensure
+    @stack.pop if content
   end
 
   # Runs any SassScript that may be embedded in a property.
@@ -376,7 +297,6 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     node.resolved_name = run_interp(node.name)
     val = node.value.perform(@environment)
     node.resolved_value = val.to_s
-    node.value_source_range = val.source_range if val.source_range
     yield
   end
 
@@ -388,83 +308,38 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   # Runs SassScript interpolation in the selector,
   # and then parses the result into a {Sass::Selector::CommaSequence}.
   def visit_rule(node)
-    old_at_root_without_rule = @at_root_without_rule
-    parser = Sass::SCSS::StaticParser.new(run_interp(node.rule),
-      node.filename, node.options[:importer], node.line)
-    if @in_keyframes
-      keyframe_rule_node = Sass::Tree::KeyframeRuleNode.new(parser.parse_keyframes_selector)
-      keyframe_rule_node.options = node.options
-      keyframe_rule_node.line = node.line
-      keyframe_rule_node.filename = node.filename
-      keyframe_rule_node.source_range = node.source_range
-      with_environment Sass::Environment.new(@environment, node.options) do
-        keyframe_rule_node.children = node.children.map {|c| visit(c)}.flatten
-      end
-      keyframe_rule_node
-    else
-      @at_root_without_rule = false
-      node.parsed_rules ||= parser.parse_selector
-      node.resolved_rules = node.parsed_rules.resolve_parent_refs(
-        @environment.selector, !old_at_root_without_rule)
-      node.stack_trace = @environment.stack.to_s if node.options[:trace_selectors]
-      with_environment Sass::Environment.new(@environment, node.options) do
-        @environment.selector = node.resolved_rules
-        node.children = node.children.map {|c| visit(c)}.flatten
-      end
-      node
+    rule = node.rule
+    rule = rule.map {|e| e.is_a?(String) && e != ' ' ? e.strip : e} if node.style == :compressed
+    parser = Sass::SCSS::StaticParser.new(run_interp(node.rule), node.filename, node.line)
+    node.parsed_rules ||= parser.parse_selector
+    if node.options[:trace_selectors]
+      @stack.push(:filename => node.filename, :line => node.line)
+      node.stack_trace = stack_trace
+      @stack.pop
     end
-  ensure
-    @at_root_without_rule = old_at_root_without_rule
-  end
-
-  # Sets a variable that indicates that the first level of rule nodes
-  # shouldn't include the parent selector by default.
-  def visit_atroot(node)
-    if node.query
-      parser = Sass::SCSS::StaticParser.new(run_interp(node.query),
-        node.filename, node.options[:importer], node.line)
-      node.resolved_type, node.resolved_value = parser.parse_static_at_root_query
-    else
-      node.resolved_type, node.resolved_value = :without, ['rule']
-    end
-
-    old_at_root_without_rule = @at_root_without_rule
-    old_in_keyframes = @in_keyframes
-    @at_root_without_rule = true if node.exclude?('rule')
-    @in_keyframes = false if node.exclude?('keyframes')
     yield
-  ensure
-    @in_keyframes = old_in_keyframes
-    @at_root_without_rule = old_at_root_without_rule
   end
 
   # Loads the new variable value into the environment.
   def visit_variable(node)
-    env = @environment
-    env = env.global_env if node.global
-    if node.guarded
-      var = env.var(node.name)
-      return [] if var && !var.null?
-    end
-
+    var = @environment.var(node.name)
+    return [] if node.guarded && var && !var.null?
     val = node.expr.perform(@environment)
-    if node.expr.source_range
-      val.source_range = node.expr.source_range
-    else
-      val.source_range = node.source_range
-    end
-    env.set_var(node.name, val)
+    @environment.set_var(node.name, val)
     []
   end
 
   # Prints the expression to STDERR with a stylesheet trace.
   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::Value::String)
+    res = res.value if res.is_a?(Sass::Script::String)
     msg = "WARNING: #{res}\n         "
-    msg << @environment.stack.to_s.gsub("\n", "\n         ") << "\n"
+    msg << stack_trace.join("\n         ") << "\n"
     Sass::Util.sass_warn msg
     []
+  ensure
+    @stack.pop
   end
 
   # Runs the child nodes until the continuation expression becomes false.
@@ -478,18 +353,11 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
   def visit_directive(node)
     node.resolved_value = run_interp(node.value)
-    old_in_keyframes, @in_keyframes = @in_keyframes, node.normalized_name == "@keyframes"
-    with_environment Sass::Environment.new(@environment) do
-      node.children = node.children.map {|c| visit(c)}.flatten
-      node
-    end
-  ensure
-    @in_keyframes = old_in_keyframes
+    yield
   end
 
   def visit_media(node)
-    parser = Sass::SCSS::StaticParser.new(run_interp(node.query),
-      node.filename, node.options[:importer], node.line)
+    parser = Sass::SCSS::StaticParser.new(run_interp(node.query), node.filename, node.line)
     node.resolved_query ||= parser.parse_media_query_list
     yield
   end
@@ -502,9 +370,8 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
   def visit_cssimport(node)
     node.resolved_uri = run_interp([node.uri])
-    if node.query && !node.query.empty?
-      parser = Sass::SCSS::StaticParser.new(run_interp(node.query),
-        node.filename, node.options[:importer], node.line)
+    if node.query
+      parser = Sass::SCSS::StaticParser.new(run_interp(node.query), node.filename, node.line)
       node.resolved_query ||= parser.parse_media_query_list
     end
     yield
@@ -512,10 +379,26 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
   private
 
+  def stack_trace
+    trace = []
+    stack = @stack.map {|e| e.dup}.reverse
+    stack.each_cons(2) {|(e1, e2)| e1[:caller] = e2[:name]; [e1, e2]}
+    stack.each_with_index do |entry, i|
+      msg = "#{i == 0 ? "on" : "from"} line #{entry[:line]}"
+      msg << " of #{entry[:filename] || "an unknown file"}"
+      msg << ", in `#{entry[:caller]}'" if entry[:caller]
+      trace << msg
+    end
+    trace
+  end
+
   def run_interp_no_strip(text)
     text.map do |r|
       next r if r.is_a?(String)
-      r.perform(@environment).to_s(:quote => :none)
+      val = r.perform(@environment)
+      # Interpolated strings should never render with quotes
+      next val.value if val.is_a?(Sass::Script::String)
+      val.to_s
     end.join
   end
 
@@ -523,9 +406,33 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     run_interp_no_strip(text).strip
   end
 
+  def handle_include_loop!(node)
+    msg = "An @include loop has been found:"
+    content_count = 0
+    mixins = @stack.reverse.map {|s| s[:name]}.compact.select do |s|
+      if s == '@content'
+        content_count += 1
+        false
+      elsif content_count > 0
+        content_count -= 1
+        false
+      else
+        true
+      end
+    end
+
+    return unless mixins.include?(node.name)
+    raise Sass::SyntaxError.new("#{msg} #{node.name} includes itself") if mixins.size == 1
+
+    msg << "\n" << Sass::Util.enum_cons(mixins.reverse + [node.name], 2).map do |m1, m2|
+      "    #{m1} includes #{m2}"
+    end.join("\n")
+    raise Sass::SyntaxError.new(msg)
+  end
+
   def handle_import_loop!(node)
     msg = "An @import loop has been found:"
-    files = @environment.stack.frames.select {|f| f.is_import?}.map {|f| f.filename}.compact
+    files = @stack.map {|s| s[:filename]}.compact
     if node.filename == node.imported_file.options[:filename]
       raise Sass::SyntaxError.new("#{msg} #{node.filename} imports itself")
     end