sass 3.2.0.alpha.11 → 3.2.0.alpha.21

data/lib/sass/scss/rx.rb

@@ -110,7 +110,7 @@ module Sass
       # Custom
       HEXCOLOR = /\#[0-9a-fA-F]+/
       INTERP_START = /#\{/
-      MOZ_ANY = quote(":-moz-any(", Regexp::IGNORECASE)
+      ANY = /:(-[-\w]+-)?any\(/i
 
       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\"/
       STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\'/

data/lib/sass/scss/static_parser.rb

@@ -13,12 +13,12 @@ module Sass
       #   Used for error reporting.
       # @return [Selector::CommaSequence] The parsed selector
       # @raise [Sass::SyntaxError] if there's a syntax error in the selector
-      def parse_selector(filename)
+      def parse_selector
         init_scanner!
         seq = expr!(:selector_comma_sequence)
         expected("selector") unless @scanner.eos?
         seq.line = @line
-        seq.filename = filename
+        seq.filename = @filename
         seq
       end
 

data/lib/sass/tree/content_node.rb

@@ -0,0 +1,9 @@
+module Sass
+  module Tree
+    # A node representing the placement within a mixin of the include statement's content.
+    #
+    # @see Sass::Tree
+    class ContentNode < Node
+    end
+  end
+end

data/lib/sass/tree/debug_node.rb

@@ -6,12 +6,7 @@ module Sass
     class DebugNode < Node
       # The expression to print.
       # @return [Script::Node] 
-      attr_reader :expr
-
-      # Returns sub nodes that are not tree children.
-      def subnodes
-        Array(expr)
-      end
+      attr_accessor :expr
 
       # @param expr [Script::Node] The expression to print
       def initialize(expr)

data/lib/sass/tree/each_node.rb

@@ -11,7 +11,7 @@ module Sass::Tree
 
     # The parse tree for the list.
     # @param [Script::Node]
-    attr_reader :list
+    attr_accessor :list
 
     # @param var [String] The name of the loop variable
     # @param list [Script::Node] The parse tree for the list
@@ -20,11 +20,5 @@ module Sass::Tree
       @list = list
       super()
     end
-
-    # Returns sub nodes that are not tree children.
-    def subnodes
-      Array(list)
-    end
-
   end
 end

data/lib/sass/tree/extend_node.rb

@@ -15,7 +15,7 @@ module Sass::Tree
     # representing `#{}`-interpolation.
     #
     # @return [Array<String, Sass::Script::Node>]
-    attr_reader :selector
+    attr_accessor :selector
 
     # @param selector [Array<String, Sass::Script::Node>]
     #   The CSS selector to extend,

data/lib/sass/tree/for_node.rb

@@ -11,11 +11,11 @@ module Sass::Tree
 
     # The parse tree for the initial expression.
     # @return [Script::Node]
-    attr_reader :from
+    attr_accessor :from
 
     # The parse tree for the final expression.
     # @return [Script::Node]
-    attr_reader :to
+    attr_accessor :to
 
     # Whether to include `to` in the loop or stop just before.
     # @return [Boolean]
@@ -32,10 +32,5 @@ module Sass::Tree
       @exclusive = exclusive
       super()
     end
-
-    # Returns sub nodes that are not tree children.
-    def subnodes
-      Array(from) + Array(to)
-    end
   end
 end

data/lib/sass/tree/function_node.rb

@@ -13,7 +13,7 @@ module Sass
       # the default value of the argument
       #
       # @return [Array<Script::Node>]
-      attr_reader :args
+      attr_accessor :args
 
       # @param name [String] The function name
       # @param args [Array<(Script::Node, Script::Node)>] The arguments for the function.
@@ -22,11 +22,6 @@ module Sass
         @args = args
         super()
       end
-
-      # Returns sub nodes that are not tree children.
-      def subnodes
-        Array(args)
-      end
     end
   end
 end

data/lib/sass/tree/if_node.rb

@@ -13,7 +13,7 @@ module Sass::Tree
     # If this is nil, this is an `@else` node, not an `@else if`.
     #
     # @return [Script::Expr]
-    attr_reader :expr
+    attr_accessor :expr
 
     # The next {IfNode} in the if-else list, or `nil`.
     #
@@ -35,12 +35,6 @@ module Sass::Tree
       @last_else = node
     end
 
-    # @see Node#options=
-    def options=(options)
-      super
-      self.else.options = options if self.else
-    end
-
     def _dump(f)
       Marshal.dump([self.expr, self.else, self.children])
     end
@@ -54,17 +48,5 @@ module Sass::Tree
         node.else ? node.else.instance_variable_get('@last_else') : node)
       node
     end
-
-    # @see Node#deep_copy
-    def deep_copy
-      node = super
-      node.else = self.else.deep_copy if self.else
-      node
-    end
-
-    # Returns sub nodes that are not tree children.
-    def subnodes
-      Array(expr) + Array(self.else)
-    end
   end
 end

data/lib/sass/tree/mixin_def_node.rb

@@ -13,7 +13,11 @@ module Sass
       # and the parse tree for the default value of the argument.
       #
       # @return [Array<(Script::Node, Script::Node)>]
-      attr_reader :args
+      attr_accessor :args
+
+      # Whether the mixin uses `@content`. Set during the nesting check phase.
+      # @return [Boolean]
+      attr_accessor :has_content
 
       # @param name [String] The mixin name
       # @param args [Array<(Script::Node, Script::Node)>] See \{#args}
@@ -22,11 +26,6 @@ module Sass
         @args = args
         super()
       end
-
-      # Returns sub nodes that are not tree children.
-      def subnodes
-        Array(args)
-      end
     end
   end
 end

data/lib/sass/tree/mixin_node.rb

@@ -13,11 +13,11 @@ module Sass::Tree
 
     # The arguments to the mixin.
     # @return [Array<Script::Node>]
-    attr_reader :args
+    attr_accessor :args
 
     # A hash from keyword argument names to values.
     # @return [{String => Script::Node}]
-    attr_reader :keywords
+    attr_accessor :keywords
 
     # @param name [String] The name of the mixin
     # @param args [Array<Script::Node>] See \{#args}
@@ -28,10 +28,5 @@ module Sass::Tree
       @keywords = keywords
       super()
     end
-
-    # Returns sub nodes that are not tree children.
-    def subnodes
-      Array(args) + (keywords||{}).values
-    end
   end
 end

data/lib/sass/tree/node.rb

@@ -14,7 +14,8 @@ module Sass
   # The nodes in this state are in the same structure as the Sass document:
   # rules and properties are nested beneath one another.
   # Nodes that can be in this state or in the dynamic state
-  # are called **static nodes**.
+  # are called **static nodes**; nodes that can only be in this state
+  # are called **solely static nodes**.
   #
   # {Tree::Visitors::Cssize} is then used to create a static CSS tree.
   # This is like a static Sass tree,
@@ -65,11 +66,7 @@ module Sass
       # @param options [{Symbol => Object}] The options
       # @see #options
       def options=(options)
-        children.each {|c| c.options = options}
-        if respond_to?(:subnodes)
-          subnodes.each {|n| n.options = options if n.respond_to?(:options=)}
-        end
-        @options = options
+        Sass::Tree::Visitors::SetOptions.visit(self, options)
       end
 
       # @private
@@ -188,19 +185,7 @@ module Sass
       #
       # @return [Node]
       def deep_copy
-        node = dup
-        node.children = children.map {|c| c.deep_copy}
-        node
-      end
-
-      def before_sass_cache_store
-        o = self.options
-        self.options = {}
-        return o
-      end
-
-      def after_sass_cache_store(o)
-        self.options = o
+        Sass::Tree::Visitors::DeepCopy.visit(self)
       end
 
       protected

data/lib/sass/tree/prop_node.rb

@@ -55,11 +55,6 @@ module Sass::Tree
       super()
     end
 
-    # Returns sub nodes that are not tree children.
-    def subnodes
-      Array(name).select{|n| n.is_a?(Sass::Script::Node)} + [value]
-    end
-
     # Compares the names and values of two properties.
     #
     # @param other [Object] The object to compare with

data/lib/sass/tree/return_node.rb

@@ -6,18 +6,13 @@ module Sass
     class ReturnNode < Node
       # The expression to return.
       # @type [Script::Node]
-      attr_reader :expr
+      attr_accessor :expr
 
       # @param expr [Script::Node] The expression to return
       def initialize(expr)
         @expr = expr
         super()
       end
-
-      # Returns sub nodes that are not tree children.
-      def subnodes
-        Array(expr)
-      end
     end
   end
 end

data/lib/sass/tree/rule_node.rb

@@ -50,6 +50,13 @@ module Sass::Tree
     # @return [Boolean]
     attr_accessor :group_end
 
+    # The stack trace.
+    # This is only readable in a CSS tree as it is written during the perform step
+    # and only when the :trace_selectors option is set.
+    #
+    # @return [Array<String>]
+    attr_accessor :stack_trace
+
     # @param rule [Array<String, Sass::Script::Node>]
     #   The CSS rule. See \{#rule}
     def initialize(rule)
@@ -115,19 +122,14 @@ module Sass::Tree
        :line => self.line}
     end
 
-    # Returns sub nodes that are not tree children.
-    def subnodes
-      rule.select{|r| r.is_a?(Sass::Script::Node)}
-    end
-
     private
 
     def try_to_parse_non_interpolated_rules
       if @rule.all? {|t| t.kind_of?(String)}
         # We don't use real filename/line info because we don't have it yet.
         # When we get it, we'll set it on the parsed rules if possible.
-        parser = Sass::SCSS::StaticParser.new(@rule.join.strip, 1)
-        @parsed_rules = parser.parse_selector('') rescue nil
+        parser = Sass::SCSS::StaticParser.new(@rule.join.strip, '', 1)
+        @parsed_rules = parser.parse_selector rescue nil
       end
     end
   end

data/lib/sass/tree/trace_node.rb

@@ -0,0 +1,32 @@
+require 'sass/tree/node'
+
+module Sass::Tree
+  # A solely static node left over after a mixin include or @content has been performed.
+  # Its sole purpose is to wrap exceptions to add to the backtrace.
+  #
+  # @see Sass::Tree
+  class TraceNode < Node
+    # The name of the trace entry to add.
+    # @return [String]
+    attr_reader :name
+
+    # @param name [String] The name of the trace entry to add.
+    def initialize(name)
+      @name = name
+      self.has_children = true
+      super()
+    end
+
+    # Initializes this node from an existing node.
+    # @param name [String] The name of the trace entry to add.
+    # @param mixin [Node] The node to copy information from.
+    # @return [TraceNode]
+    def self.from_node(name, node)
+      trace = new(name)
+      trace.line = node.line
+      trace.filename = node.filename
+      trace.options = node.options
+      trace
+    end
+  end
+end

data/lib/sass/tree/variable_node.rb

@@ -10,7 +10,7 @@ module Sass
 
       # The parse tree for the variable value.
       # @return [Script::Node]
-      attr_reader :expr
+      attr_accessor :expr
 
       # Whether this is a guarded variable assignment (`!default`).
       # @return [Boolean]
@@ -25,12 +25,6 @@ module Sass
         @guarded = guarded
         super()
       end
-
-      # Returns sub nodes that are not tree children.
-      def subnodes
-        Array(expr)
-      end
-
     end
   end
 end

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

@@ -18,7 +18,7 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   end
 
   PARENT_CLASSES = [ Sass::Tree::EachNode,   Sass::Tree::ForNode,   Sass::Tree::IfNode,
-                     Sass::Tree::ImportNode, Sass::Tree::MixinNode, Sass::Tree::WhileNode]
+                     Sass::Tree::ImportNode, Sass::Tree::TraceNode, Sass::Tree::WhileNode]
   def visit_children(parent)
     old_parent = @parent
     @parent = parent unless is_any_of?(parent, PARENT_CLASSES)
@@ -44,13 +44,29 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     raise e
   end
 
+  def visit_mixindef(node)
+    @current_mixin_def, old_mixin_def = node, @current_mixin_def
+    yield
+  ensure
+    @current_mixin_def = old_mixin_def
+  end
+
+  def invalid_content_parent?(parent, child)
+    if @current_mixin_def
+      @current_mixin_def.has_content = true
+      nil
+    else
+      "@content may only be used within a mixin."
+    end
+  end
+
   def invalid_charset_parent?(parent, child)
     "@charset may only be used at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
   end
 
-  INVALID_EXTEND_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::MixinDefNode]
+  VALID_EXTEND_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::MixinDefNode, Sass::Tree::MixinNode]
   def invalid_extend_parent?(parent, child)
-    unless is_any_of?(parent, INVALID_EXTEND_PARENTS)
+    unless is_any_of?(parent, VALID_EXTEND_PARENTS)
       "Extend directives may only be used within rules."
     end
   end
@@ -59,20 +75,20 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     "Functions may only be defined at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
   end
 
-  INVALID_FUNCTION_CHILDREN = [
+  VALID_FUNCTION_CHILDREN = [
     Sass::Tree::CommentNode,  Sass::Tree::DebugNode, Sass::Tree::EachNode,
     Sass::Tree::ForNode,      Sass::Tree::IfNode,    Sass::Tree::ReturnNode,
     Sass::Tree::VariableNode, Sass::Tree::WarnNode,  Sass::Tree::WhileNode
   ]
   def invalid_function_child?(parent, child)
-    unless is_any_of?(child, INVALID_FUNCTION_CHILDREN)
+    unless is_any_of?(child, VALID_FUNCTION_CHILDREN)
       "Functions can only contain variable declarations and control directives."
     end
   end
 
   INVALID_IMPORT_PARENTS = [
-    Sass::Tree::IfNode,   Sass::Tree::ForNode, Sass::Tree::WhileNode,
-    Sass::Tree::EachNode, Sass::Tree::MixinDefNode
+    Sass::Tree::IfNode,   Sass::Tree::ForNode,      Sass::Tree::WhileNode,
+    Sass::Tree::EachNode, Sass::Tree::MixinDefNode, Sass::Tree::MixinNode
   ]
   def invalid_import_parent?(parent, child)
     if is_any_of?(@real_parent, INVALID_IMPORT_PARENTS)
@@ -98,18 +114,19 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     "Mixins may only be defined at the root of a document." unless parent.is_a?(Sass::Tree::RootNode)
   end
 
-  INVALID_PROP_CHILDREN = [Sass::Tree::CommentNode, Sass::Tree::PropNode]
+  VALID_PROP_CHILDREN = [Sass::Tree::CommentNode, Sass::Tree::PropNode]
   def invalid_prop_child?(parent, child)
-    unless is_any_of?(child, INVALID_PROP_CHILDREN)
+    unless is_any_of?(child, VALID_PROP_CHILDREN)
       "Illegal nesting: Only properties may be nested beneath properties."
     end
   end
 
-  INVALID_PROP_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::PropNode,
-                          Sass::Tree::MixinDefNode, Sass::Tree::DirectiveNode]
+  VALID_PROP_PARENTS = [Sass::Tree::RuleNode, Sass::Tree::PropNode,
+                        Sass::Tree::MixinDefNode, Sass::Tree::DirectiveNode,
+                        Sass::Tree::MixinNode]
   def invalid_prop_parent?(parent, child)
-    unless is_any_of?(parent, INVALID_PROP_PARENTS)
-      "Properties are only allowed within rules, directives, or other properties." + child.pseudo_class_selector_message
+    unless is_any_of?(parent, VALID_PROP_PARENTS)
+      "Properties are only allowed within rules, directives, mixin includes, or other properties." + child.pseudo_class_selector_message
     end
   end