Merge pull request kennknowles#4 from iley/master

kennknowles · kennknowles · commit 5c41c53877eb · 2013-06-21T04:46:32.000-07:00
Fix a bug in error handling functions in lexer.py
diff --git a/jsonpath_rw/lexer.py b/jsonpath_rw/lexer.py
@@ -78,7 +78,7 @@ def t_singlequote_SINGLEQUOTE(self, t):
         return t
 
     def t_singlequote_error(self, t):
-        raise Exception('Error on line %s, col %s while lexing singlequoted field: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.latest_newline, t.value[0]))
+        raise Exception('Error on line %s, col %s while lexing singlequoted field: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.lexer.latest_newline, t.value[0]))
 
 
     # Double-quoted strings
@@ -96,7 +96,7 @@ def t_doublequote_DOUBLEQUOTE(self, t):
         return t
 
     def t_doublequote_error(self, t):
-        raise Exception('Error on line %s, col %s while lexing doublequoted field: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.latest_newline, t.value[0]))
+        raise Exception('Error on line %s, col %s while lexing doublequoted field: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.lexer.latest_newline, t.value[0]))
 
     
     # Back-quoted "magic" operators
@@ -114,7 +114,7 @@ def t_backquote_BACKQUOTE(self, t):
         return t
 
     def t_backquote_error(self, t):
-        raise Exception('Error on line %s, col %s while lexing backquoted operator: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.latest_newline, t.value[0]))
+        raise Exception('Error on line %s, col %s while lexing backquoted operator: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.lexer.latest_newline, t.value[0]))
 
 
     # Counting lines, handling errors
@@ -124,7 +124,7 @@ def t_newline(self, t):
         t.lexer.latest_newline = t.lexpos
 
     def t_error(self, t):
-        raise Exception('Error on line %s, col %s: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.latest_newline, t.value[0]))
+        raise Exception('Error on line %s, col %s: Unexpected character: %s ' % (t.lexer.lineno, t.lexpos - t.lexer.latest_newline, t.value[0]))
 
 if __name__ == '__main__':
     logging.basicConfig()
