Fixed nested brackets bug for ==. Thanks to Ryan T Mulligan for pointing it out.

git-svn-id: svn://hamptoncatlin.com/haml/trunk@576 7063305b-7217-0410-af8c-cdc13e5119b9

lib/haml/engine.rb

@@ -882,9 +882,21 @@ END
     end
 
     def unescape_interpolation(str)
-      str.dump.gsub('\\#', '#').gsub(/\#\{[^\}]+\}/) do |substr|
-        substr.gsub('\\"', '"')
+      first = str.index(/(^|[^\\])\#\{/)
+
+      if first.nil?
+        return str.dump
+      elsif first != 0
+        first -= 1
       end
+
+      last = str.rindex '}'
+
+      interpolation = str.slice!(first, last + 1)
+      str.insert(first, "_haml_interpolation")
+
+      str = str.dump
+      str.gsub("_haml_interpolation", interpolation)
     end
 
     # Counts the tabulation of a line.

test/haml/results/just_stuff.xhtml

@@ -10,6 +10,7 @@
 Embedded? false!
 Embedded? true!
 Embedded? true!
+Embedded? twice! true!
 <div class='render'><em>wow!</em></div>
 stuff followed by whitespace
 <strong>block with whitespace</strong>

test/haml/templates/just_stuff.haml

@@ -11,6 +11,7 @@
 == Embedded? #{true}!
 - embedded = true
 == Embedded? #{embedded}!
+== Embedded? #{"twice! #{true}"}!
 .render= render :inline => "%em= 'wow!'", :type => :haml
 = "stuff followed by whitespace"