Nested silent script works.

git-svn-id: svn://hamptoncatlin.com/haml/branches/edge@98 7063305b-7217-0410-af8c-cdc13e5119b9

lib/haml/engine.rb

@@ -159,12 +159,18 @@ module Haml
           @to_close_stack.push '_haml_end_block'
         end
         
-      elsif count <= @to_close_stack.size && @to_close_stack.size > 0 &&
-          (line.length == 0 || line[0] != SILENT_SCRIPT || !MID_BLOCK_KEYWORDS.include?(line[1..-1].split[0]))
-          
+      elsif count <= @to_close_stack.size && @to_close_stack.size > 0          
         # The tabulation has gone down, and it's not because of one of
         # Ruby's mid-block keywords
-        (@to_close_stack.size - count).times { close }
+        to_close = @to_close_stack.size - count
+
+        to_close.times do |i|
+          offset = to_close - 1 - i
+          unless offset == 0 && line.length > 2 && line[0] == SILENT_SCRIPT &&
+                MID_BLOCK_KEYWORDS.include?(line[1..-1].split[0])
+            close
+          end
+        end
       end
       
       if line.length > 0

test/results/list.xhtml

@@ -1,3 +1,4 @@
+! Not a Doctype !
 <ul>
   <li>a</li>
   <li>b</li>

test/results/silent_script.xhtml

@@ -55,4 +55,9 @@
     "false" is:
     false
   </p>
+  Even!
+  Odd!
+  Even!
+  Odd!
+  Even!
 </div>

test/templates/list.haml

@@ -1,3 +1,4 @@
+! Not a Doctype !
 %ul
   %li a
   %li b

test/templates/silent_script.haml

@@ -17,3 +17,11 @@
       = "true"
     - else
       = "false"
+  - if true
+    - 5.times do |i|
+      - if i % 2 == 1
+        Odd!
+      - else
+        Even!
+  - else
+    = "This can't happen!"