Include lines/columns in parser error messages.

Author: Yorick Peterse

lib/ll/parser.rb

@@ -135,6 +135,20 @@ def s(*args)
     return AST::Node.new(*args)
   end
 
+  ##
+  # @see [LL::Driver#parser_error]
+  #
+  def parser_error(stack_type, stack_value, token_type, token_value)
+    message = parser_error_message(stack_type, stack_value, token_type)
+
+    if token_value.is_a?(LL::Token)
+      sl       = token_value.source_line
+      message += " (line #{sl.line}, column #{sl.column})"
+    end
+
+    raise ParserError, message
+  end
+
   def _rule_0(val)
      s(:grammar, val[0]) 
   end

lib/ll/parser.rll

@@ -160,4 +160,18 @@ rule
   def s(*args)
     return AST::Node.new(*args)
   end
+
+  ##
+  # @see [LL::Driver#parser_error]
+  #
+  def parser_error(stack_type, stack_value, token_type, token_value)
+    message = parser_error_message(stack_type, stack_value, token_type)
+
+    if token_value.is_a?(LL::Token)
+      sl       = token_value.source_line
+      message += " (line #{sl.line}, column #{sl.column})"
+    end
+
+    raise ParserError, message
+  end
 }

spec/ll/parser_spec.rb

@@ -34,7 +34,7 @@
 
         block.should raise_error(
           LL::ParserError,
-          'Unexpected T_IDENT, expected T_COLON instead'
+          'Unexpected T_IDENT, expected T_COLON instead (line 1, column 11)'
         )
       end
     end