haml 2.2.24 → 3.0.0.beta.1

data/lib/haml/version.rb

@@ -23,11 +23,27 @@ module Haml
     #       :major  => 2, :minor => 1, :teeny => 0
     #     }
     #
+    # If a prerelease version of Haml is being used,
+    # the `:string` and `:number` fields will reflect the full version
+    # (e.g. `"2.2.beta.1"`), and the `:tiny` field will be `-1`.
+    # A `:prerelease` key will contain the name of the prerelease (e.g. `"beta"`),
+    # and a `:prerelease_number` key will contain the rerelease number.
+    # For example:
+    #
+    #     {
+    #       :string => "3.0.beta.1",
+    #       :number => "3.0.beta.1",
+    #       :major => 3, :minor => 0, :tiny => -1,
+    #       :prerelease => "beta",
+    #       :prerelease_number => 1
+    #     }
+    #
     # @return [{Symbol => String/Fixnum}] The version hash
     def version
       return @@version if defined?(@@version)
 
-      numbers = File.read(scope('VERSION')).strip.split('.').map { |n| n.to_i }
+      numbers = File.read(scope('VERSION')).strip.split('.').
+        map {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
       name = File.read(scope('VERSION_NAME')).strip
       @@version = {
         :major => numbers[0],
@@ -35,7 +51,14 @@ module Haml
         :teeny => numbers[2],
         :name => name
       }
-      @@version[:number] = [:major, :minor, :teeny].map { |comp| @@version[comp] }.compact.join('.')
+
+      if numbers[3].is_a?(String)
+        @@version[:teeny] = -1
+        @@version[:prerelease] = numbers[3]
+        @@version[:prerelease_number] = numbers[4]
+      end
+
+      @@version[:number] = numbers.join('.')
       @@version[:string] = @@version[:number].dup
 
       if rev = revision_number

data/lib/sass.rb

@@ -5,7 +5,7 @@ require 'haml/version'
 
 # The module that contains everything Sass-related:
 #
-# * {Sass::Engine} is the class used to render Sass within Ruby code.
+# * {Sass::Engine} is the class used to render Sass/SCSS within Ruby code.
 # * {Sass::Plugin} is interfaces with web frameworks (Rails and Merb in particular).
 # * {Sass::SyntaxError} is raised when Sass encounters an error.
 # * {Sass::CSS} handles conversion of CSS to Sass.
@@ -20,5 +20,9 @@ module Sass
 end
 
 require 'haml/util'
+
+dir = Haml::Util.scope("vendor/fssm/lib")
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
+
 require 'sass/engine'
 require 'sass/plugin' if defined?(Merb::Plugins)

data/lib/sass/callbacks.rb

@@ -0,0 +1,50 @@
+# A lightweight infrastructure for defining and running callbacks.
+# Callbacks are defined using \{#define\_callback\} at the class level,
+# and called using `run_#{name}` at the instance level.
+#
+# Clients can add callbacks by calling the generated `on_#{name}` method,
+# and passing in a block that's run when the callback is activated.
+#
+# @example Define a callback
+# class Munger
+#   extend Sass::Callbacks
+#   define_callback :string_munged
+#
+#   def munge(str)
+#     res = str.gsub(/[a-z]/, '\1\1')
+#     run_string_munged str, res
+#     res
+#   end
+# end
+#
+# @example Use a callback
+# m = Munger.new
+# m.on_string_munged {|str, res| puts "#{str} was munged into #{res}!"}
+# m.munge "bar" #=> bar was munged into bbaarr!
+module Sass::Callbacks
+  protected
+
+  # Define a callback with the given name.
+  # This will define an `on_#{name}` method
+  # that registers a block,
+  # and a `run_#{name}` method that runs that block
+  # (optionall with some arguments).
+  #
+  # @param name [Symbol] The name of the callback
+  # @return [void]
+  def define_callback(name)
+    class_eval <<RUBY
+def on_#{name}(&block)
+  @_sass_callbacks ||= {}
+  (@_sass_callbacks[#{name.inspect}] ||= []) << block
+end
+
+def run_#{name}(*args)
+  return unless @_sass_callbacks
+  return unless @_sass_callbacks[#{name.inspect}]
+  @_sass_callbacks[#{name.inspect}].each {|c| c[*args]}
+end
+private :run_#{name}
+RUBY
+  end
+end

data/lib/sass/css.rb

@@ -1,69 +1,25 @@
 require File.dirname(__FILE__) + '/../sass'
 require 'sass/tree/node'
+require 'sass/scss/css_parser'
 require 'strscan'
 
 module Sass
-  module Tree
-    class Node
-      # Converts a node to Sass code that will generate it.
-      #
-      # @param tabs [Fixnum] The amount of tabulation to use for the Sass code
-      # @param opts [{Symbol => Object}] An options hash (see {Sass::CSS#initialize})
-      # @return [String] The Sass code corresponding to the node
-      def to_sass(tabs = 0, opts = {})
-        result = ''
-
-        children.each do |child|
-          result << "#{'  ' * tabs}#{child.to_sass(0, opts)}\n"
-        end
-
-        result
-      end
-    end
-
-    class RuleNode
-      # @see Node#to_sass
-      def to_sass(tabs, opts = {})
-        name = rules.first
-        name = "\\" + name if name[0] == ?:
-        str = "\n#{'  ' * tabs}#{name}#{children.any? { |c| c.is_a? PropNode } ? "\n" : ''}"
-
-        children.each do |child|
-          str << "#{child.to_sass(tabs + 1, opts)}"
-        end
-
-        str
-      end
-    end
-
-    class PropNode
-      # @see Node#to_sass
-      def to_sass(tabs, opts = {})
-        "#{'  ' * tabs}#{opts[:old] ? ':' : ''}#{name}#{opts[:old] ? '' : ':'} #{value}\n"
-      end
-    end
-
-    class DirectiveNode
-      # @see Node#to_sass
-      def to_sass(tabs, opts = {})
-        "#{'  ' * tabs}#{value}#{children.map {|c| c.to_sass(tabs + 1, opts)}}\n"
-      end
-    end
-  end
-
-  # This class converts CSS documents into Sass templates.
+  # This class converts CSS documents into Sass or SCSS templates.
   # It works by parsing the CSS document into a {Sass::Tree} structure,
   # and then applying various transformations to the structure
-  # to produce more concise and idiomatic Sass.
+  # to produce more concise and idiomatic Sass/SCSS.
   #
   # Example usage:
   #
-  #     Sass::CSS.new("p { color: blue }").render #=> "p\n  color: blue"
+  #     Sass::CSS.new("p { color: blue }").render(:sass) #=> "p\n  color: blue"
+  #     Sass::CSS.new("p { color: blue }").render(:scss) #=> "p {\n  color: blue; }"
   class CSS
     # @param template [String] The CSS code
     # @option options :old [Boolean] (false)
     #     Whether or not to output old property syntax
     #     (`:color blue` as opposed to `color: blue`).
+    #     This is only meaningful when generating Sass code,
+    #     rather than SCSS.
     def initialize(template, options = {})
       if template.is_a? IO
         template = template.read
@@ -72,21 +28,23 @@ module Sass
       @options = options.dup
       # Backwards compatibility
       @options[:old] = true if @options[:alternate] == false
-      @template = StringScanner.new(template)
+      @template = template
     end
 
-    # Converts the CSS template into Sass code.
+    # Converts the CSS template into Sass or SCSS code.
     #
-    # @return [String] The resulting Sass code
-    def render
-      begin
-        build_tree.to_sass(0, @options).strip + "\n"
-      rescue Exception => err
-        line = @template.string[0...@template.pos].split("\n").size
-
-        err.backtrace.unshift "(css):#{line}"
-        raise err
+    # @param fmt [Symbol] `:sass` or `:scss`, designating the format to return.
+    # @return [String] The resulting Sass or SCSS code
+    # @raise [Sass::SyntaxError] if there's an error parsing the CSS template
+    def render(fmt = :sass)
+      Haml::Util.check_encoding(@template) do |msg, line|
+        raise Sass::SyntaxError.new(msg, :line => line)
       end
+
+      build_tree.send("to_#{fmt}", @options).strip + "\n"
+    rescue Sass::SyntaxError => err
+      err.modify_backtrace(:filename => @options[:filename] || '(css)')
+      raise err
     end
 
     private
@@ -95,9 +53,7 @@ module Sass
     #
     # @return [Tree::Node] The root node of the parsed tree
     def build_tree
-      root = Tree::Node.new
-      whitespace
-      rules              root
+      root = Sass::SCSS::CssParser.new(@template).parse
       expand_commas      root
       parent_ref_rules   root
       remove_parent_refs root
@@ -106,117 +62,6 @@ module Sass
       root
     end
 
-    # Parses a set of CSS rules.
-    #
-    # @param root [Tree::Node] The parent node of the rules
-    def rules(root)
-      while r = rule
-        root << r
-        whitespace
-      end
-    end
-
-    # Parses a single CSS rule.
-    #
-    # @return [Tree::Node] The parsed rule
-    def rule
-      rule = ""
-      loop do
-        token = @template.scan(/(?:[^\{\};\/\s]|\/[^*])+/)
-        if token.nil?
-          return if rule.empty?
-          break
-        end
-        rule << token
-        break unless @template.match?(/\s|\/\*/)
-        whitespace
-        rule << " "
-      end
-
-      rule.strip!
-      directive = rule[0] == ?@
-
-      if directive
-        node = Tree::DirectiveNode.new(rule)
-        return node if @template.scan(/;/)
-
-        assert_match /\{/
-        whitespace
-
-        rules(node)
-        return node
-      end
-
-      assert_match /\{/
-      node = Tree::RuleNode.new(rule)
-      properties(node)
-      return node
-    end
-
-    # Parses a set of CSS properties within a rule.
-    #
-    # @param rule [Tree::RuleNode] The parent node of the properties
-    def properties(rule)
-      while @template.scan(/[^:\}\s]+/)
-        name = @template[0]
-        whitespace
-
-        assert_match /:/
-
-        value = ''
-        while @template.scan(/[^;\s\}]+/)
-          value << @template[0] << whitespace
-        end
-
-        assert_match /(;|(?=\}))/
-        rule << Tree::PropNode.new(name, value, nil)
-      end
-
-      assert_match /\}/
-    end
-
-    # Moves the scanner over a section of whitespace or comments.
-    #
-    # @return [String] The ignored whitespace
-    def whitespace
-      space = @template.scan(/\s*/) || ''
-
-      # If we've hit a comment,
-      # go past it and look for more whitespace
-      if @template.scan(/\/\*/)
-        @template.scan_until(/\*\//)
-        return space + whitespace
-      end
-      return space
-    end
-
-    # Moves the scanner over a regular expression,
-    # raising an exception if it doesn't match.
-    #
-    # @param re [Regexp] The regular expression to assert
-    def assert_match(re)
-      if @template.scan(re)
-        whitespace
-        return
-      end
-
-      line = @template.string[0..@template.pos].count "\n"
-      pos = @template.pos
-
-      after = @template.string[pos - 15...pos]
-      after = "..." + after if pos >= 15
-
-      # Display basic regexps as plain old strings
-      expected = re.source == Regexp.escape(re.source) ? "\"#{re.source}\"" : re.inspect
-
-      was = @template.rest[0...15]
-      was += "..." if @template.rest.size >= 15
-      raise Exception.new(<<MESSAGE)
-Invalid CSS on line #{line + 1} after #{after.inspect}:
-  expected #{expected}, was #{was.inspect}
-MESSAGE
-    end
-
     # Transform
     #
     #     foo, bar, baz
@@ -234,9 +79,9 @@ MESSAGE
     # @param root [Tree::Node] The parent node
     def expand_commas(root)
       root.children.map! do |child|
-        next child unless Tree::RuleNode === child && child.rules.first.include?(',')
-        child.rules.first.split(',').map do |rule|
-          node = Tree::RuleNode.new(rule.strip)
+        next child unless Tree::RuleNode === child && child.rule.first.include?(',')
+        child.rule.first.split(',').map do |rule|
+          node = Tree::RuleNode.new([rule.strip])
           node.children = child.children
           node
         end
@@ -280,22 +125,26 @@ MESSAGE
     # @param root [Tree::Node] The parent node
     def parent_ref_rules(root)
       current_rule = nil
-      root.children.select { |c| Tree::RuleNode === c }.each do |child|
-        root.children.delete child
-        first, rest = child.rules.first.scan(/^(&?(?: .|[^ ])[^.#: \[]*)([.#: \[].*)?$/).first
+      root.children.map! do |child|
+        next child unless child.is_a?(Tree::RuleNode)
 
-        if current_rule.nil? || current_rule.rules.first != first
-          current_rule = Tree::RuleNode.new(first)
-          root << current_rule
+        first, rest = child.rule.first.scan(/^(&?(?: .|[^ ])[^.#: \[]*)([.#: \[].*)?$/).first
+
+        if current_rule.nil? || current_rule.rule.first != first
+          current_rule = Tree::RuleNode.new([first])
         end
 
         if rest
-          child.rules = ["&" + rest]
+          child.rule = ["&" + rest]
           current_rule << child
         else
           current_rule.children += child.children
         end
+
+        current_rule
       end
+      root.children.compact!
+      root.children.uniq!
 
       root.children.each { |v| parent_ref_rules(v) }
     end
@@ -316,7 +165,7 @@ MESSAGE
     def remove_parent_refs(root)
       root.children.each do |child|
         if child.is_a?(Tree::RuleNode)
-          child.rules.first.gsub! /^& +/, ''
+          child.rule.first.gsub! /^& +/, ''
           remove_parent_refs child
         end
       end
@@ -357,10 +206,10 @@ MESSAGE
       while rule.children.size == 1 && rule.children.first.is_a?(Tree::RuleNode)
         child = rule.children.first
 
-        if child.rules.first[0] == ?&
-          rule.rules = [child.rules.first.gsub(/^&/, rule.rules.first)]
+        if child.rule.first[0] == ?&
+          rule.rule = [child.rule.first.gsub(/^&/, rule.rule.first)]
         else
-          rule.rules = ["#{rule.rules.first} #{child.rules.first}"]
+          rule.rule = ["#{rule.rule.first} #{child.rule.first}"]
         end
 
         rule.children = child.children
@@ -390,7 +239,7 @@ MESSAGE
         next child unless child.is_a?(Tree::RuleNode)
 
         if prev_rule && prev_rule.children == child.children
-          prev_rule.rules.first << ", #{child.rules.first}"
+          prev_rule.rule.first << ", #{child.rule.first}"
           next nil
         end
 

data/lib/sass/engine.rb

@@ -1,6 +1,7 @@
 require 'strscan'
 require 'digest/sha1'
 require 'sass/tree/node'
+require 'sass/tree/root_node'
 require 'sass/tree/rule_node'
 require 'sass/tree/comment_node'
 require 'sass/tree/prop_node'
@@ -15,6 +16,7 @@ require 'sass/tree/debug_node'
 require 'sass/tree/import_node'
 require 'sass/environment'
 require 'sass/script'
+require 'sass/scss'
 require 'sass/error'
 require 'sass/files'
 require 'haml/shared'
@@ -122,7 +124,7 @@ module Sass
     # The regex that matches and extracts data from
     # properties of the form `name: prop`.
     # @private
-    PROPERTY_NEW = /^([^\s=:"]+)(\s*=|:)(?:\s+|$)(.*)/
+    PROPERTY_NEW = /^([^\s=:"]+)\s*(=|:)(?:\s+|$)(.*)/
 
     # The regex that matches and extracts data from
     # properties of the form `:name prop`.
@@ -135,6 +137,7 @@ module Sass
       :load_paths => ['.'],
       :cache => true,
       :cache_location => './.sass-cache',
+      :syntax => :sass,
     }.freeze
 
     # @param template [String] The Sass template.
@@ -171,11 +174,21 @@ module Sass
     # @return [Sass::Tree::Node] The root of the parse tree.
     # @raise [Sass::SyntaxError] if there's an error in the document
     def to_tree
-      root = Tree::Node.new
-      append_children(root, tree(tabulate(@template)).first, true)
+      @template = check_encoding(@template) {|msg, line| raise Sass::SyntaxError.new(msg, :line => line)}
+
+      if @options[:syntax] == :scss
+        root = Sass::SCSS::Parser.new(@template).parse
+      else
+        root = Tree::RootNode.new(@template)
+        append_children(root, tree(tabulate(@template)).first, true)
+      end
+
       root.options = @options
       root
-    rescue SyntaxError => e; e.add_metadata(@options[:filename], @line)
+    rescue SyntaxError => e
+      e.modify_backtrace(:filename => @options[:filename], :line => @line)
+      e.sass_template = @template
+      raise e
     end
 
     private
@@ -202,10 +215,11 @@ module Sass
 
           tab_str ||= line_tab_str
 
-          raise SyntaxError.new("Indenting at the beginning of the document is illegal.", index) if first
-          if tab_str.include?(?\s) && tab_str.include?(?\t)
-            raise SyntaxError.new("Indentation can't use both tabs and spaces.", index)
-          end
+          raise SyntaxError.new("Indenting at the beginning of the document is illegal.",
+            :line => index) if first
+
+          raise SyntaxError.new("Indentation can't use both tabs and spaces.",
+            :line => index) if tab_str.include?(?\s) && tab_str.include?(?\t)
         end
         first &&= !tab_str.nil?
         if tab_str.nil?
@@ -221,10 +235,14 @@ module Sass
         end
 
         line_tabs = line_tab_str.scan(tab_str).size
-        raise SyntaxError.new(<<END.strip.gsub("\n", ' '), index) if tab_str * line_tabs != line_tab_str
+        if tab_str * line_tabs != line_tab_str
+          message = <<END.strip.gsub("\n", ' ')
 Inconsistent indentation: #{Haml::Shared.human_indentation line_tab_str, true} used for indentation,
 but the rest of the document was indented using #{Haml::Shared.human_indentation tab_str}.
 END
+          raise SyntaxError.new(message, :line => index)
+        end
+
         lines << Line.new(line.strip, line_tabs, index, tab_str.size, @options[:filename], [])
       end
       lines
@@ -234,7 +252,7 @@ END
       return unless last && last.comment?
       return unless line =~ /^#{tab_str}/
       unless line =~ /^(?:#{comment_tab_str})(.*)$/
-        raise SyntaxError.new(<<MSG.strip.gsub("\n", " "), index)
+        raise SyntaxError.new(<<MSG.strip.gsub("\n", " "), :line => index)
 Inconsistent indentation:
 previous line was indented by #{Haml::Shared.human_indentation comment_tab_str},
 but this line was indented by #{Haml::Shared.human_indentation line[/^\s*/]}.
@@ -252,9 +270,8 @@ MSG
       nodes = []
       while (line = arr[i]) && line.tabs >= base
         if line.tabs > base
-          if line.tabs > base + 1
-            raise SyntaxError.new("The line was indented #{line.tabs - base} levels deeper than the previous line.", line.index)
-          end
+          raise SyntaxError.new("The line was indented #{line.tabs - base} levels deeper than the previous line.",
+            :line => line.index) if line.tabs > base + 1
 
           nodes.last.children, i = tree(arr, i)
         else
@@ -276,11 +293,7 @@ MSG
         node.line = line.index
         node.filename = line.filename
 
-        if node.is_a?(Tree::CommentNode)
-          node.lines = line.children
-        else
-          append_children(node, line.children, false)
-        end
+        append_children(node, line.children, false)
       end
 
       node_or_nodes
@@ -288,11 +301,13 @@ MSG
 
     def append_children(parent, children, root)
       continued_rule = nil
+      continued_comment = nil
       children.each do |line|
         child = build_tree(parent, line, root)
 
         if child.is_a?(Tree::RuleNode) && child.continued?
-          raise SyntaxError.new("Rules can't end in commas.", child.line) unless child.children.empty?
+          raise SyntaxError.new("Rules can't end in commas.",
+            :line => child.line) unless child.children.empty?
           if continued_rule
             continued_rule.add_rules child
           else
@@ -302,31 +317,35 @@ MSG
         end
 
         if continued_rule
-          raise SyntaxError.new("Rules can't end in commas.", continued_rule.line) unless child.is_a?(Tree::RuleNode)
+          raise SyntaxError.new("Rules can't end in commas.",
+            :line => continued_rule.line) unless child.is_a?(Tree::RuleNode)
           continued_rule.add_rules child
           continued_rule.children = child.children
           continued_rule, child = nil, continued_rule
         end
 
+        if child.is_a?(Tree::CommentNode) && child.silent
+          if continued_comment &&
+              child.line == continued_comment.line +
+              continued_comment.value.count("\n") + 1
+            continued_comment.value << "\n" << child.value
+            next
+          end
+
+          continued_comment = child
+        end
+
         check_for_no_children(child)
         validate_and_append_child(parent, child, line, root)
       end
 
-      raise SyntaxError.new("Rules can't end in commas.", continued_rule.line) if continued_rule
+      raise SyntaxError.new("Rules can't end in commas.",
+        :line => continued_rule.line) if continued_rule
 
       parent
     end
 
     def validate_and_append_child(parent, child, line, root)
-      unless root
-        case child
-        when Tree::MixinDefNode
-          raise SyntaxError.new("Mixins may only be defined at the root of a document.", line.index)
-        when Tree::ImportNode
-          raise SyntaxError.new("Import directives may only be used at the root of a document.", line.index)
-        end
-      end
-
       case child
       when Array
         child.each {|c| validate_and_append_child(parent, c, line, root)}
@@ -337,18 +356,10 @@ MSG
 
     def check_for_no_children(node)
       return unless node.is_a?(Tree::RuleNode) && node.children.empty?
-      warning = (node.rules.size == 1) ? <<SHORT : <<LONG
+      Haml::Util.haml_warn(<<WARNING.strip)
 WARNING on line #{node.line}#{" of #{node.filename}" if node.filename}:
-Selector #{node.rules.first.inspect} doesn't have any properties and will not be rendered.
-SHORT
-
-WARNING on line #{node.line}#{" of #{node.filename}" if node.filename}:
-Selector
-  #{node.rules.join("\n  ")}
-doesn't have any properties and will not be rendered.
-LONG
-
-      warn(warning.strip)
+This selector doesn't have any properties and will not be rendered.
+WARNING
     end
 
     def parse_line(parent, line, root)
@@ -361,23 +372,23 @@ LONG
           # which begin with ::,
           # as well as pseudo-classes
           # if we're using the new property syntax
-          Tree::RuleNode.new(line.text)
+          Tree::RuleNode.new(parse_interp(line.text))
         else
           parse_property(line, PROPERTY_OLD)
         end
-      when Script::VARIABLE_CHAR
+      when ?!, ?$
         parse_variable(line)
       when COMMENT_CHAR
         parse_comment(line.text)
       when DIRECTIVE_CHAR
         parse_directive(parent, line, root)
       when ESCAPE_CHAR
-        Tree::RuleNode.new(line.text[1..-1])
+        Tree::RuleNode.new(parse_interp(line.text[1..-1]))
       when MIXIN_DEFINITION_CHAR
         parse_mixin_definition(line)
       when MIXIN_INCLUDE_CHAR
         if line.text[1].nil? || line.text[1] == ?\s
-          Tree::RuleNode.new(line.text)
+          Tree::RuleNode.new(parse_interp(line.text))
         else
           parse_mixin_include(line, root)
         end
@@ -385,7 +396,7 @@ LONG
         if line.text =~ PROPERTY_NEW_MATCHER
           parse_property(line, PROPERTY_NEW)
         else
-          Tree::RuleNode.new(line.text)
+          Tree::RuleNode.new(parse_interp(line.text))
         end
       end
     end
@@ -393,30 +404,54 @@ LONG
     def parse_property(line, property_regx)
       name, eq, value = line.text.scan(property_regx)[0]
 
-      if name.nil? || value.nil?
-        raise SyntaxError.new("Invalid property: \"#{line.text}\".", @line)
-      end
-      expr = if (eq.strip[0] == SCRIPT_CHAR)
-        parse_script(value, :offset => line.offset + line.text.index(value))
+      raise SyntaxError.new("Invalid property: \"#{line.text}\".",
+        :line => @line) if name.nil? || value.nil?
+
+      if value.strip.empty?
+        expr = Sass::Script::String.new("")
       else
-        value
+        expr = parse_script(value, :offset => line.offset + line.text.index(value))
+
+        if eq.strip[0] == SCRIPT_CHAR
+          expr.context = :equals
+          Script.equals_warning("properties", name,
+            Sass::Tree::PropNode.val_to_sass(expr), false,
+            @line, line.offset + 1, @options[:filename])
+        end
       end
-      Tree::PropNode.new(name, expr, property_regx == PROPERTY_OLD ? :old : :new)
+      Tree::PropNode.new(
+        parse_interp(name), expr,
+        property_regx == PROPERTY_OLD ? :old : :new)
     end
 
     def parse_variable(line)
-      name, op, value = line.text.scan(Script::MATCH)[0]
-      raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath variable declarations.", @line + 1) unless line.children.empty?
-      raise SyntaxError.new("Invalid variable: \"#{line.text}\".", @line) unless name && value
+      name, op, value, default = line.text.scan(Script::MATCH)[0]
+      guarded = op =~ /^\|\|/
+      raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath variable declarations.",
+        :line => @line + 1) unless line.children.empty?
+      raise SyntaxError.new("Invalid variable: \"#{line.text}\".",
+        :line => @line) unless name && value
+      Script.var_warning(name, @line, line.offset + 1, @options[:filename]) if line.text[0] == ?!
+
+      expr = parse_script(value, :offset => line.offset + line.text.index(value))
+      if op =~ /=$/
+        expr.context = :equals
+        type = guarded ? "variable defaults" : "variables"
+        Script.equals_warning(type, "$#{name}", expr.to_sass,
+          guarded, @line, line.offset + 1, @options[:filename])
+      end
 
-      Tree::VariableNode.new(name, parse_script(value, :offset => line.offset + line.text.index(value)), op == '||=')
+      Tree::VariableNode.new(name, expr, default || guarded)
     end
 
     def parse_comment(line)
       if line[1] == CSS_COMMENT_CHAR || line[1] == SASS_COMMENT_CHAR
-        Tree::CommentNode.new(line, line[1] == SASS_COMMENT_CHAR)
+        silent = line[1] == SASS_COMMENT_CHAR
+        Tree::CommentNode.new(
+          format_comment_text(line[2..-1], silent),
+          silent)
       else
-        Tree::RuleNode.new(line)
+        Tree::RuleNode.new(parse_interp(line))
       end
     end
 
@@ -427,8 +462,13 @@ LONG
       # If value begins with url( or ",
       # it's a CSS @import rule and we don't want to touch it.
       if directive == "import" && value !~ /^(url\(|")/
-        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.", @line + 1) unless line.children.empty?
+        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.",
+          :line => @line + 1) unless line.children.empty?
         value.split(/,\s*/).map {|f| Tree::ImportNode.new(f)}
+      elsif directive == "mixin"
+        parse_mixin_definition(line)
+      elsif directive == "include"
+        parse_mixin_include(line, root)
       elsif directive == "for"
         parse_for(line, root, value)
       elsif directive == "else"
@@ -441,7 +481,8 @@ LONG
         Tree::IfNode.new(parse_script(value, :offset => offset))
       elsif directive == "debug"
         raise SyntaxError.new("Invalid debug directive '@debug': expected expression.") unless value
-        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath debug directives.", @line + 1) unless line.children.empty?
+        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath debug directives.",
+          :line => @line + 1) unless line.children.empty?
         offset = line.offset + line.text.index(value).to_i
         Tree::DebugNode.new(parse_script(value, :offset => offset))
       else
@@ -460,22 +501,26 @@ LONG
         else
           expected = "'to <expr>' or 'through <expr>'"
         end
-        raise SyntaxError.new("Invalid for directive '@for #{text}': expected #{expected}.", @line)
+        raise SyntaxError.new("Invalid for directive '@for #{text}': expected #{expected}.")
+      end
+      raise SyntaxError.new("Invalid variable \"#{var}\".") unless var =~ Script::VALIDATE
+      if var.slice!(0) == ?!
+        offset = line.offset + line.text.index("!" + var) + 1
+        Script.var_warning(var, @line, offset, @options[:filename])
       end
-      raise SyntaxError.new("Invalid variable \"#{var}\".", @line) unless var =~ Script::VALIDATE
 
       parsed_from = parse_script(from_expr, :offset => line.offset + line.text.index(from_expr))
       parsed_to = parse_script(to_expr, :offset => line.offset + line.text.index(to_expr))
-      Tree::ForNode.new(var[1..-1], parsed_from, parsed_to, to_name == 'to')
+      Tree::ForNode.new(var, parsed_from, parsed_to, to_name == 'to')
     end
 
     def parse_else(parent, line, text)
-      previous = parent.last
+      previous = parent.children.last
       raise SyntaxError.new("@else must come after @if.") unless previous.is_a?(Tree::IfNode)
 
       if text
         if text !~ /^if\s+(.+)/
-          raise SyntaxError.new("Invalid else directive '@else #{text}': expected 'if <expr>'.", @line)
+          raise SyntaxError.new("Invalid else directive '@else #{text}': expected 'if <expr>'.")
         end
         expr = parse_script($1, :offset => line.offset + line.text.index($1))
       end
@@ -486,30 +531,81 @@ LONG
       nil
     end
 
+    # @private
+    MIXIN_DEF_RE = /^(?:=|@mixin)\s*(#{Sass::SCSS::RX::IDENT})(.*)$/
     def parse_mixin_definition(line)
-      name, arg_string = line.text.scan(/^=\s*([^(]+)(.*)$/).first
-      raise SyntaxError.new("Invalid mixin \"#{line.text[1..-1]}\".", @line) if name.nil?
+      name, arg_string = line.text.scan(MIXIN_DEF_RE).first
+      raise SyntaxError.new("Invalid mixin \"#{line.text[1..-1]}\".") if name.nil?
 
       offset = line.offset + line.text.size - arg_string.size
-      args = Script::Parser.new(arg_string.strip, @line, offset).parse_mixin_definition_arglist
+      args = Script::Parser.new(arg_string.strip, @line, offset, @options).
+        parse_mixin_definition_arglist
       default_arg_found = false
       Tree::MixinDefNode.new(name, args)
     end
 
+    # @private
+    MIXIN_INCLUDE_RE = /^(?:\+|@include)\s*(#{Sass::SCSS::RX::IDENT})(.*)$/
     def parse_mixin_include(line, root)
-      name, arg_string = line.text.scan(/^\+\s*([^(]+)(.*)$/).first
-      raise SyntaxError.new("Invalid mixin include \"#{line.text}\".", @line) if name.nil?
+      name, arg_string = line.text.scan(MIXIN_INCLUDE_RE).first
+      raise SyntaxError.new("Invalid mixin include \"#{line.text}\".") if name.nil?
 
       offset = line.offset + line.text.size - arg_string.size
-      args = Script::Parser.new(arg_string.strip, @line, offset).parse_mixin_include_arglist
-      raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath mixin directives.", @line + 1) unless line.children.empty?
+      args = Script::Parser.new(arg_string.strip, @line, offset, @options).
+        parse_mixin_include_arglist
+      raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath mixin directives.",
+        :line => @line + 1) unless line.children.empty?
       Tree::MixinNode.new(name, args)
     end
 
     def parse_script(script, options = {})
       line = options[:line] || @line
       offset = options[:offset] || 0
-      Script.parse(script, line, offset, @options[:filename])
+      Script.parse(script, line, offset, @options)
+    end
+
+    def format_comment_text(text, silent)
+      content = text.split("\n")
+
+      if content.first && content.first.strip.empty?
+        removed_first = true
+        content.shift
+      end
+
+      return silent ? "//" : "/* */" if content.empty?
+      content.map! {|l| (l.empty? ? "" : " ") + l}
+      content.first.gsub!(/^ /, '') unless removed_first
+      content.last.gsub!(%r{ ?\*/ *$}, '')
+      if silent
+        "//" + content.join("\n//")
+      else
+        "/*" + content.join("\n *") + " */"
+      end
+    end
+
+    def parse_interp(text)
+      self.class.parse_interp(text, @line, :filename => @filename)
+    end
+
+    # It's important that this have strings (at least)
+    # at the beginning, the end, and between each Script::Node.
+    #
+    # @private
+    def self.parse_interp(text, line, options)
+      res = []
+      rest = Haml::Shared.handle_interpolation text do |scan|
+        escapes = scan[2].size
+        res << scan.matched[0...-2 - escapes]
+        if escapes % 2 == 1
+          res << "\\" * (escapes - 1) << '#{'
+        else
+          res << "\\" * [0, escapes - 1].max
+          res << Script::Parser.new(
+            scan, line, scan.pos - scan.matched_size, options).
+            parse_interpolated
+        end
+      end
+      res << rest
     end
   end
 end