sass 3.3.0 → 3.4.25

data/lib/sass/cache_stores/memory.rb

@@ -26,11 +26,10 @@ module Sass
 
       # @see Base#retrieve
       def retrieve(key, sha)
-        if @contents.has_key?(key)
-          return unless @contents[key][:sha] == sha
-          obj = @contents[key][:obj]
-          obj.respond_to?(:deep_copy) ? obj.deep_copy : obj.dup
-        end
+        return unless @contents.has_key?(key)
+        return unless @contents[key][:sha] == sha
+        obj = @contents[key][:obj]
+        obj.respond_to?(:deep_copy) ? obj.deep_copy : obj.dup
       end
 
       # @see Base#store

data/lib/sass/callbacks.rb

@@ -51,12 +51,12 @@ module Sass
     def define_callback(name)
       class_eval <<RUBY, __FILE__, __LINE__ + 1
 def on_#{name}(&block)
-  @_sass_callbacks ||= {}
+  @_sass_callbacks = {} unless defined? @_sass_callbacks
   (@_sass_callbacks[#{name.inspect}] ||= []) << block
 end
 
 def run_#{name}(*args)
-  return unless @_sass_callbacks
+  return unless defined? @_sass_callbacks
   return unless @_sass_callbacks[#{name.inspect}]
   @_sass_callbacks[#{name.inspect}].each {|c| c[*args]}
 end

data/lib/sass/css.rb

@@ -18,7 +18,7 @@ module Sass
     #   that can be converted to Unicode.
     #   If the stylesheet contains an `@charset` declaration,
     #   that overrides the Ruby encoding
-    #   (see {file:SASS_REFERENCE.md#encodings the encoding documentation})
+    #   (see {file:SASS_REFERENCE.md#Encodings the encoding documentation})
     # @option options :old [Boolean] (false)
     #     Whether or not to output old property syntax
     #     (`:color blue` as opposed to `color: blue`).
@@ -31,10 +31,11 @@ module Sass
         template = template.read
       end
 
-      @options = options.dup
+      @options = options.merge(:_convert => true)
       # Backwards compatibility
       @options[:old] = true if @options[:alternate] == false
       @template = template
+      @checked_encoding = false
     end
 
     # Converts the CSS template into Sass or SCSS code.
@@ -67,9 +68,7 @@ module Sass
     def check_encoding!
       return if @checked_encoding
       @checked_encoding = true
-      @template, @original_encoding = Sass::Util.check_sass_encoding(@template) do |msg, line|
-        raise Sass::SyntaxError.new(msg, :line => line)
-      end
+      @template, @original_encoding = Sass::Util.check_sass_encoding(@template)
     end
 
     # Parses the CSS template and applies various transformations
@@ -77,14 +76,14 @@ module Sass
     # @return [Tree::Node] The root node of the parsed tree
     def build_tree
       root = Sass::SCSS::CssParser.new(@template, @options[:filename], nil).parse
-      parse_selectors    root
-      expand_commas      root
-      nest_seqs          root
-      parent_ref_rules   root
-      flatten_rules      root
-      bubble_subject     root
-      fold_commas        root
-      dump_selectors     root
+      parse_selectors(root)
+      expand_commas(root)
+      nest_seqs(root)
+      parent_ref_rules(root)
+      flatten_rules(root)
+      bubble_subject(root)
+      fold_commas(root)
+      dump_selectors(root)
       root
     end
 

data/lib/sass/deprecation.rb

@@ -0,0 +1,55 @@
+module Sass
+  # A deprecation warning that should only be printed once for a given line in a
+  # given file.
+  #
+  # A global Deprecation instance should be created for each type of deprecation
+  # warning, and `warn` should be called each time a warning is needed.
+  class Deprecation
+    @@allow_double_warnings = false
+
+    # Runs a block in which double deprecation warnings for the same location
+    # are allowed.
+    def self.allow_double_warnings
+      old_allow_double_warnings = @@allow_double_warnings
+      @@allow_double_warnings = true
+      yield
+    ensure
+      @@allow_double_warnings = old_allow_double_warnings
+    end
+
+    def initialize
+      # A set of filename, line pairs for which warnings have been emitted.
+      @seen = Set.new
+    end
+
+    # Prints `message` as a deprecation warning associated with `filename`,
+    # `line`, and optionally `column`.
+    #
+    # This ensures that only one message will be printed for each line of a
+    # given file.
+    #
+    # @overload warn(filename, line, message)
+    #   @param filename [String, nil]
+    #   @param line [Number]
+    #   @param message [String]
+    # @overload warn(filename, line, column, message)
+    #   @param filename [String, nil]
+    #   @param line [Number]
+    #   @param column [Number]
+    #   @param message [String]
+    def warn(filename, line, column_or_message, message = nil)
+      return if !@@allow_double_warnings && @seen.add?([filename, line]).nil?
+      if message
+        column = column_or_message
+      else
+        message = column_or_message
+      end
+
+      location = "line #{line}"
+      location << ", column #{column}" if column
+      location << " of #{filename}" if filename
+
+      Sass::Util.sass_warn("DEPRECATION WARNING on #{location}:\n#{message}")
+    end
+  end
+end

data/lib/sass/engine.rb

@@ -1,6 +1,7 @@
 require 'set'
 require 'digest/sha1'
 require 'sass/cache_stores'
+require 'sass/deprecation'
 require 'sass/source/position'
 require 'sass/source/range'
 require 'sass/source/map'
@@ -30,6 +31,8 @@ require 'sass/tree/warn_node'
 require 'sass/tree/import_node'
 require 'sass/tree/charset_node'
 require 'sass/tree/at_root_node'
+require 'sass/tree/keyframe_rule_node'
+require 'sass/tree/error_node'
 require 'sass/tree/visitors/base'
 require 'sass/tree/visitors/perform'
 require 'sass/tree/visitors/cssize'
@@ -82,23 +85,25 @@ module Sass
   # This class handles the parsing and compilation of the Sass template.
   # Example usage:
   #
-  #     template = File.load('stylesheets/sassy.sass')
+  #     template = File.read('stylesheets/sassy.sass')
   #     sass_engine = Sass::Engine.new(template)
   #     output = sass_engine.render
   #     puts output
   class Engine
+    @@old_property_deprecation = Deprecation.new
+
     # A line of Sass code.
     #
     # `text`: `String`
     # : The text in the line, without any whitespace at the beginning or end.
     #
-    # `tabs`: `Fixnum`
+    # `tabs`: `Integer`
     # : The level of indentation of the line.
     #
-    # `index`: `Fixnum`
+    # `index`: `Integer`
     # : The line number in the original document.
     #
-    # `offset`: `Fixnum`
+    # `offset`: `Integer`
     # : The number of bytes in on the line that the text begins.
     #   This ends up being the number of bytes of leading whitespace.
     #
@@ -155,7 +160,7 @@ module Sass
     # @api public
     DEFAULT_OPTIONS = {
       :style => :nested,
-      :load_paths => ['.'],
+      :load_paths => [],
       :cache => true,
       :cache_location => './.sass-cache',
       :syntax => :sass,
@@ -166,11 +171,11 @@ module Sass
     # default values and resolving aliases.
     #
     # @param options [{Symbol => Object}] The options hash;
-    #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
+    #   see {file:SASS_REFERENCE.md#Options the Sass options documentation}
     # @return [{Symbol => Object}] The normalized options hash.
     # @private
     def self.normalize_options(options)
-      options = DEFAULT_OPTIONS.merge(options.reject {|k, v| v.nil?})
+      options = DEFAULT_OPTIONS.merge(options.reject {|_k, v| v.nil?})
 
       # If the `:filename` option is passed in without an importer,
       # assume it's using the default filesystem importer.
@@ -206,6 +211,8 @@ module Sass
       when :alternate; options[:property_syntax] = :new
       when :normal; options[:property_syntax] = :old
       end
+      options[:sourcemap] = :auto if options[:sourcemap] == true
+      options[:sourcemap] = :none if options[:sourcemap] == false
 
       options
     end
@@ -218,14 +225,14 @@ module Sass
     #
     # @param filename [String] The path to the Sass or SCSS file
     # @param options [{Symbol => Object}] The options hash;
-    #   See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    #   See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     # @return [Sass::Engine] The Engine for the given Sass or SCSS file.
     # @raise [Sass::SyntaxError] if there's an error in the document.
     def self.for_file(filename, options)
       had_syntax = options[:syntax]
 
       if had_syntax
-        # Use what was explicitly specificed
+        # Use what was explicitly specified
       elsif filename =~ /\.scss$/
         options.merge!(:syntax => :scss)
       elsif filename =~ /\.sass$/
@@ -236,7 +243,7 @@ module Sass
     end
 
     # The options for the Sass engine.
-    # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    # See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     #
     # @return [{Symbol => Object}]
     attr_reader :options
@@ -253,14 +260,17 @@ module Sass
     #   that can be converted to Unicode.
     #   If the template contains an `@charset` declaration,
     #   that overrides the Ruby encoding
-    #   (see {file:SASS_REFERENCE.md#encodings the encoding documentation})
+    #   (see {file:SASS_REFERENCE.md#Encodings the encoding documentation})
     # @param options [{Symbol => Object}] An options hash.
-    #   See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    #   See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     # @see {Sass::Engine.for_file}
     # @see {Sass::Plugin}
     def initialize(template, options = {})
       @options = self.class.normalize_options(options)
       @template = template
+      @checked_encoding = false
+      @filename = nil
+      @line = nil
     end
 
     # Render the template to CSS.
@@ -271,8 +281,8 @@ module Sass
     #   cannot be converted to UTF-8
     # @raise [ArgumentError] if the document uses an unknown encoding with `@charset`
     def render
-      return encode_and_set_charset(_to_tree.render) unless @options[:quiet]
-      Sass::Util.silence_sass_warnings {encode_and_set_charset(_to_tree.render)}
+      return _to_tree.render unless @options[:quiet]
+      Sass::Util.silence_sass_warnings {_to_tree.render}
     end
 
     # Render the template to CSS and return the source map.
@@ -315,7 +325,7 @@ module Sass
     # @raise [ArgumentError] if the document uses an unknown encoding with `@charset`
     def source_encoding
       check_encoding!
-      @original_encoding
+      @source_encoding
     end
 
     # Gets a set of all the documents
@@ -360,7 +370,10 @@ Error generating source map: couldn't determine public URL for "#{filename}".
   Without a public URL, there's nothing for the source map to link to.
   An importer was not set for this file.
 ERR
-      elsif Sass::Util.silence_warnings {importer.public_url(filename, sourcemap_dir).nil?}
+      elsif Sass::Util.silence_warnings do
+              sourcemap_dir = nil if @options[:sourcemap] == :file
+              importer.public_url(filename, sourcemap_dir).nil?
+            end
         raise Sass::SyntaxError.new(<<ERR)
 Error generating source map: couldn't determine public URL for "#{filename}".
   Without a public URL, there's nothing for the source map to link to.
@@ -375,23 +388,12 @@ ERR
       rendered << "/*# sourceMappingURL="
       rendered << Sass::Util.escape_uri(sourcemap_uri)
       rendered << " */\n"
-      rendered = encode_and_set_charset(rendered)
       return rendered, sourcemap
     end
 
-    def encode_and_set_charset(rendered)
-      return rendered if Sass::Util.ruby1_8?
-      begin
-        # Try to convert the result to the original encoding,
-        # but if that doesn't work fall back on UTF-8
-        rendered = rendered.encode(source_encoding)
-      rescue EncodingError
-      end
-      rendered.gsub(Regexp.new('\A@charset "(.*?)"'.encode(source_encoding)),
-        "@charset \"#{source_encoding.name}\"".encode(source_encoding))
-    end
-
     def _to_tree
+      check_encoding!
+
       if (@options[:cache] || @options[:read_cache]) &&
           @options[:filename] && @options[:importer]
         key = sassc_key
@@ -403,8 +405,6 @@ ERR
         end
       end
 
-      check_encoding!
-
       if @options[:syntax] == :scss
         root = Sass::SCSS::Parser.new(@template, @options[:filename], @options[:importer]).parse
       else
@@ -436,9 +436,7 @@ ERR
     def check_encoding!
       return if @checked_encoding
       @checked_encoding = true
-      @template, @original_encoding = Sass::Util.check_sass_encoding(@template) do |msg, line|
-        raise Sass::SyntaxError.new(msg, :line => line)
-      end
+      @template, @source_encoding = Sass::Util.check_sass_encoding(@template)
     end
 
     def tabulate(string)
@@ -446,7 +444,7 @@ ERR
       comment_tab_str = nil
       first = true
       lines = []
-      string.gsub(/\r\n|\r|\n/, "\n").scan(/^[^\n]*?$/).each_with_index do |line, index|
+      string.scan(/^[^\n]*?$/).each_with_index do |line, index|
         index += (@options[:line] || 1)
         if line.strip.empty?
           lines.last.text << "\n" if lines.last && lines.last.comment?
@@ -484,7 +482,7 @@ ERR
 
         line_tabs = line_tab_str.scan(tab_str).size
         if tab_str * line_tabs != line_tab_str
-          message = <<END.strip.gsub("\n", ' ')
+          message = <<END.strip.tr("\n", ' ')
 Inconsistent indentation: #{Sass::Shared.human_indentation line_tab_str, true} used for indentation,
 but the rest of the document was indented using #{Sass::Shared.human_indentation tab_str}.
 END
@@ -497,15 +495,13 @@ END
     end
 
     # @comment
-    #   rubocop:disable ParameterLists
     def try_comment(line, last, tab_str, comment_tab_str, index)
-      # rubocop:enable ParameterLists
       return unless last && last.comment?
       # Nested comment stuff must be at least one whitespace char deeper
       # than the normal indentation
       return unless line =~ /^#{tab_str}\s/
       unless line =~ /^(?:#{comment_tab_str})(.*)$/
-        raise SyntaxError.new(<<MSG.strip.gsub("\n", " "), :line => index)
+        raise SyntaxError.new(<<MSG.strip.tr("\n", " "), :line => index)
 Inconsistent indentation:
 previous line was indented by #{Sass::Shared.human_indentation comment_tab_str},
 but this line was indented by #{Sass::Shared.human_indentation line[/^\s*/]}.
@@ -582,8 +578,8 @@ MSG
           if continued_comment &&
               child.line == continued_comment.line +
               continued_comment.lines + 1
-            continued_comment.value.last.sub!(/ \*\/\Z/, '')
-            child.value.first.gsub!(/\A\/\*/, ' *')
+            continued_comment.value.last.sub!(%r{ \*/\Z}, '')
+            child.value.first.gsub!(%r{\A/\*}, ' *')
             continued_comment.value += ["\n"] + child.value
             next
           end
@@ -632,6 +628,11 @@ WARNING
           raise SyntaxError.new("Invalid property: \"#{line.text}\".",
             :line => @line) if name.nil? || value.nil?
 
+          @@old_property_deprecation.warn(@options[:filename], @line, <<WARNING)
+Old-style properties like "#{line.text}" are deprecated and will be an error in future versions of Sass.
+Use "#{name}: #{value}" instead.
+WARNING
+
           value_start_offset = name_end_offset = name_start_offset + name.length
           unless value.empty?
             # +1 and -1 both compensate for the leading ':', which is part of line.text
@@ -725,9 +726,12 @@ WARNING
         expr = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(""))
         end_offset = start_offset
       else
-        expr = parse_script(value, :offset => to_parser_offset(start_offset))
+        expr = parse_script(value,
+          :offset => to_parser_offset(start_offset),
+          :css_variable => name.start_with?("--"))
         end_offset = expr.source_range.end_pos.offset - 1
       end
+
       node = Tree::PropNode.new(parse_interp(name), expr, prop)
       node.value_source_range = Sass::Source::Range.new(
         Sass::Source::Position.new(line.index, to_parser_offset(start_offset)),
@@ -784,7 +788,19 @@ WARNING
                else
                  :normal
                end
-        Tree::CommentNode.new(value, type)
+        comment = Tree::CommentNode.new(value, type)
+        comment.line = line.index
+        text = line.text.rstrip
+        if text.include?("\n")
+          end_offset = text.length - text.rindex("\n")
+        else
+          end_offset = to_parser_offset(line.offset + text.length)
+        end
+        comment.source_range = Sass::Source::Range.new(
+          Sass::Source::Position.new(@line, to_parser_offset(line.offset)),
+          Sass::Source::Position.new(@line + text.count("\n"), end_offset),
+          @options[:filename])
+        comment
       else
         Tree::RuleNode.new(parse_interp(line.text), full_line_range(line))
       end
@@ -792,16 +808,14 @@ WARNING
 
     DIRECTIVES = Set[:mixin, :include, :function, :return, :debug, :warn, :for,
       :each, :while, :if, :else, :extend, :import, :media, :charset, :content,
-      :at_root]
+      :at_root, :error]
 
-    # @comment
-    #   rubocop:disable MethodLength
     def parse_directive(parent, line, root)
       directive, whitespace, value = line.text[1..-1].split(/(\s+)/, 2)
       raise SyntaxError.new("Invalid directive: '@'.") unless directive
       offset = directive.size + whitespace.size + 1 if whitespace
 
-      directive_name = directive.gsub('-', '_').to_sym
+      directive_name = directive.tr('-', '_').to_sym
       if DIRECTIVES.include?(directive_name)
         return send("parse_#{directive_name}_directive", parent, line, root, value, offset)
       end
@@ -834,6 +848,14 @@ WARNING
       Tree::DebugNode.new(parse_script(value, :offset => offset))
     end
 
+    def parse_error_directive(parent, line, root, value, offset)
+      raise SyntaxError.new("Invalid error directive '@error': expected expression.") unless value
+      raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath error directives.",
+        :line => @line + 1) unless line.children.empty?
+      offset = line.offset + line.text.index(value).to_i
+      Tree::ErrorNode.new(parse_script(value, :offset => offset))
+    end
+
     def parse_extend_directive(parent, line, root, value, offset)
       raise SyntaxError.new("Invalid extend directive '@extend': expected expression.") unless value
       raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath extend directives.",
@@ -848,8 +870,6 @@ WARNING
       )
       Tree::ExtendNode.new(interp_parsed, optional, selector_range)
     end
-    # @comment
-    #   rubocop:enable MethodLength
 
     def parse_warn_directive(parent, line, root, value, offset)
       raise SyntaxError.new("Invalid warn directive '@warn': expected expression.") unless value
@@ -1009,15 +1029,25 @@ WARNING
         script_parser = Sass::Script::Parser.new(scanner, @line, to_parser_offset(offset), @options)
         str = script_parser.parse_string
 
-        media_parser = Sass::SCSS::Parser.new(scanner,
-          @options[:filename], @options[:importer],
-          @line, str.source_range.end_pos.offset)
-        if (media = media_parser.parse_media_query_list)
-          end_pos = Sass::Source::Position.new(@line, media_parser.offset + 1)
-          node = Tree::CssImportNode.new(str, media.to_a)
-        else
+        if scanner.eos?
           end_pos = str.source_range.end_pos
           node = Tree::CssImportNode.new(str)
+        else
+          supports_parser = Sass::SCSS::Parser.new(scanner,
+            @options[:filename], @options[:importer],
+            @line, str.source_range.end_pos.offset)
+          supports_condition = supports_parser.parse_supports_clause
+
+          if scanner.eos?
+            node = Tree::CssImportNode.new(str, [], supports_condition)
+          else
+            media_parser = Sass::SCSS::Parser.new(scanner,
+              @options[:filename], @options[:importer],
+              @line, str.source_range.end_pos.offset)
+            media = media_parser.parse_media_query_list
+            end_pos = Sass::Source::Position.new(@line, media_parser.offset + 1)
+            node = Tree::CssImportNode.new(str, media.to_a, supports_condition)
+          end
         end
 
         node.source_range = Sass::Source::Range.new(
@@ -1026,7 +1056,7 @@ WARNING
         return node
       end
 
-      unless (str = scanner.scan(Sass::SCSS::RX::STRING))
+      unless (quoted_val = scanner.scan(Sass::SCSS::RX::STRING))
         scanned = scanner.scan(/[^,;]+/)
         node = Tree::ImportNode.new(scanned)
         start_parser_offset = to_parser_offset(offset)
@@ -1038,21 +1068,21 @@ WARNING
       end
 
       start_offset = offset
-      offset += str.length
-      val = scanner[1] || scanner[2]
+      offset += scanner.matched.length
+      val = Sass::Script::Value::String.value(scanner[1] || scanner[2])
       scanned = scanner.scan(/\s*/)
       if !scanner.match?(/[,;]|$/)
         offset += scanned.length if scanned
         media_parser = Sass::SCSS::Parser.new(scanner,
           @options[:filename], @options[:importer], @line, offset)
         media = media_parser.parse_media_query_list
-        node = Tree::CssImportNode.new(str || uri, media.to_a)
+        node = Tree::CssImportNode.new(quoted_val, media.to_a)
         node.source_range = Sass::Source::Range.new(
           Sass::Source::Position.new(@line, to_parser_offset(start_offset)),
           Sass::Source::Position.new(@line, media_parser.offset),
           @options[:filename], @options[:importer])
       elsif val =~ %r{^(https?:)?//}
-        node = Tree::CssImportNode.new("url(#{val})")
+        node = Tree::CssImportNode.new(quoted_val)
         node.source_range = Sass::Source::Range.new(
           Sass::Source::Position.new(@line, to_parser_offset(start_offset)),
           Sass::Source::Position.new(@line, to_parser_offset(offset)),
@@ -1124,9 +1154,9 @@ WARNING
     end
 
     def parse_script(script, options = {})
-      line = options[:line] || @line
-      offset = options[:offset] || @offset + 1
-      Script.parse(script, line, offset, @options)
+      line = options.delete(:line) || @line
+      offset = options.delete(:offset) || @offset + 1
+      Script.parse(script, line, offset, @options.merge(options))
     end
 
     def format_comment_text(text, silent)
@@ -1138,9 +1168,10 @@ WARNING
       end
 
       return "/* */" if content.empty?
-      content.last.gsub!(/ ?\*\/ *$/, '')
+      content.last.gsub!(%r{ ?\*/ *$}, '')
+      first = content.shift unless removed_first
       content.map! {|l| l.gsub!(/^\*( ?)/, '\1') || (l.empty? ? "" : " ") + l}
-      content.first.gsub!(/^ /, '') unless removed_first
+      content.unshift first unless removed_first
       if silent
         "/*" + content.join("\n *") + " */"
       else
@@ -1178,10 +1209,15 @@ WARNING
           res << "\\" * (escapes - 1) << '#{'
         else
           res << "\\" * [0, escapes - 1].max
-          # Add 1 to emulate to_parser_offset.
-          res << Script::Parser.new(
-            scan, line, offset + scan.pos - scan.matched_size + 1, options).
-            parse_interpolated
+          if scan[1].include?("\n")
+            line += scan[1].count("\n")
+            offset = scan.matched_size - scan[1].rindex("\n")
+          else
+            offset += scan.matched_size
+          end
+          node = Script::Parser.new(scan, line, offset, options).parse_interpolated
+          offset = node.source_range.end_pos.offset
+          res << node
         end
       end
       res << rest

data/lib/sass/environment.rb

@@ -41,7 +41,7 @@ module Sass
             if @#{name}s.include?(name)
               @#{name}s[name] = value
               true
-            elsif @parent
+            elsif @parent && !@parent.global?
               @parent.try_set_#{name}(name, value)
             else
               false
@@ -53,6 +53,10 @@ module Sass
             @#{name}s ||= {}
             @#{name}s[name.tr('_', '-')] = value
           end
+
+          def set_global_#{name}(name, value)
+            global_env.set_#{name}(name, value)
+          end
         RUBY
       end
     end
@@ -76,28 +80,27 @@ module Sass
     # Sass::Callable
     inherited_hash_reader :function
 
-    # Whether a warning has been emitted for assigning to the given
-    # global variable. This is a set of tuples containing the name of
-    # the variable, its filename, and its line number.
-    #
-    # @return [Set<[String, String, int]>]
-    attr_reader :global_warning_given
-
-    # Whether a warning has been emitted for misusing a deprecated false value.
-    # This is a set of tuples containing the filename and its line number.
-    #
-    # @return [Set<[String, int]>]
-    attr_reader :deprecated_false_warning_given
-
     # @param options [{Symbol => Object}] The options hash. See
-    #   {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    #   {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     # @param parent [Environment] See \{#parent}
     def initialize(parent = nil, options = nil)
       @parent = parent
       @options = options || (parent && parent.options) || {}
-      @stack = Sass::Stack.new if @parent.nil?
-      @global_warning_given = Set.new
-      @deprecated_false_warning_given = Set.new
+      @stack = @parent.nil? ? Sass::Stack.new : nil
+      @caller = nil
+      @content = nil
+      @filename = nil
+      @functions = nil
+      @mixins = nil
+      @selector = nil
+      @vars = nil
+    end
+
+    # Returns whether this is the global environment.
+    #
+    # @return [Boolean]
+    def global?
+      @parent.nil?
     end
 
     # The environment of the caller of this environment's mixin or function.
@@ -128,7 +131,7 @@ module Sass
     #
     # @return [Environment]
     def global_env
-      @global_env ||= @parent.nil? ? self : @parent.global_env
+      @global_env ||= global? ? self : @parent.global_env
     end
 
     # The import/mixin stack.
@@ -192,4 +195,21 @@ module Sass
       @content ||= env.is_a?(ReadOnlyEnvironment) ? env : ReadOnlyEnvironment.new(env, env.options)
     end
   end
+
+  # An environment that can write to in-scope global variables, but doesn't
+  # create new variables in the global scope. Useful for top-level control
+  # directives.
+  class SemiGlobalEnvironment < Environment
+    def try_set_var(name, value)
+      @vars ||= {}
+      if @vars.include?(name)
+        @vars[name] = value
+        true
+      elsif @parent
+        @parent.try_set_var(name, value)
+      else
+        false
+      end
+    end
+  end
 end