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

data/lib/sass/selector/abstract_sequence.rb

@@ -71,7 +71,7 @@ module Sass
       #
       # @return [String]
       def to_s
-        to_a.map {|e| e.is_a?(Sass::Script::Node) ? "\#{#{e.to_sass}}" : e}.join
+        to_a.map {|e| e.is_a?(Sass::Script::Tree::Node) ? "\#{#{e.to_sass}}" : e}.join
       end
 
       # Returns the specificity of the selector as an integer. The base is given

data/lib/sass/selector/simple.rb

@@ -14,13 +14,12 @@ module Sass
       # @return [String, nil]
       attr_accessor :filename
 
-      # Returns a representation of the node
-      # as an array of strings and potentially {Sass::Script::Node}s
-      # (if there's interpolation in the selector).
-      # When the interpolation is resolved and the strings are joined together,
-      # this will be the string representation of this node.
+      # Returns a representation of the node as an array of strings and
+      # potentially {Sass::Script::Tree::Node}s (if there's interpolation in the
+      # selector). When the interpolation is resolved and the strings are joined
+      # together, this will be the string representation of this node.
       #
-      # @return [Array<String, Sass::Script::Node>]
+      # @return [Array<String, Sass::Script::Tree::Node>]
       def to_a
         Sass::Util.abstract(self)
       end
@@ -30,7 +29,7 @@ module Sass
       #
       # @return [String]
       def inspect
-        to_a.map {|e| e.is_a?(Sass::Script::Node) ? "\#{#{e.to_sass}}" : e}.join
+        to_a.map {|e| e.is_a?(Sass::Script::Tree::Node) ? "\#{#{e.to_sass}}" : e}.join
       end
 
       # @see \{#inspect}

data/lib/sass/source/position.rb

@@ -22,5 +22,18 @@ module Sass::Source
     def inspect
       "#{line.inspect}:#{offset.inspect}"
     end
+
+    # @param str [String] The string to move through.
+    # @return [Position] The source position after proceeding forward through
+    #   `str`.
+    def after(str)
+      newlines = str.count("\n")
+      Position.new(line + newlines,
+        if newlines == 0
+          offset + str.length
+        else
+          str.length - str.rindex("\n") - 1
+        end)
+    end
   end
 end

data/lib/sass/supports.rb

@@ -135,7 +135,7 @@ module Sass::Supports
   class Declaration < Condition
     # The feature name.
     #
-    # @param [Sass::Script::Node]
+    # @param [Sass::Script::Tree::Node]
     attr_accessor :name
 
     # The name of the feature after any SassScript has been resolved.
@@ -146,7 +146,7 @@ module Sass::Supports
 
     # The feature value.
     #
-    # @param [Sass::Script::Node]
+    # @param [Sass::Script::Tree::Node]
     attr_accessor :value
 
     # The value of the feature after any SassScript has been resolved.
@@ -190,7 +190,7 @@ module Sass::Supports
   class Interpolation < Condition
     # The SassScript expression in the interpolation.
     #
-    # @param [Sass::Script::Node]
+    # @param [Sass::Script::Tree::Node]
     attr_accessor :value
 
     # The value of the expression after it's been resolved.
@@ -205,7 +205,7 @@ module Sass::Supports
 
     def perform(env)
       val = value.perform(env)
-      @resolved_value = val.is_a?(Sass::Script::String) ? val.value : val.to_s
+      @resolved_value = val.is_a?(Sass::Script::Value::String) ? val.value : val.to_s
     end
 
     def to_css

data/lib/sass/tree/comment_node.rb

@@ -6,10 +6,10 @@ module Sass::Tree
   # @see Sass::Tree
   class CommentNode < Node
     # The text of the comment, not including `/*` and `*/`.
-    # Interspersed with {Sass::Script::Node}s representing `#{}`-interpolation
+    # Interspersed with {Sass::Script::Tree::Node}s representing `#{}`-interpolation
     # if this is a loud comment.
     #
-    # @return [Array<String, Sass::Script::Node>]
+    # @return [Array<String, Sass::Script::Tree::Node>]
     attr_accessor :value
 
     # The text of the comment
@@ -26,7 +26,7 @@ module Sass::Tree
     # @return [Symbol]
     attr_accessor :type
 
-    # @param value [Array<String, Sass::Script::Node>] See \{#value}
+    # @param value [Array<String, Sass::Script::Tree::Node>] See \{#value}
     # @param type [Symbol] See \{#type}
     def initialize(value, type)
       @value = Sass::Util.with_extracted_values(value) {|str| normalize_indentation str}

data/lib/sass/tree/css_import_node.rb

@@ -6,7 +6,7 @@ module Sass::Tree
     # The URI being imported, either as a plain string or an interpolated
     # script string.
     #
-    # @return [String, Sass::Script::Node]
+    # @return [String, Sass::Script::Tree::Node]
     attr_accessor :uri
 
     # The text of the URI being imported after any interpolated SassScript has
@@ -15,11 +15,11 @@ module Sass::Tree
     # @return [String]
     attr_accessor :resolved_uri
 
-    # The media query for this rule, interspersed with {Sass::Script::Node}s
-    # representing `#{}`-interpolation. Any adjacent strings will be merged
-    # together.
+    # The media query for this rule, 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 :query
 
     # The media query for this rule, without any unresolved interpolation. It's
@@ -28,8 +28,8 @@ module Sass::Tree
     # @return [Sass::Media::QueryList]
     attr_accessor :resolved_query
 
-    # @param uri [String, Sass::Script::Node] See \{#uri}
-    # @param query [Array<String, Sass::Script::Node>] See \{#query}
+    # @param uri [String, Sass::Script::Tree::Node] See \{#uri}
+    # @param query [Array<String, Sass::Script::Tree::Node>] See \{#query}
     def initialize(uri, query = [])
       @uri = uri
       @query = query

data/lib/sass/tree/debug_node.rb

@@ -5,10 +5,10 @@ module Sass
     # @see Sass::Tree
     class DebugNode < 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/directive_node.rb

@@ -11,7 +11,7 @@ module Sass::Tree
   class DirectiveNode < Node
     # The text of the directive, `@` and all, with interpolation included.
     #
-    # @return [Array<String, Sass::Script::Node>]
+    # @return [Array<String, Sass::Script::Tree::Node>]
     attr_accessor :value
 
     # The text of the directive after any interpolated SassScript has been resolved.
@@ -20,7 +20,7 @@ module Sass::Tree
     # @return [String]
     attr_accessor :resolved_value
 
-    # @param value [Array<String, Sass::Script::Node>] See \{#value}
+    # @param value [Array<String, Sass::Script::Tree::Node>] See \{#value}
     def initialize(value)
       @value = value
       super()

data/lib/sass/tree/each_node.rb

@@ -10,11 +10,11 @@ module Sass::Tree
     attr_reader :var
 
     # The parse tree for the list.
-    # @param [Script::Node]
+    # @param [Script::Tree::Node]
     attr_accessor :list
 
     # @param var [String] The name of the loop variable
-    # @param list [Script::Node] The parse tree for the list
+    # @param list [Script::Tree::Node] The parse tree for the list
     def initialize(var, list)
       @var = var
       @list = list

data/lib/sass/tree/extend_node.rb

@@ -11,10 +11,10 @@ module Sass::Tree
     # @return [Selector::CommaSequence]
     attr_accessor :resolved_selector
 
-    # The CSS selector to extend, interspersed with {Sass::Script::Node}s
+    # The CSS selector to extend, interspersed with {Sass::Script::Tree::Node}s
     # representing `#{}`-interpolation.
     #
-    # @return [Array<String, Sass::Script::Node>]
+    # @return [Array<String, Sass::Script::Tree::Node>]
     attr_accessor :selector
 
     # The extended selector source range.
@@ -27,9 +27,9 @@ module Sass::Tree
     # @return [Boolean]
     def optional?; @optional; end
 
-    # @param selector [Array<String, Sass::Script::Node>]
+    # @param selector [Array<String, Sass::Script::Tree::Node>]
     #   The CSS selector to extend,
-    #   interspersed with {Sass::Script::Node}s
+    #   interspersed with {Sass::Script::Tree::Node}s
     #   representing `#{}`-interpolation.
     # @param optional [Boolean] See \{#optional}
     # @param selector_source_range [Sass::Source::Range] The extended selector source range.

data/lib/sass/tree/for_node.rb

@@ -10,11 +10,11 @@ module Sass::Tree
     attr_reader :var
 
     # The parse tree for the initial expression.
-    # @return [Script::Node]
+    # @return [Script::Tree::Node]
     attr_accessor :from
 
     # The parse tree for the final expression.
-    # @return [Script::Node]
+    # @return [Script::Tree::Node]
     attr_accessor :to
 
     # Whether to include `to` in the loop or stop just before.
@@ -22,8 +22,8 @@ module Sass::Tree
     attr_reader :exclusive
 
     # @param var [String] See \{#var}
-    # @param from [Script::Node] See \{#from}
-    # @param to [Script::Node] See \{#to}
+    # @param from [Script::Tree::Node] See \{#from}
+    # @param to [Script::Tree::Node] See \{#to}
     # @param exclusive [Boolean] See \{#exclusive}
     def initialize(var, from, to, exclusive)
       @var = var

data/lib/sass/tree/function_node.rb

@@ -12,17 +12,17 @@ module Sass
       # containing the variable for argument and the parse tree for
       # the default value of the argument
       #
-      # @return [Array<Script::Node>]
+      # @return [Array<Script::Tree::Node>]
       attr_accessor :args
 
       # The splat argument for this function, if one exists.
       #
-      # @return [Script::Node?]
+      # @return [Script::Tree::Node?]
       attr_accessor :splat
 
       # @param name [String] The function name
-      # @param args [Array<(Script::Node, Script::Node)>] The arguments for the function.
-      # @param splat [Script::Node] See \{#splat}
+      # @param args [Array<(Script::Tree::Node, Script::Tree::Node)>] The arguments for the function.
+      # @param splat [Script::Tree::Node] See \{#splat}
       def initialize(name, args, splat)
         @name = name
         @args = args

data/lib/sass/tree/media_node.rb

@@ -8,11 +8,11 @@ module Sass::Tree
   class MediaNode < DirectiveNode
     # TODO: parse and cache the query immediately if it has no dynamic elements
 
-    # The media query for this rule, interspersed with {Sass::Script::Node}s
+    # The media query for this rule, 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 :query
 
     # The media query for this rule, without any unresolved interpolation. It's
@@ -27,7 +27,7 @@ module Sass::Tree
     # @see RuleNode#group_end
     attr_accessor :group_end
 
-    # @param query [Array<String, Sass::Script::Node>] See \{#query}
+    # @param query [Array<String, Sass::Script::Tree::Node>] See \{#query}
     def initialize(query)
       @query = query
       @tabs = 0

data/lib/sass/tree/mixin_def_node.rb

@@ -12,12 +12,12 @@ module Sass
       # Each element is a tuple containing the variable for argument
       # and the parse tree for the default value of the argument.
       #
-      # @return [Array<(Script::Node, Script::Node)>]
+      # @return [Array<(Script::Tree::Node, Script::Tree::Node)>]
       attr_accessor :args
 
       # The splat argument for this mixin, if one exists.
       #
-      # @return [Script::Node?]
+      # @return [Script::Tree::Node?]
       attr_accessor :splat
 
       # Whether the mixin uses `@content`. Set during the nesting check phase.
@@ -25,8 +25,8 @@ module Sass
       attr_accessor :has_content
 
       # @param name [String] The mixin name
-      # @param args [Array<(Script::Node, Script::Node)>] See \{#args}
-      # @param splat [Script::Node] See \{#splat}
+      # @param args [Array<(Script::Tree::Node, Script::Tree::Node)>] See \{#args}
+      # @param splat [Script::Tree::Node] See \{#splat}
       def initialize(name, args, splat)
         @name = name
         @args = args

data/lib/sass/tree/mixin_node.rb

@@ -12,22 +12,22 @@ module Sass::Tree
     attr_reader :name
 
     # The arguments to the mixin.
-    # @return [Array<Script::Node>]
+    # @return [Array<Script::Tree::Node>]
     attr_accessor :args
 
     # A hash from keyword argument names to values.
-    # @return [{String => Script::Node}]
+    # @return [{String => Script::Tree::Node}]
     attr_accessor :keywords
 
     # The splat argument for this mixin, if one exists.
     #
-    # @return [Script::Node?]
+    # @return [Script::Tree::Node?]
     attr_accessor :splat
 
     # @param name [String] The name of the mixin
-    # @param args [Array<Script::Node>] See \{#args}
-    # @param splat [Script::Node] See \{#splat}
-    # @param keywords [{String => Script::Node}] See \{#keywords}
+    # @param args [Array<Script::Tree::Node>] See \{#args}
+    # @param splat [Script::Tree::Node] See \{#splat}
+    # @param keywords [{String => Script::Tree::Node}] See \{#keywords}
     def initialize(name, args, keywords, splat)
       @name = name
       @args = args

data/lib/sass/tree/prop_node.rb

@@ -4,11 +4,11 @@ module Sass::Tree
   # @see Sass::Tree
   class PropNode < Node
     # The name of the property,
-    # 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 :name
 
     # The name of the property
@@ -20,7 +20,7 @@ module Sass::Tree
 
     # The value of the property.
     #
-    # @return [Sass::Script::Node]
+    # @return [Sass::Script::Tree::Node]
     attr_accessor :value
 
     # The value of the property
@@ -52,8 +52,8 @@ module Sass::Tree
     # @return [Sass::Source::Range]
     attr_accessor :value_source_range
 
-    # @param name [Array<String, Sass::Script::Node>] See \{#name}
-    # @param value [Sass::Script::Node] See \{#value}
+    # @param name [Array<String, Sass::Script::Tree::Node>] See \{#name}
+    # @param value [Sass::Script::Tree::Node] See \{#value}
     # @param prop_syntax [Symbol] `:new` if this property uses `a: b`-style syntax,
     #   `:old` if it uses `:a b`-style syntax
     def initialize(name, value, prop_syntax)
@@ -80,7 +80,13 @@ module Sass::Tree
     #
     # @return [String] The message
     def pseudo_class_selector_message
-      return "" if @prop_syntax == :new || !value.is_a?(Sass::Script::String) || !value.value.empty?
+      if @prop_syntax == :new ||
+          !value.is_a?(Sass::Script::Tree::Literal) ||
+          !value.value.is_a?(Sass::Script::Value::String) ||
+          !value.value.value.empty?
+        return ""
+      end
+
       "\nIf #{declaration.dump} should be a selector, use \"\\#{declaration}\" instead."
     end
 
@@ -127,34 +133,36 @@ module Sass::Tree
       private
 
       def val_to_sass_comma(node, opts)
-        return node unless node.is_a?(Sass::Script::Operation)
+        return node unless node.is_a?(Sass::Script::Tree::Operation)
         return val_to_sass_concat(node, opts) unless node.operator == :comma
 
-        Sass::Script::Operation.new(
+        Sass::Script::Tree::Operation.new(
           val_to_sass_concat(node.operand1, opts),
           val_to_sass_comma(node.operand2, opts),
           node.operator)
       end
 
       def val_to_sass_concat(node, opts)
-        return node unless node.is_a?(Sass::Script::Operation)
+        return node unless node.is_a?(Sass::Script::Tree::Operation)
         return val_to_sass_div(node, opts) unless node.operator == :space
 
-        Sass::Script::Operation.new(
+        Sass::Script::Tree::Operation.new(
           val_to_sass_div(node.operand1, opts),
           val_to_sass_concat(node.operand2, opts),
           node.operator)
       end
 
       def val_to_sass_div(node, opts)
-        unless node.is_a?(Sass::Script::Operation) && node.operator == :div &&
-            node.operand1.is_a?(Sass::Script::Number) &&
-            node.operand2.is_a?(Sass::Script::Number) &&
-            (!node.operand1.original || !node.operand2.original)
+        unless node.is_a?(Sass::Script::Tree::Operation) && node.operator == :div &&
+            node.operand1.is_a?(Sass::Script::Tree::Literal) &&
+            node.operand1.value.is_a?(Sass::Script::Value::Number) &&
+            node.operand2.is_a?(Sass::Script::Tree::Literal) &&
+            node.operand2.value.is_a?(Sass::Script::Value::Number) &&
+            (!node.operand1.value.original || !node.operand2.value.original)
           return node
         end
 
-        Sass::Script::String.new("(#{node.to_sass(opts)})")
+        Sass::Script::Value::String.new("(#{node.to_sass(opts)})")
       end
 
     end

data/lib/sass/tree/return_node.rb

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