# HG changeset patch # User Jeff Hammel # Date 1307124940 25200 # Node ID ec0e83ec329fde63f0a1d84d66c71e02f072268e # Parent 835efd8acb04e74199c950fbe126516f8ee90a6f allow both kinds of strings diff -r 835efd8acb04 -r ec0e83ec329f expr.py --- a/expr.py Fri Jun 03 11:09:08 2011 -0700 +++ b/expr.py Fri Jun 03 11:15:40 2011 -0700 @@ -139,7 +139,7 @@ (r"true|false", bool_), (r"[a-zA-Z_]\w*", identifier), (r"[0-9]+", integer), - (r'"[^"]*"', string_), + (r'("[^"]*")|(\'[^\']*\')', string_), (r"==", eq), (r"!=", neq), (r"\|\|", or_), diff -r 835efd8acb04 -r ec0e83ec329f test.py --- a/test.py Fri Jun 03 11:09:08 2011 -0700 +++ b/test.py Fri Jun 03 11:15:40 2011 -0700 @@ -13,6 +13,7 @@ self.assertEqual(False, parse("false")) self.assertEqual("", parse('""')) self.assertEqual("foo bar", parse('"foo bar"')) + self.assertEqual("foo bar", parse("'foo bar'")) self.assertEqual(1, parse("foo", foo=1)) self.assertEqual(True, parse("bar", bar=True)) self.assertEqual("xyz", parse("abc123", abc123="xyz"))