From beb9ba7215932363f87ae4f296d4723e3309eda4 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Sun, 5 Apr 2009 00:44:13 -0700
Subject: [PATCH 01/24] [Haml] Disable the powerset test when set equality is
 broken (Fixed in Ruby 1.8.7+)

---
 test/haml/util_test.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/haml/util_test.rb b/test/haml/util_test.rb
index 710cb62c..834f8482 100644
--- a/test/haml/util_test.rb
+++ b/test/haml/util_test.rb
@@ -37,6 +37,7 @@ class UtilTest < Test::Unit::TestCase
   end
 
   def test_powerset
+    return unless Set[Set[]] == Set[Set[]] # There's a bug in Ruby 1.8.6 that breaks nested set equality
     assert_equal([[].to_set].to_set,
       powerset([]))
     assert_equal([[].to_set, [1].to_set].to_set,

From 0c7f7b6d4e0fddd2c5018390fabaa42a61a29a5a Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Sun, 5 Apr 2009 00:13:08 -0700
Subject: [PATCH 02/24] [Sass] Provide access to the Sass::Engine options from
 the Sass::Environment and during Sass function evaluation. This enables some
 cleverness to occur during compilation.

---
 lib/sass/engine.rb           |  2 +-
 lib/sass/environment.rb      |  7 ++++++-
 lib/sass/script/funcall.rb   | 14 +++++++++++++-
 lib/sass/script/functions.rb |  3 +++
 test/sass/functions_test.rb  |  2 +-
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/lib/sass/engine.rb b/lib/sass/engine.rb
index 973507e5..acf0cda6 100644
--- a/lib/sass/engine.rb
+++ b/lib/sass/engine.rb
@@ -94,7 +94,7 @@ module Sass
         :load_paths => ['.']
       }.merge! options
       @template = template
-      @environment = Environment.new
+      @environment = Environment.new(nil, @options)
       @environment.set_var("important", Script::String.new("!important"))
     end
 
diff --git a/lib/sass/environment.rb b/lib/sass/environment.rb
index 6e46711e..1089445b 100644
--- a/lib/sass/environment.rb
+++ b/lib/sass/environment.rb
@@ -2,10 +2,15 @@ module Sass
   class Environment
     attr_reader :parent
 
-    def initialize(parent = nil)
+    def initialize(parent = nil, options = nil)
       @vars = {}
       @mixins = {}
       @parent = parent
+      @options = options
+    end
+
+    def options
+      @options || (parent && parent.options) || {}
     end
 
     def self.inherited_hash(name)
diff --git a/lib/sass/script/funcall.rb b/lib/sass/script/funcall.rb
index dbb13c0c..169fab16 100644
--- a/lib/sass/script/funcall.rb
+++ b/lib/sass/script/funcall.rb
@@ -1,6 +1,18 @@
+require File.join(File.dirname(__FILE__), 'functions')
 module Sass
   module Script
     class Funcall # :nodoc:
+      class EvaluationContext # :nodoc:
+
+        include Sass::Script::Functions
+
+        attr_reader :options
+
+        def initialize(options)
+          @options = options
+        end
+      end
+
       attr_reader :name, :args
 
       def initialize(name, args)
@@ -18,7 +30,7 @@ module Sass
           return Script::String.new("#{name}(#{args.map {|a| a.perform(environment)}.join(', ')})")
         end
 
-        return Functions.send(name, *args)
+        return EvaluationContext.new(environment.options).send(name, *args)
       rescue ArgumentError => e
         raise e unless e.backtrace.first =~ /:in `(#{name}|perform)'$/
         raise Sass::SyntaxError.new("#{e.message} for `#{name}'")
diff --git a/lib/sass/script/functions.rb b/lib/sass/script/functions.rb
index 4af6fa6c..0928ac00 100644
--- a/lib/sass/script/functions.rb
+++ b/lib/sass/script/functions.rb
@@ -19,6 +19,9 @@ module Sass::Script
   # and then left as static CSS files.
   # Any dynamic CSS should be left in <style> tags in the HTML.
   #
+  # Within a sass function you can call the options method to gain access to the
+  # options hash that was used to create the Sass::Engine that is processing the function call.
+  #
   # The following functions are provided:
   # * +hsl+ - converts an <tt>hsl(hue, saturation, lightness)</tt> triplet into a color.
   #
diff --git a/test/sass/functions_test.rb b/test/sass/functions_test.rb
index 532a9c47..9f1283b1 100644
--- a/test/sass/functions_test.rb
+++ b/test/sass/functions_test.rb
@@ -96,7 +96,7 @@ class SassFunctionTest < Test::Unit::TestCase
   end
 
   def evaluate(value)
-    Sass::Script::Parser.parse(value, 0, 0).perform({}).to_s
+    Sass::Script::Parser.parse(value, 0, 0).perform(Sass::Environment.new).to_s
   end
 
   def assert_error_message(message, value)

From a03307d59387be694d5cd036143b17f5e9c2cbe9 Mon Sep 17 00:00:00 2001
From: "S. Brent Faulkner" <brentf@unwwwired.net>
Date: Mon, 6 Apr 2009 15:16:57 -0400
Subject: [PATCH 03/24] [Sass] Fix line numbering for errors.

---
 lib/sass/engine.rb       |  5 +++--
 test/sass/engine_test.rb | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/lib/sass/engine.rb b/lib/sass/engine.rb
index acf0cda6..51370178 100644
--- a/lib/sass/engine.rb
+++ b/lib/sass/engine.rb
@@ -130,6 +130,7 @@ module Sass
     def tabulate(string)
       tab_str = nil
       first = true
+      index_offset = (@options[:line] || 1) - 1
       enum_with_index(string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^.*?$/)).map do |line, index|
         index += 1
         next if line.strip.empty?
@@ -144,14 +145,14 @@ module Sass
           end
         end
         first &&= !tab_str.nil?
-        next Line.new(line.strip, 0, index, 0, @options[:filename], []) if tab_str.nil?
+        next Line.new(line.strip, 0, index + index_offset, 0, @options[:filename], []) if tab_str.nil?
 
         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
 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
-        Line.new(line.strip, line_tabs, index, tab_str.size, @options[:filename], [])
+        Line.new(line.strip, line_tabs, index + index_offset, tab_str.size, @options[:filename], [])
       end.compact
     end
 
diff --git a/test/sass/engine_test.rb b/test/sass/engine_test.rb
index 81037739..6dab2ecf 100755
--- a/test/sass/engine_test.rb
+++ b/test/sass/engine_test.rb
@@ -145,6 +145,24 @@ SASS
     end
   end
 
+  def test_exception_location
+    to_render = <<SASS
+rule
+  :attr val
+  // comment!
+
+  :broken
+SASS
+    begin
+      Sass::Engine.new(to_render, :filename => __FILE__, :line => (__LINE__-7)).render
+    rescue Sass::SyntaxError => err
+      assert_equal(__FILE__, err.sass_filename)
+      assert_equal((__LINE__-6), err.sass_line)
+    else
+      assert(false, "Exception not raised for '#{to_render}'!")
+    end
+  end
+
   def test_imported_exception
     [nil, 2].each do |i|
       begin

From 9efbd41d494d122482ef9189b0a124b91aadc20d Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Mon, 6 Apr 2009 15:45:39 -0700
Subject: [PATCH 04/24] [Sass] Add a failing test for an @import failing case
 we missed.

---
 test/sass/engine_test.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/sass/engine_test.rb b/test/sass/engine_test.rb
index a73103c8..61825bae 100755
--- a/test/sass/engine_test.rb
+++ b/test/sass/engine_test.rb
@@ -51,6 +51,7 @@ END
     "@import foo.sass" => "File to import not found or unreadable: foo.sass.",
     "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
     "foo\n  @import templates/basic" => "Import directives may only be used at the root of a document.",
+    "foo\n  @import #{File.dirname(__FILE__)}/templates/basic" => "Import directives may only be used at the root of a document.",
     "!foo = bar baz !" => "Unterminated constant.",
     "!foo = !(foo)" => "Invalid constant.",
     "=foo\n  :color red\n.bar\n  +bang" => "Undefined mixin 'bang'.",

From d931e6b046b8b1d3fc7def6909eaac775a74f002 Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Mon, 6 Apr 2009 15:59:45 -0700
Subject: [PATCH 05/24] [Sass] Really raise an error for @imports at the root.

---
 lib/sass/engine.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/sass/engine.rb b/lib/sass/engine.rb
index 6b8daadb..859fb252 100644
--- a/lib/sass/engine.rb
+++ b/lib/sass/engine.rb
@@ -113,7 +113,7 @@ module Sass
       index = 0
       while @lines[index]
         old_index = index
-        child, index = build_tree(index)
+        child, index = build_tree(index, true)
 
         if child.is_a? Tree::Node
           child.line = old_index + 1
@@ -194,7 +194,8 @@ END
       spaces / 2
     end
 
-    def build_tree(index)
+    def build_tree(index, root = false)
+      @root = root
       line, tabs = @lines[index]
       index += 1
       @line = index
@@ -265,12 +266,7 @@ END
       when :mixin
         raise SyntaxError.new("Mixins may only be defined at the root of a document.", @line)
       when Array
-        child.each do |c|
-          if c.is_a?(Tree::DirectiveNode)
-            raise SyntaxError.new("Import directives may only be used at the root of a document.", @line)
-          end
-          parent << c
-        end
+        child.each {|c| parent << c}
       when Tree::Node
         parent << child
       end
@@ -406,6 +402,10 @@ END
     end
 
     def import(files)
+      unless @root
+        raise SyntaxError.new("Import directives may only be used at the root of a document.", @line)
+      end
+
       nodes = []
 
       files.split(/,\s*/).each do |filename|

From 41848a38fab07efa88448e4d597fcd1cb93548e8 Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Mon, 6 Apr 2009 16:08:31 -0700
Subject: [PATCH 06/24] [Sass] Fix @import issue in master.

---
 lib/sass/engine.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sass/engine.rb b/lib/sass/engine.rb
index acf0cda6..8fabeef2 100644
--- a/lib/sass/engine.rb
+++ b/lib/sass/engine.rb
@@ -229,7 +229,7 @@ END
         case child
         when Tree::MixinDefNode
           raise SyntaxError.new("Mixins may only be defined at the root of a document.", line.index)
-        when Tree::DirectiveNode
+        when Tree::DirectiveNode, Tree::FileNode
           raise SyntaxError.new("Import directives may only be used at the root of a document.", line.index)
         end
       end

From d4022e8009a53618cb1b5a3352f50624408f2246 Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Mon, 6 Apr 2009 16:24:47 -0700
Subject: [PATCH 07/24] [Sass] Fix line-number reporting with :line option.

---
 lib/sass/engine.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/sass/engine.rb b/lib/sass/engine.rb
index 5bcf1b81..cb7754db 100644
--- a/lib/sass/engine.rb
+++ b/lib/sass/engine.rb
@@ -130,9 +130,8 @@ module Sass
     def tabulate(string)
       tab_str = nil
       first = true
-      index_offset = (@options[:line] || 1) - 1
       enum_with_index(string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^.*?$/)).map do |line, index|
-        index += 1
+        index += (@options[:line] || 1)
         next if line.strip.empty?
 
         line_tab_str = line[/^\s*/]
@@ -145,14 +144,14 @@ module Sass
           end
         end
         first &&= !tab_str.nil?
-        next Line.new(line.strip, 0, index + index_offset, 0, @options[:filename], []) if tab_str.nil?
+        next Line.new(line.strip, 0, index, 0, @options[:filename], []) if tab_str.nil?
 
         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
 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
-        Line.new(line.strip, line_tabs, index + index_offset, tab_str.size, @options[:filename], [])
+        Line.new(line.strip, line_tabs, index, tab_str.size, @options[:filename], [])
       end.compact
     end
 

From 709e4d41fff8bf686d4e44b3d8ce3529abc79a66 Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Mon, 6 Apr 2009 16:35:09 -0700
Subject: [PATCH 08/24] [Sass] Test for :line-setting.

---
 test/sass/engine_test.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/sass/engine_test.rb b/test/sass/engine_test.rb
index b8e2f02c..7931e807 100755
--- a/test/sass/engine_test.rb
+++ b/test/sass/engine_test.rb
@@ -115,14 +115,16 @@ class SassEngineTest < Test::Unit::TestCase
   
   def test_exceptions
     EXCEPTION_MAP.each do |key, value|
+      line = 10
       begin
-        Sass::Engine.new(key).render
+        Sass::Engine.new(key, :filename => __FILE__, :line => line).render
       rescue Sass::SyntaxError => err
         value = [value] unless value.is_a?(Array)
 
         assert_equal(value.first, err.message, "Line: #{key}")
-        assert_equal(value[1] || key.split("\n").length, err.sass_line, "Line: #{key}")
-        assert_match(/\(sass\):[0-9]+/, err.backtrace[0], "Line: #{key}")
+        assert_equal(__FILE__, err.sass_filename)
+        assert_equal((value[1] || key.split("\n").length) + line - 1, err.sass_line, "Line: #{key}")
+        assert_match(/#{Regexp.escape(__FILE__)}:[0-9]+/, err.backtrace[0], "Line: #{key}")
       else
         assert(false, "Exception not raised for\n#{key}")
       end

From 7ce2bd209f30a35388c4314d8da9c3da441dff7b Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Tue, 7 Apr 2009 08:35:55 -0700
Subject: [PATCH 09/24] [Haml] Fix a small but significant discrepancy between
 the Haml and ERB test files.

---
 test/haml/rhtml/standard.rhtml    | 2 +-
 test/haml/templates/standard.haml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/haml/rhtml/standard.rhtml b/test/haml/rhtml/standard.rhtml
index 7cedf160..63dd671d 100644
--- a/test/haml/rhtml/standard.rhtml
+++ b/test/haml/rhtml/standard.rhtml
@@ -38,7 +38,7 @@
     </div>
     <ul class='really cool'>
       <% ('a'..'f').each do |a|%>
-      <li><%= a %>
+      <li><%= a %></li>
       <% end %>
     <div class='of_divs_with_underscore' id='combo'><%= @should_eval = "with this text" %></div>
     <%= "foo".each_line do |line|
diff --git a/test/haml/templates/standard.haml b/test/haml/templates/standard.haml
index f427b77a..fe7d0e2f 100644
--- a/test/haml/templates/standard.haml
+++ b/test/haml/templates/standard.haml
@@ -1,5 +1,5 @@
 !!!
-%html{html_attrs}
+%html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en-US"}
   %head
     %title Hampton Catlin Is Totally Awesome
     %meta{"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8"}
@@ -12,7 +12,7 @@
       = 1 + 9 + 8 + 2 #numbers should work and this should be ignored
     #body= " Quotes should be loved! Just like people!"
     - 120.times do |number|
-      - number
+      = number
     Wow.|
     %p
       = "Holy cow        " + |

From 94e94cec8e56dc5506eb07466a26ce673d00d190 Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Tue, 7 Apr 2009 11:46:30 -0700
Subject: [PATCH 10/24] [Haml] Update standard test docs.

---
 test/haml/results/standard.xhtml  | 120 ++++++++++++++++++++++++++++++
 test/haml/rhtml/standard.rhtml    |   2 +-
 test/haml/templates/standard.haml |   2 +-
 3 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/test/haml/results/standard.xhtml b/test/haml/results/standard.xhtml
index d90feb4e..849bdc6e 100644
--- a/test/haml/results/standard.xhtml
+++ b/test/haml/results/standard.xhtml
@@ -13,6 +13,126 @@
       20
     </div>
     <div id='body'> Quotes should be loved! Just like people!</div>
+    0
+    1
+    2
+    3
+    4
+    5
+    6
+    7
+    8
+    9
+    10
+    11
+    12
+    13
+    14
+    15
+    16
+    17
+    18
+    19
+    20
+    21
+    22
+    23
+    24
+    25
+    26
+    27
+    28
+    29
+    30
+    31
+    32
+    33
+    34
+    35
+    36
+    37
+    38
+    39
+    40
+    41
+    42
+    43
+    44
+    45
+    46
+    47
+    48
+    49
+    50
+    51
+    52
+    53
+    54
+    55
+    56
+    57
+    58
+    59
+    60
+    61
+    62
+    63
+    64
+    65
+    66
+    67
+    68
+    69
+    70
+    71
+    72
+    73
+    74
+    75
+    76
+    77
+    78
+    79
+    80
+    81
+    82
+    83
+    84
+    85
+    86
+    87
+    88
+    89
+    90
+    91
+    92
+    93
+    94
+    95
+    96
+    97
+    98
+    99
+    100
+    101
+    102
+    103
+    104
+    105
+    106
+    107
+    108
+    109
+    110
+    111
+    112
+    113
+    114
+    115
+    116
+    117
+    118
+    119
     Wow.|
     <p>
       Holy cow        multiline       tags!           A pipe (|) even!
diff --git a/test/haml/rhtml/standard.rhtml b/test/haml/rhtml/standard.rhtml
index 63dd671d..8f5d0972 100644
--- a/test/haml/rhtml/standard.rhtml
+++ b/test/haml/rhtml/standard.rhtml
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en-US'>
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en-US' lang='en-US'>
   <head>
     <title>Hampton Catlin Is Totally Awesome</title>
     <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
diff --git a/test/haml/templates/standard.haml b/test/haml/templates/standard.haml
index fe7d0e2f..0126ac79 100644
--- a/test/haml/templates/standard.haml
+++ b/test/haml/templates/standard.haml
@@ -1,5 +1,5 @@
 !!!
-%html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en-US"}
+%html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en-US", "lang" => "en-US"}
   %head
     %title Hampton Catlin Is Totally Awesome
     %meta{"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8"}

From 7b9d6303bd49b0e762eefc11a72f3fc8cf79a6bf Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Tue, 7 Apr 2009 15:53:05 -0700
Subject: [PATCH 11/24] [Sass] Don't add stuff to a persistent :load_paths
 option.

---
 lib/sass/engine.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sass/engine.rb b/lib/sass/engine.rb
index cb7754db..6c384a1b 100644
--- a/lib/sass/engine.rb
+++ b/lib/sass/engine.rb
@@ -430,7 +430,7 @@ END
     end
 
     def import_paths
-      paths = @options[:load_paths] || []
+      paths = (@options[:load_paths] || []).dup
       paths.unshift(File.dirname(@options[:filename])) if @options[:filename]
       paths
     end

From 30a183601e5efaf9a2224708c52ef46e4723fe42 Mon Sep 17 00:00:00 2001
From: kematzy <kematzy@gmail.com>
Date: Tue, 7 Apr 2009 14:21:13 +0800
Subject: [PATCH 12/24] Minor code fixes to remove un-necessary Ruby warnings
 when running scripts with 'ruby -wKU'. -- warning: `*' interpreted as
 argument prefix -- warning: StringScanner#matchedsize is obsolete; use
 #matched_size instead -- warning: instance variable @else not initialized

There's still an issue of warnings output on eval(), but can't work out where that comes from.
  (eval):25: warning: statement not reached
  (eval):28: warning: statement not reached

Nothing major I know, but it's always a start.
---
 lib/haml/helpers.rb      | 2 +-
 lib/sass/script/lexer.rb | 2 +-
 lib/sass/tree/node.rb    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/haml/helpers.rb b/lib/haml/helpers.rb
index 49ca1a84..7af15c16 100644
--- a/lib/haml/helpers.rb
+++ b/lib/haml/helpers.rb
@@ -281,7 +281,7 @@ DEPRECATION WARNING:
 The Haml #puts helper is deprecated and will be removed in version 2.4.
 Use the #haml_concat helper instead.
 END
-      haml_concat *args
+      haml_concat(*args)
     end
 
     # Outputs text directly to the Haml buffer, with the proper tabulation
diff --git a/lib/sass/script/lexer.rb b/lib/sass/script/lexer.rb
index 0325ef27..86e8febb 100644
--- a/lib/sass/script/lexer.rb
+++ b/lib/sass/script/lexer.rb
@@ -141,7 +141,7 @@ module Sass
       end
 
       def last_match_position
-        current_position - @scanner.matchedsize
+        current_position - @scanner.matched_size
       end
 
       def after_interpolation?
diff --git a/lib/sass/tree/node.rb b/lib/sass/tree/node.rb
index ee669966..d418dee3 100644
--- a/lib/sass/tree/node.rb
+++ b/lib/sass/tree/node.rb
@@ -73,7 +73,7 @@ module Sass
             res << "\\" * (escapes - 1) << '#{'
           else
             res << "\\" * [0, escapes - 1].max
-            res << Script::Parser.new(scan, line, scan.pos - scan.matchedsize, filename).
+            res << Script::Parser.new(scan, line, scan.pos - scan.matched_size, filename).
               parse_interpolated.perform(environment).to_s
           end
         end

From 12a53b0eea65c9de88918b6aeff00fb0e46e4216 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Tue, 14 Apr 2009 02:13:24 -0700
Subject: [PATCH 13/24] [Sass] Performance enhancement: A new environment is
 not needed for every iteration of the for node.

---
 lib/sass/tree/for_node.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sass/tree/for_node.rb b/lib/sass/tree/for_node.rb
index 09dd1df2..6053b431 100644
--- a/lib/sass/tree/for_node.rb
+++ b/lib/sass/tree/for_node.rb
@@ -18,8 +18,8 @@ module Sass::Tree
       range = Range.new(from, to, @exclusive)
 
       children = []
+      environment = Sass::Environment.new(environment)
       range.each do |i|
-        environment = Sass::Environment.new(environment)
         environment.set_local_var(@var, Sass::Script::Number.new(i))
         children += perform_children(environment)
       end

From 83e6fcf435038e560bca7272ad46bb2426c87323 Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Tue, 14 Apr 2009 13:24:30 -0700
Subject: [PATCH 14/24] [Sass] Also don't need a new environment for each while
 iteration.

---
 lib/sass/tree/while_node.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/sass/tree/while_node.rb b/lib/sass/tree/while_node.rb
index a43af4a7..b9d07586 100644
--- a/lib/sass/tree/while_node.rb
+++ b/lib/sass/tree/while_node.rb
@@ -11,8 +11,9 @@ module Sass::Tree
 
     def _perform(environment)
       children = []
+      new_environment = Sass::Environment.new(environment)
       while @expr.perform(environment).to_bool
-        children += perform_children(Sass::Environment.new(environment))
+        children += perform_children(new_environment)
       end
       children
     end

From fe1dbe7bad9b553dc36a2a8701ab3a9ce783212b Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Wed, 15 Apr 2009 12:44:11 -0700
Subject: [PATCH 15/24] [Haml] Raise an error when the result of haml_tag is
 used in a template.

---
 lib/haml/helpers.rb      | 34 +++++++++++++++++++++++++++-------
 test/haml/helper_test.rb |  4 ++++
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/lib/haml/helpers.rb b/lib/haml/helpers.rb
index 49ca1a84..840f3ffc 100644
--- a/lib/haml/helpers.rb
+++ b/lib/haml/helpers.rb
@@ -7,6 +7,23 @@ module Haml
   # that a Haml template is parsed in, so all these methods are at your
   # disposal from within the template.
   module Helpers
+    # An object that raises an error when #to_s is called.
+    # It's used to raise an error when the return value of a helper is used
+    # when it shouldn't be.
+    class ErrorReturn
+      def initialize(message)
+        @message = message
+      end
+
+      def to_s
+        raise Haml::Error.new(@message)
+      end
+
+      def inspect
+        "Haml::Helpers::ErrorReturn(#{@message.inspect})"
+      end
+    end
+
     self.extend self
 
     @@action_view_defined = defined?(ActionView)
@@ -342,6 +359,11 @@ END
     #   </table>
     #
     def haml_tag(name, *rest, &block)
+      ret = ErrorReturn.new(<<MESSAGE)
+haml_tag outputs directly to the Haml template.
+Disregard its return value and use the - operator.
+MESSAGE
+
       name = name.to_s
       text = rest.shift.to_s unless [Symbol, Hash, NilClass].any? {|t| rest.first.is_a? t}
       flags = []
@@ -352,7 +374,7 @@ END
 
       if text.nil? && block.nil? && (haml_buffer.options[:autoclose].include?(name) || flags.include?(:/))
         haml_concat "<#{name}#{attributes} />"
-        return nil
+        return ret
       end
 
       if flags.include?(:/)
@@ -364,7 +386,7 @@ END
       if block.nil?
         tag << text.to_s << "</#{name}>"
         haml_concat tag
-        return
+        return ret
       end
 
       if text
@@ -374,7 +396,7 @@ END
       if flags.include?(:<)
         tag << capture_haml(&block).strip << "</#{name}>"
         haml_concat tag
-        return
+        return ret
       end
 
       haml_concat tag
@@ -382,10 +404,8 @@ END
       block.call
       tab_down
       haml_concat "</#{name}>"
-      <<MESSAGE
-<h1><code>haml_tag</code> outputs directly to the Haml template.
-Disregard its return value and use the <code>-</code> operator.</h1>
-MESSAGE
+
+      ret
     end
 
     # Characters that need to be escaped to HTML entities from user input
diff --git a/test/haml/helper_test.rb b/test/haml/helper_test.rb
index 3c125fe6..093d6ecd 100644
--- a/test/haml/helper_test.rb
+++ b/test/haml/helper_test.rb
@@ -141,6 +141,10 @@ HAML
     assert_raise(Haml::Error) { render("- haml_tag :p, :/ do\n  foo") }
   end
 
+  def test_haml_tag_error_return
+    assert_raise(Haml::Error) { render("= haml_tag :p") }
+  end
+
   def test_is_haml
     assert(!ActionView::Base.new.is_haml?)
     assert_equal("true\n", render("= is_haml?"))

From 545f7ee4b8051096dca44f8265e8beb3cbe7afd1 Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Wed, 15 Apr 2009 16:46:30 -0700
Subject: [PATCH 16/24] [Sass] Require pathname where it's used.

---
 lib/sass/plugin.rb         | 1 -
 lib/sass/tree/rule_node.rb | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/sass/plugin.rb b/lib/sass/plugin.rb
index 24eafff0..b3432f26 100644
--- a/lib/sass/plugin.rb
+++ b/lib/sass/plugin.rb
@@ -1,5 +1,4 @@
 require 'sass/engine'
-require 'pathname'
 
 module Sass
   # This module contains methods to aid in using Sass
diff --git a/lib/sass/tree/rule_node.rb b/lib/sass/tree/rule_node.rb
index 25af8da4..0de69eaf 100644
--- a/lib/sass/tree/rule_node.rb
+++ b/lib/sass/tree/rule_node.rb
@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Sass::Tree
   class RuleNode < Node
     # The character used to include the parent selector

From ed64a7b0c2d30aa365a1a871ac6b7e70130a184a Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Thu, 16 Apr 2009 01:24:10 -0700
Subject: [PATCH 17/24] Add to TODO.

---
 TODO | 1 +
 1 file changed, 1 insertion(+)

diff --git a/TODO b/TODO
index 4c4b7dca..3ccfdd45 100644
--- a/TODO
+++ b/TODO
@@ -23,6 +23,7 @@
 ** Sass
    CSS Terminology? (https://mail.google.com/mail/#label/Haml/1202d75234b3ce6b)
    Sass::Engine load_paths option should be set by executable
+   Figure out sassc stuff
 
    [2.4] Allow semicolons for multiple props on one line
    [2.4] Pull in Compass watcher stuff

From cf470dd911eeb56bbfeff149943dcbda113a2d9e Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Fri, 17 Apr 2009 02:08:12 -0700
Subject: [PATCH 18/24] [Haml] Change a few double-equals tests to
 universal-interpolation tests.

---
 test/haml/engine_test.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/haml/engine_test.rb b/test/haml/engine_test.rb
index cf956ebd..8669b2be 100644
--- a/test/haml/engine_test.rb
+++ b/test/haml/engine_test.rb
@@ -129,14 +129,14 @@ class EngineTest < Test::Unit::TestCase
     assert_equal("<strong>Hi there!</strong>\n", engine.to_html)
   end
 
-  def test_double_equals
-    assert_equal("<p>Hello World</p>\n", render('%p== Hello #{who}', :locals => {:who => 'World'}))
-    assert_equal("<p>\n  Hello World\n</p>\n", render("%p\n  == Hello \#{who}", :locals => {:who => 'World'}))
+  def test_interpolation
+    assert_equal("<p>Hello World</p>\n", render('%p Hello #{who}', :locals => {:who => 'World'}))
+    assert_equal("<p>\n  Hello World\n</p>\n", render("%p\n  Hello \#{who}", :locals => {:who => 'World'}))
   end
 
-  def test_double_equals_in_the_middle_of_a_string
+  def test_interpolation_in_the_middle_of_a_string
     assert_equal("\"title 'Title'. \"\n",
-                 render("== \"title '\#{\"Title\"}'. \""))
+                 render("\"title '\#{\"Title\"}'. \""))
   end
 
   def test_nil_tag_value_should_render_as_empty

From 9aaf2f39e03fa1cc3f5cac212e66b210a0b595a0 Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Fri, 17 Apr 2009 02:14:38 -0700
Subject: [PATCH 19/24] [Haml] Interpret #{} at the beginning of a line as
 interpolation.

Closes gh-1
---
 lib/haml/precompiler.rb  | 5 ++++-
 test/haml/engine_test.rb | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/haml/precompiler.rb b/lib/haml/precompiler.rb
index 9c5b7a79..10243657 100644
--- a/lib/haml/precompiler.rb
+++ b/lib/haml/precompiler.rb
@@ -195,7 +195,10 @@ END
       @index = index + 1
 
       case text[0]
-      when DIV_CLASS, DIV_ID; render_div(text)
+      when DIV_CLASS; render_div(text)
+      when DIV_ID
+        return push_plain(text) if text[1] == ?{
+        render_div(text)
       when ELEMENT; render_tag(text)
       when COMMENT; render_comment(text[1..-1].strip)
       when SANITIZE
diff --git a/test/haml/engine_test.rb b/test/haml/engine_test.rb
index 8669b2be..10e84b66 100644
--- a/test/haml/engine_test.rb
+++ b/test/haml/engine_test.rb
@@ -139,6 +139,11 @@ class EngineTest < Test::Unit::TestCase
                  render("\"title '\#{\"Title\"}'. \""))
   end
 
+  def test_interpolation_at_the_beginning_of_a_line
+    assert_equal("<p>2</p>\n", render('%p #{1 + 1}'))
+    assert_equal("<p>\n  2\n</p>\n", render("%p\n  \#{1 + 1}"))
+  end
+
   def test_nil_tag_value_should_render_as_empty
     assert_equal("<p></p>\n", render("%p= nil"))
   end

From 5b60dafa1f2db872b90dd859c7635a056d8bf52b Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Tue, 21 Apr 2009 14:12:43 -0700
Subject: [PATCH 20/24] [Sass] Print error messages in test templates.

---
 test/sass/plugin_test.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/sass/plugin_test.rb b/test/sass/plugin_test.rb
index 2f7a1256..b69c83bf 100644
--- a/test/sass/plugin_test.rb
+++ b/test/sass/plugin_test.rb
@@ -139,6 +139,11 @@ class SassPluginTest < Test::Unit::TestCase
     tempfile_name = arguments.shift || result_name
     expected_lines = File.read(result_loc(result_name, prefix)).split("\n")
     actual_lines = File.read(tempfile_loc(tempfile_name, prefix)).split("\n")
+
+    if actual_lines.first == "/*" && expected_lines.first != "/*"
+      assert(false, actual_lines[0..actual_lines.enum_with_index.find {|l, i| l == "*/"}.last].join("\n"))
+    end
+
     expected_lines.zip(actual_lines).each_with_index do |pair, line|
       message = "template: #{result_name}\nline:     #{line + 1}"
       assert_equal(pair.first, pair.last, message)

From 7894c37aa934f286ccb970902f1d62f3ecfa77b6 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Wed, 22 Apr 2009 12:41:08 -0700
Subject: [PATCH 21/24] [Sass] Expose a slightly lower level method to check if
 a stylesheet needs updating for use in Compass.

---
 lib/sass/plugin.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/sass/plugin.rb b/lib/sass/plugin.rb
index b3432f26..2fbd1b6e 100644
--- a/lib/sass/plugin.rb
+++ b/lib/sass/plugin.rb
@@ -171,6 +171,10 @@ END
       def stylesheet_needs_update?(name, template_path, css_path)
         css_file = css_filename(name, css_path)
         template_file = template_filename(name, template_path)
+        exact_stylesheet_needs_update?(css_file, template_file)
+      end
+
+      def exact_stylesheet_needs_update?(css_file, template_file)
         if !File.exists?(css_file)
           return true
         else

From 016df4b6b2635fb7f3dba6ff6d0672a6a235ab91 Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Wed, 22 Apr 2009 13:45:26 -0700
Subject: [PATCH 22/24] Use 'extend self' for all-class-method modules.

---
 lib/haml/template.rb |  17 +--
 lib/haml/util.rb     |   2 +-
 lib/sass/plugin.rb   | 306 +++++++++++++++++++++----------------------
 3 files changed, 157 insertions(+), 168 deletions(-)

diff --git a/lib/haml/template.rb b/lib/haml/template.rb
index e8e71c4b..d12b38f4 100644
--- a/lib/haml/template.rb
+++ b/lib/haml/template.rb
@@ -1,20 +1,11 @@
 require 'haml/engine'
 
 module Haml
-  class Template
-    class << self
-      @@options = {}
+  module Template
+    extend self
 
-      # Gets various options for Haml. See README.rdoc for details.
-      def options
-        @@options
-      end
-
-      # Sets various options for Haml. See README.rdoc for details.
-      def options=(value)
-        @@options = value
-      end
-    end
+    @options = {}
+    attr_accessor :options
   end
 end
 
diff --git a/lib/haml/util.rb b/lib/haml/util.rb
index dcf24a98..7b37db8f 100644
--- a/lib/haml/util.rb
+++ b/lib/haml/util.rb
@@ -4,7 +4,7 @@ require 'enumerator'
 
 module Haml
   module Util
-    class << self; include Haml::Util; end
+    extend self
 
     RUBY_VERSION = ::RUBY_VERSION.split(".").map {|s| s.to_i}
 
diff --git a/lib/sass/plugin.rb b/lib/sass/plugin.rb
index 2fbd1b6e..7951e62d 100644
--- a/lib/sass/plugin.rb
+++ b/lib/sass/plugin.rb
@@ -5,141 +5,142 @@ module Sass
   # as a stylesheet-rendering plugin for various systems.
   # Currently Rails/ActionController and Merb are supported out of the box.
   module Plugin
-    class << self
-      @@options = {
-        :css_location       => './public/stylesheets',
-        :always_update      => false,
-        :always_check       => true,
-        :full_exception     => true
-      }
-      @@checked_for_updates = false
+    extend self
 
-      # Whether or not Sass has *ever* checked if the stylesheets need updates
-      # (in this Ruby instance).
-      def checked_for_updates
-        @@checked_for_updates
-      end
+    @options = {
+      :css_location       => './public/stylesheets',
+      :always_update      => false,
+      :always_check       => true,
+      :full_exception     => true
+    }
+    @checked_for_updates = false
 
-      # Gets various options for Sass. See README.rdoc for details.
-      #--
-      # TODO: *DOCUMENT OPTIONS*
-      #++
-      def options
-        @@options
-      end
+    # Whether or not Sass has *ever* checked if the stylesheets need updates
+    # (in this Ruby instance).
+    def checked_for_updates
+      @checked_for_updates
+    end
 
-      # Sets various options for Sass.
-      def options=(value)
-        @@options.merge!(value)
-      end
+    # Gets various options for Sass. See README.rdoc for details.
+    #--
+    # TODO: *DOCUMENT OPTIONS*
+    #++
+    def options
+      @options
+    end
 
-      # Get the options ready to be passed to the Sass::Engine
-      def engine_options(additional_options = {})
-        opts = options.dup.merge(additional_options)
-        opts[:load_paths] = load_paths(opts)
-        opts
-      end
+    # Sets various options for Sass.
+    def options=(value)
+      @options.merge!(value)
+    end
 
-      # Checks each stylesheet in <tt>options[:css_location]</tt>
-      # to see if it needs updating,
-      # and updates it using the corresponding template
-      # from <tt>options[:templates]</tt>
-      # if it does.
-      def update_stylesheets
-        return if options[:never_update]
+    # Get the options ready to be passed to the Sass::Engine
+    def engine_options(additional_options = {})
+      opts = options.dup.merge(additional_options)
+      opts[:load_paths] = load_paths(opts)
+      opts
+    end
 
-        @@checked_for_updates = true
-        template_locations.zip(css_locations).each do |template_location, css_location|
+    # Checks each stylesheet in <tt>options[:css_location]</tt>
+    # to see if it needs updating,
+    # and updates it using the corresponding template
+    # from <tt>options[:templates]</tt>
+    # if it does.
+    def update_stylesheets
+      return if options[:never_update]
 
-          Dir.glob(File.join(template_location, "**", "*.sass")).each do |file|
-            # Get the relative path to the file with no extension
-            name = file.sub(template_location + "/", "")[0...-5]
+      @checked_for_updates = true
+      template_locations.zip(css_locations).each do |template_location, css_location|
 
-            if !forbid_update?(name) && (options[:always_update] || stylesheet_needs_update?(name, template_location, css_location))
-              update_stylesheet(name, template_location, css_location)
-            end
+        Dir.glob(File.join(template_location, "**", "*.sass")).each do |file|
+          # Get the relative path to the file with no extension
+          name = file.sub(template_location + "/", "")[0...-5]
+
+          if !forbid_update?(name) && (options[:always_update] || stylesheet_needs_update?(name, template_location, css_location))
+            update_stylesheet(name, template_location, css_location)
           end
         end
       end
+    end
 
-      private
+    private
 
-      def update_stylesheet(name, template_location, css_location)
-        css = css_filename(name, css_location)
-        File.delete(css) if File.exists?(css)
+    def update_stylesheet(name, template_location, css_location)
+      css = css_filename(name, css_location)
+      File.delete(css) if File.exists?(css)
 
-        filename = template_filename(name, template_location)
-        engine = Engine.new(File.read(filename), engine_options(:css_filename => css, :filename => filename))
-        result = begin
-                   engine.render
-                 rescue Exception => e
-                   exception_string(e)
-                 end
+      filename = template_filename(name, template_location)
+      engine = Engine.new(File.read(filename), engine_options(:css_filename => css, :filename => filename))
+      result = begin
+                 engine.render
+               rescue Exception => e
+                 exception_string(e)
+               end
 
-        # Create any directories that might be necessary
-        mkpath(css_location, name)
+      # Create any directories that might be necessary
+      mkpath(css_location, name)
 
-        # Finally, write the file
-        File.open(css, 'w') do |file|
-          file.print(result)
-        end
+      # Finally, write the file
+      File.open(css, 'w') do |file|
+        file.print(result)
       end
-      
-      # Create any successive directories required to be able to write a file to: File.join(base,name)
-      def mkpath(base, name)
-        dirs = [base]
-        name.split(File::SEPARATOR)[0...-1].each { |dir| dirs << File.join(dirs[-1],dir) }
-        dirs.each { |dir| Dir.mkdir(dir) unless File.exist?(dir) }
+    end
+    
+    # Create any successive directories required to be able to write a file to: File.join(base,name)
+    def mkpath(base, name)
+      dirs = [base]
+      name.split(File::SEPARATOR)[0...-1].each { |dir| dirs << File.join(dirs[-1],dir) }
+      dirs.each { |dir| Dir.mkdir(dir) unless File.exist?(dir) }
+    end
+
+    def load_paths(opts = options)
+      (opts[:load_paths] || []) + template_locations
+    end
+    
+    def template_locations
+      location = (options[:template_location] || File.join(options[:css_location],'sass'))
+      if location.is_a?(String)
+        [location]
+      else
+        location.to_a.map { |l| l.first }
       end
-
-      def load_paths(opts = options)
-        (opts[:load_paths] || []) + template_locations
-      end
-      
-      def template_locations
-        location = (options[:template_location] || File.join(options[:css_location],'sass'))
-        if location.is_a?(String)
-          [location]
-        else
-          location.to_a.map { |l| l.first }
-        end
-      end
-      
-      def css_locations
-        if options[:template_location] && !options[:template_location].is_a?(String)
-          options[:template_location].to_a.map { |l| l.last }
-        else
-          [options[:css_location]]
-        end
+    end
+    
+    def css_locations
+      if options[:template_location] && !options[:template_location].is_a?(String)
+        options[:template_location].to_a.map { |l| l.last }
+      else
+        [options[:css_location]]
       end
+    end
 
-      def exception_string(e)
-        if options[:full_exception]
-          e_string = "#{e.class}: #{e.message}"
+    def exception_string(e)
+      if options[:full_exception]
+        e_string = "#{e.class}: #{e.message}"
 
-          if e.is_a? Sass::SyntaxError
-            e_string << "\non line #{e.sass_line}"
+        if e.is_a? Sass::SyntaxError
+          e_string << "\non line #{e.sass_line}"
 
-            if e.sass_filename
-              e_string << " of #{e.sass_filename}"
+          if e.sass_filename
+            e_string << " of #{e.sass_filename}"
 
-              if File.exists?(e.sass_filename)
-                e_string << "\n\n"
+            if File.exists?(e.sass_filename)
+              e_string << "\n\n"
 
-                min = [e.sass_line - 5, 0].max
-                begin
-                  File.read(e.sass_filename).rstrip.split("\n")[
-                    min .. e.sass_line + 5
-                  ].each_with_index do |line, i|
-                    e_string << "#{min + i + 1}: #{line}\n"
-                  end
-                rescue
-                  e_string << "Couldn't read sass file: #{e.sass_filename}"
+              min = [e.sass_line - 5, 0].max
+              begin
+                File.read(e.sass_filename).rstrip.split("\n")[
+                  min .. e.sass_line + 5
+                ].each_with_index do |line, i|
+                  e_string << "#{min + i + 1}: #{line}\n"
                 end
+              rescue
+                e_string << "Couldn't read sass file: #{e.sass_filename}"
               end
             end
           end
-          <<END
+        end
+        <<END
 /*
 #{e_string}
 
@@ -150,54 +151,51 @@ body:before {
   font-family: monospace;
   content: "#{e_string.gsub('"', '\"').gsub("\n", '\\A ')}"; }
 END
-          # Fix an emacs syntax-highlighting hiccup: '
-        else
-          "/* Internal stylesheet error */"
+        # Fix an emacs syntax-highlighting hiccup: '
+      else
+        "/* Internal stylesheet error */"
+      end
+    end
+
+    def template_filename(name, path)
+      "#{path}/#{name}.sass"
+    end
+
+    def css_filename(name, path)
+      "#{path}/#{name}.css"
+    end
+
+    def forbid_update?(name)
+      name.sub(/^.*\//, '')[0] == ?_
+    end
+
+    def stylesheet_needs_update?(name, template_path, css_path)
+      css_file = css_filename(name, css_path)
+      template_file = template_filename(name, template_path)
+      exact_stylesheet_needs_update?(css_file, template_file)
+    end
+
+    def exact_stylesheet_needs_update?(css_file, template_file)
+      return true unless File.exists?(css_file)
+
+      css_mtime = File.mtime(css_file)
+      File.mtime(template_file) > css_mtime ||
+        dependencies(template_file).any?(&dependency_updated?(css_mtime))
+    end
+
+    def dependency_updated?(css_mtime)
+      lambda do |dep|
+        File.mtime(dep) > css_mtime ||
+          dependencies(dep).any?(&dependency_updated?(css_mtime))
+      end
+    end
+
+    def dependencies(filename)
+      File.readlines(filename).grep(/^@import /).map do |line|
+        line[8..-1].split(',').map do |inc|
+          Sass::Engine.find_file_to_import(inc.strip, [File.dirname(filename)] + load_paths)
         end
-      end
-
-      def template_filename(name, path)
-        "#{path}/#{name}.sass"
-      end
-
-      def css_filename(name, path)
-        "#{path}/#{name}.css"
-      end
-
-      def forbid_update?(name)
-        name.sub(/^.*\//, '')[0] == ?_
-      end
-
-      def stylesheet_needs_update?(name, template_path, css_path)
-        css_file = css_filename(name, css_path)
-        template_file = template_filename(name, template_path)
-        exact_stylesheet_needs_update?(css_file, template_file)
-      end
-
-      def exact_stylesheet_needs_update?(css_file, template_file)
-        if !File.exists?(css_file)
-          return true
-        else
-          css_mtime = File.mtime(css_file)
-          File.mtime(template_file) > css_mtime ||
-            dependencies(template_file).any?(&dependency_updated?(css_mtime))
-        end
-      end
-
-      def dependency_updated?(css_mtime)
-        lambda do |dep|
-          File.mtime(dep) > css_mtime ||
-            dependencies(dep).any?(&dependency_updated?(css_mtime))
-        end
-      end
-
-      def dependencies(filename)
-        File.readlines(filename).grep(/^@import /).map do |line|
-          line[8..-1].split(',').map do |inc|
-            Sass::Engine.find_file_to_import(inc.strip, [File.dirname(filename)] + load_paths)
-          end
-        end.flatten.grep(/\.sass$/)
-      end
+      end.flatten.grep(/\.sass$/)
     end
   end
 end

From 26b7ae72370b5c6473e19f7e33907a72e8d4bccb Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Thu, 23 Apr 2009 17:06:28 -0700
Subject: [PATCH 23/24] Update TODO.

---
 TODO | 2 --
 1 file changed, 2 deletions(-)

diff --git a/TODO b/TODO
index 3ccfdd45..d6ab049c 100644
--- a/TODO
+++ b/TODO
@@ -22,8 +22,6 @@
    Figure out alternate attribute syntax
 ** Sass
    CSS Terminology? (https://mail.google.com/mail/#label/Haml/1202d75234b3ce6b)
-   Sass::Engine load_paths option should be set by executable
-   Figure out sassc stuff
 
    [2.4] Allow semicolons for multiple props on one line
    [2.4] Pull in Compass watcher stuff

From ad36db1346d960355c9c8afdaa8c6ee9c65c636d Mon Sep 17 00:00:00 2001
From: Nathan Weizenbaum <nex342@gmail.com>
Date: Thu, 23 Apr 2009 18:02:58 -0700
Subject: [PATCH 24/24] [Sass] Dry up Script::Number#plus a little.

---
 lib/sass/script/number.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sass/script/number.rb b/lib/sass/script/number.rb
index 0780075b..3047caee 100644
--- a/lib/sass/script/number.rb
+++ b/lib/sass/script/number.rb
@@ -20,7 +20,7 @@ module Sass::Script
       elsif other.is_a?(Color)
         other.plus(self)
       else
-        Sass::Script::String.new(self.to_s + other.to_s)
+        super
       end
     end