0
@@ -74,7 +74,7 @@ END
0
 
0
       precompile
0
     rescue Haml::Error
0
-      $!.backtrace.unshift "#{@options[:filename]}:#{@index}" if @index
0
+      $!.backtrace.unshift "#{@options[:filename]}:#{@index + $!.line_offset}" if @index
0
       raise
0
     end
0
 

0
@@ -1,6 +1,20 @@
0
 module Haml
0
   # The abstract type of exception raised by Haml code.
0
-  class Error < StandardError; end
0
+  class Error < StandardError
0
+    # :stopdoc:
0
+
0
+    # By default, an error is taken to refer to the line of the template
0
+    # that was being processed when the exception was raised.
0
+    # However, if line_offset is non-zero, it's added to that line number
0
+    # to get the line to report for the error.
0
+    attr_reader :line_offset
0
+
0
+    def initialize(message = nil, line_offset = 0)
0
+      super(message)
0
+      @line_offset = line_offset
0
+    end
0
+    # :startdoc:
0
+  end
0
 
0
   # SyntaxError is the type of exception raised when Haml encounters an
0
   # ill-formatted document.

0
@@ -158,7 +158,7 @@ END
0
         end
0
 
0
         if old_line.spaces != old_line.tabs * 2
0
-          raise SyntaxError.new("Illegal Indentation: Only two space characters are allowed as tabulation.")
0
+          raise SyntaxError.new("Illegal Indentation: Only two space characters are allowed as tabulation.", 1)
0
         end
0
 
0
         unless old_line.text.empty? || @haml_comment
0
@@ -166,7 +166,7 @@ END
0
         end
0
 
0
         if !flat? && line.tabs - old_line.tabs > 1
0
-          raise SyntaxError.new("Illegal Indentation: Indenting more than once per line is illegal.")
0
+          raise SyntaxError.new("Illegal Indentation: Indenting more than once per line is illegal.", 1)
0
         end
0
         old_line = line
0
         newline
0
@@ -293,7 +293,7 @@ END
0
     # Renders a block of text as plain text.
0
     # Also checks for an illegally opened block.
0
     def push_plain(text)
0
-      raise SyntaxError.new("Illegal Nesting: Nesting within plain text is illegal.") if @block_opened
0
+      raise SyntaxError.new("Illegal Nesting: Nesting within plain text is illegal.", 1) if @block_opened
0
       push_text text
0
     end
0
 
0
@@ -518,10 +518,10 @@ END
0
       attributes = parse_class_and_id(attributes)
0
       Buffer.merge_attrs(attributes, static_attributes) if static_attributes
0
 
0
-      raise SyntaxError.new("Illegal Nesting: Nesting within an atomic tag is illegal.") if @block_opened && atomic
0
-      raise SyntaxError.new("Illegal Nesting: Content can't be both given on the same line as %#{tag_name} and nested within it.") if @block_opened && !value.empty?
0
-      raise SyntaxError.new("Tag has no content.") if parse && value.empty?
0
-      raise SyntaxError.new("Atomic tags can't have content.") if atomic && !value.empty?
0
+      raise SyntaxError.new("Illegal Nesting: Nesting within an atomic tag is illegal.", 1) if @block_opened && atomic
0
+      raise SyntaxError.new("Illegal Nesting: Content can't be both given on the same line as %#{tag_name} and nested within it.", 1) if @block_opened && !value.empty?
0
+      raise SyntaxError, "Tag has no content." if parse && value.empty?
0
+      raise SyntaxError, "Atomic tags can't have content." if atomic && !value.empty?
0
 
0
       atomic = true if !@block_opened && value.empty? && @options[:autoclose].include?(tag_name)
0
 
0
@@ -569,7 +569,7 @@ END
0
       conditional << ">" if conditional
0
 
0
       if @block_opened && !content.empty?
0
-        raise SyntaxError.new('Illegal Nesting: Nesting within a tag that already has content is illegal.')
0
+        raise SyntaxError.new('Illegal Nesting: Nesting within a tag that already has content is illegal.', 1)
0
       end
0
 
0
       open = "<!--#{conditional} "
0
@@ -590,7 +590,7 @@ END
0
 
0
     # Renders an XHTML doctype or XML shebang.
0
     def render_doctype(line)
0
-      raise SyntaxError.new("Illegal Nesting: Nesting within a header command is illegal.") if @block_opened
0
+      raise SyntaxError.new("Illegal Nesting: Nesting within a header command is illegal.", 1) if @block_opened
0
       push_text text_for_doctype(line)
0
     end
0
 
0
@@ -661,7 +661,7 @@ END
0
       spaces = line.index(/([^ ]|$)/)
0
       if line[spaces] == ?\t
0
         return nil if line.strip.empty?
0
-        raise SyntaxError.new("Illegal Indentation: Only two space characters are allowed as tabulation.")
0
+        raise SyntaxError.new("Illegal Indentation: Only two space characters are allowed as tabulation.", 2)
0
       end
0
       [spaces, spaces/2]
0
     end

0
@@ -216,7 +216,7 @@ class EngineTest < Test::Unit::TestCase
0
     render("a\nb\n!!!\n  c\nd")
0
   rescue Haml::SyntaxError => e
0
     assert_equal(e.message, "Illegal Nesting: Nesting within a header command is illegal.")
0
-    assert_equal("(haml):3", e.backtrace[0])
0
+    assert_equal("(haml):4", e.backtrace[0])
0
   rescue Exception => e
0
     assert(false, '"a\nb\n!!!\n  c\nd" doesn\'t produce a Haml::SyntaxError')
0
   else