Merge branch 'issue-85' into develop

* issue-85:
  Process escaped single quotes

Author: jamesls

jmespath/lexer.py

@@ -125,8 +125,7 @@ def _consume_until(self, delimiter):
 
     def _consume_literal(self):
         start = self._position
-        lexeme = self._consume_until('`')
-        lexeme = lexeme.replace('\\`', '`')
+        lexeme = self._consume_until('`').replace('\\`', '`')
         try:
             # Assume it is valid JSON and attempt to parse.
             parsed_json = loads(lexeme)
@@ -160,7 +159,7 @@ def _consume_quoted_identifier(self):
 
     def _consume_raw_string_literal(self):
         start = self._position
-        lexeme = self._consume_until("'")
+        lexeme = self._consume_until("'").replace("\\'", "'")
         token_len = self._position - start
         return {'type': 'literal', 'value': lexeme,
                 'start': start, 'end': token_len}

tests/compliance/literal.json

@@ -179,6 +179,11 @@
           "comment": "Do not interpret escaped unicode.",
           "expression": "'\\u03a6'",
           "result": "\\u03a6"
+        },
+        {
+          "comment": "Can escape the single quote",
+          "expression": "'foo\\'bar'",
+          "result": "foo'bar"
         }
       ]
     }