sass 3.3.0.alpha.229 → 3.3.0.alpha.231

data/REVISION

@@ -1 +1 @@
-7ff8fef1739f20466b1b9e9330a99fe4f7ca83e9
+4b12122cb838c1c8b2488b2c0bb3f252d261de2a

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.229
+3.3.0.alpha.231

data/VERSION_DATE

@@ -1 +1 @@
-12 August 2013 23:04:10 GMT
+23 August 2013 23:13:38 GMT

data/lib/sass/engine.rb

@@ -42,6 +42,7 @@ require 'sass/selector'
 require 'sass/environment'
 require 'sass/script'
 require 'sass/scss'
+require 'sass/stack'
 require 'sass/error'
 require 'sass/importers'
 require 'sass/shared'

data/lib/sass/script/value/list.rb

@@ -42,6 +42,20 @@ module Sass::Script::Value
       return value.reject {|e| e.is_a?(Null) || e.is_a?(List) && e.value.empty?}.map {|e| e.to_s(opts)}.join(sep_str)
     end
 
+    # @see Value#to_sass
+    def to_sass(opts = {})
+      return "()" if value.empty?
+      precedence = Sass::Script::Parser.precedence_of(separator)
+      value.reject {|e| e.is_a?(Null)}.map do |v|
+        if v.is_a?(List) && Sass::Script::Parser.precedence_of(v.separator) <= precedence ||
+            separator == :space && v.is_a?(UnaryOperation) && (v.operator == :minus || v.operator == :plus)
+          "(#{v.to_sass(opts)})"
+        else
+          v.to_sass(opts)
+        end
+      end.join(sep_str(nil))
+    end
+
     # @see Value#inspect
     def inspect
       "(#{value.map {|e| e.inspect}.join(sep_str(nil))})"

data/lib/sass/stack.rb

@@ -0,0 +1,111 @@
+module Sass
+  # A class representing the stack when compiling a Sass file.
+  class Stack
+    # TODO: use this to generate stack information for Sass::SyntaxErrors.
+
+    # A single stack frame.
+    class Frame
+      # The filename of the file in which this stack frame was created.
+      #
+      # @return [String]
+      attr_reader :filename
+
+      # The line number on which this stack frame was created.
+      #
+      # @return [String]
+      attr_reader :line
+
+      # The type of this stack frame. This can be `:import`, `:mixin`, or
+      # `:base`.
+      #
+      # `:base` indicates that this is the bottom-most frame, meaning that it
+      # represents a single line of code rather than a nested context. The stack
+      # will only ever have one base frame, and it will always be the most
+      # deeply-nested frame.
+      #
+      # @return [Symbol?]
+      attr_reader :type
+
+      # The name of the stack frame. For mixin frames, this is the mixin name;
+      # otherwise, it's `nil`.
+      #
+      # @return [String?]
+      attr_reader :name
+
+      def initialize(filename, line, type, name = nil)
+        @filename = filename
+        @line = line
+        @type = type
+        @name = name
+      end
+
+      # Whether this frame represents an import.
+      #
+      # @return [Boolean]
+      def is_import?
+        type == :import
+      end
+
+      # Whether this frame represents a mixin.
+      #
+      # @return [Boolean]
+      def is_mixin?
+        type == :mixin
+      end
+
+      # Whether this is the base frame.
+      #
+      # @return [Boolean]
+      def is_base?
+        type == :base
+      end
+    end
+
+    # The stack frames. The last frame is the most deeply-nested.
+    #
+    # @return [Array<Frame>]
+    attr_reader :frames
+
+    def initialize
+      @frames = []
+    end
+
+    # Pushes a base frame onto the stack.
+    #
+    # @param filename [String] See \{Frame#filename}.
+    # @param line [String] See \{Frame#line}.
+    # @yield [] A block in which the new frame is on the stack.
+    def with_base(filename, line)
+      with_frame(filename, line, :base) {yield}
+    end
+
+    # Pushes an import frame onto the stack.
+    #
+    # @param filename [String] See \{Frame#filename}.
+    # @param line [String] See \{Frame#line}.
+    # @yield [] A block in which the new frame is on the stack.
+    def with_import(filename, line)
+      with_frame(filename, line, :import) {yield}
+    end
+
+    # Pushes a mixin frame onto the stack.
+    #
+    # @param filename [String] See \{Frame#filename}.
+    # @param line [String] See \{Frame#line}.
+    # @param name [String] See \{Frame#name}.
+    # @yield [] A block in which the new frame is on the stack.
+    def with_mixin(filename, line, name)
+      with_frame(filename, line, :mixin, name) {yield}
+    end
+
+    private
+
+    def with_frame(filename, line, type, name = nil)
+      @frames.pop if @frames.last && @frames.last.type == :base
+      @frames.push(Frame.new(filename, line, type, name))
+      yield
+    ensure
+      @frames.pop unless type == :base && @frames.last && @frames.last.type != :base
+    end
+  end
+end

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

@@ -91,13 +91,12 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
   def initialize(env)
     @environment = env
-    # Stack trace information, including mixin includes and imports.
-    @stack = []
+    @stack = Sass::Stack.new
   end
 
   # If an exception is raised, this adds proper metadata to the backtrace.
   def visit(node)
-    super(node.dup)
+    @stack.with_base(node.filename, node.line) {super(node.dup)}
   rescue Sass::SyntaxError => e
     e.modify_backtrace(:filename => node.filename, :line => node.line)
     raise e
@@ -221,21 +220,22 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       return resolved_node
     end
     file = node.imported_file
-    handle_import_loop!(node) if @stack.any? {|e| e[:filename] == file.options[:filename]}
+    if @stack.frames.any? {|f| f.is_import? && f.filename == file.options[:filename]}
+      handle_import_loop!(node)
+    end
 
     begin
-      @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
+      @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
     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.
@@ -249,27 +249,28 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   # Runs a mixin.
   def visit_mixin(node)
     include_loop = true
-    handle_include_loop!(node) if @stack.any? {|e| e[:name] == node.name}
+    handle_include_loop!(node) if @stack.frames.any? {|f| f.is_mixin? && f.name == node.name}
     include_loop = false
 
-    @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)
+    @stack.with_mixin(node.filename, node.line, node.name) do
+      raise Sass::SyntaxError.new("Undefined mixin '#{node.name}'.") unless mixin = @environment.mixin(node.name)
 
-    if node.children.any? && !mixin.has_content
-      raise Sass::SyntaxError.new(%Q{Mixin "#{node.name}" does not accept a content block.})
-    end
+      if node.children.any? && !mixin.has_content
+        raise Sass::SyntaxError.new(%Q{Mixin "#{node.name}" does not accept a content block.})
+      end
 
-    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
+      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
 
-    self.class.perform_arguments(mixin, args, keywords, splat) do |env|
-      env.caller = Sass::Environment.new(@environment)
-      env.content = node.children if node.has_children
+      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
+        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
     end
   rescue Sass::SyntaxError => e
     unless include_loop
@@ -277,22 +278,19 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       e.add_backtrace(:line => node.line)
     end
     raise e
-  ensure
-    @stack.pop unless include_loop
   end
 
   def visit_content(node)
     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
+    @stack.with_mixin(node.filename, node.line, '@content') do
+      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
+    end
   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.
@@ -317,11 +315,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     parser = Sass::SCSS::StaticParser.new(run_interp(node.rule),
       node.filename, node.options[:importer], 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
+    node.stack_trace = stack_trace if node.options[:trace_selectors]
     yield
   end
 
@@ -341,15 +335,12 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
   # 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)
     msg = "WARNING: #{res}\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.
@@ -392,16 +383,12 @@ 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
+    Sass::Util.enum_with_index(Sass::Util.enum_cons(@stack.frames.reverse + [nil], 2)).
+        map do |(frame, caller), i|
+      "#{i == 0 ? "on" : "from"} line #{frame.line}" +
+        " of #{frame.filename || "an unknown file"}" +
+        (caller && caller.name ? ", in `#{caller.name}'" : "")
     end
-    trace
   end
 
   def run_interp_no_strip(text)
@@ -421,8 +408,8 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   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'
+    mixins = @stack.frames.select {|f| f.is_mixin?}.reverse.map {|f| f.name}.select do |name|
+      if name == '@content'
         content_count += 1
         false
       elsif content_count > 0
@@ -444,7 +431,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
   def handle_import_loop!(node)
     msg = "An @import loop has been found:"
-    files = @stack.map {|s| s[:filename]}.compact
+    files = @stack.frames.select {|f| f.is_import?}.map {|f| f.filename}.compact
     if node.filename == node.imported_file.options[:filename]
       raise Sass::SyntaxError.new("#{msg} #{node.filename} imports itself")
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302791
+  hash: 592302787
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 229
-  version: 3.3.0.alpha.229
+  - 231
+  version: 3.3.0.alpha.231
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-12 00:00:00 -04:00
+date: 2013-08-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -192,6 +192,7 @@ files:
 - lib/sass/tree/visitors/to_css.rb
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
+- lib/sass/stack.rb
 - lib/sass/util/multibyte_string_scanner.rb
 - lib/sass/util/normalized_map.rb
 - lib/sass/util/ordered_hash.rb