Skip to content

Commit 669f652

Browse files
authored
Merge pull request kennknowles#61 from kennknowles/sk/revert-allow-special
Revert "allow # in IDs"
2 parents 2ceae10 + ce9d41b commit 669f652

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

jsonpath_rw/lexer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def tokenize(self, string):
6161
t_ignore = ' \t'
6262

6363
def t_ID(self, t):
64-
r'[a-zA-Z_@#][a-zA-Z0-9_@\-]*'
64+
r'[a-zA-Z_@][a-zA-Z0-9_@\-]*'
6565
t.type = self.reserved_words.get(t.value, 'ID')
6666
return t
6767

tests/test_lexer.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def test_simple_inputs(self):
5353
self.assert_lex_equiv('`this`', [self.token('this', 'NAMED_OPERATOR')])
5454
self.assert_lex_equiv('|', [self.token('|', '|')])
5555
self.assert_lex_equiv('where', [self.token('where', 'WHERE')])
56-
self.assert_lex_equiv('a.#text', [self.token('a', 'ID'), self.token('.', '.'), self.token('#text', 'ID')])
5756

5857
def test_basic_errors(self):
5958
def tokenize(s):
@@ -67,4 +66,4 @@ def tokenize(s):
6766
self.assertRaises(JsonPathLexerError, tokenize, '"`')
6867
self.assertRaises(JsonPathLexerError, tokenize, "'`")
6968
self.assertRaises(JsonPathLexerError, tokenize, '?')
70-
self.assertRaises(JsonPathLexerError, tokenize, '$.foo.bar.%')
69+
self.assertRaises(JsonPathLexerError, tokenize, '$.foo.bar.#')

0 commit comments

Comments
 (0)