Skip to content

Add regex #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
KyleJamesWalker wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Add regex #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f468d0
Add contains operator
KyleJamesWalker Dec 9, 2022
f833e47
Add contains
KyleJamesWalker Dec 9, 2022
82a7ef4
Merge branch 'pacifica:master' into master
KyleJamesWalker Dec 14, 2022
b50e86a
Add regex support
KyleJamesWalker Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/exampleusage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ matching.
| ``and``, ``or``, | Boolean operator, where operands are JSONPath |
| ``not`` | filter expressions |
+-------------------+-----------------------------------------------+
| ``~=`` | Matches a Python regular expression. For |
| | example, [?(@.description =~ "^cat.*")] |
| | matches items whose description starts with |
| | cat (case-sensitive). |
+-------------------+-----------------------------------------------+
| ``contains`` | Checks if a string contains the specified |
| | substring (case-sensitive), or an array |
| | contains the specified element. |
Expand Down
16 changes: 16 additions & 0 deletions jsonpath2/expressions/operator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from typing import Callable, Generator, List, Union
from jsonpath2.expression import Expression
from jsonpath2.node import Node
import re


class OperatorExpression(Expression):
Expand Down Expand Up @@ -208,6 +209,21 @@ def __evaluate__(x_obj, y_obj):
return y_obj in x_obj


class RegexBinaryOperatorExpression(BinaryOperatorExpression):
"""Expression to handle regex operator."""

def __init__(self, *args, **kwargs):
"""Construct the binary operator with appropriate method."""
super(RegexBinaryOperatorExpression, self).__init__(
"~=", RegexBinaryOperatorExpression.__evaluate__, *args, **kwargs
)

@staticmethod
def __evaluate__(x_obj, y_obj):
"""Perform a regex match."""
return True if re.match(y_obj.replace("\\\\", "\\"), x_obj) else False


class UnaryOperatorExpression(OperatorExpression):
"""Unary operator expression base class."""

Expand Down
3 changes: 2 additions & 1 deletion jsonpath2/parser/JSONPath.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ GT : '>' ;
LE : '<=' ;
LT : '<' ;
NE : '!=' ;
RE : '~=' ;
NOT : 'not' ;
OR : 'or' ;
CN : 'contains' ;
Expand Down Expand Up @@ -93,7 +94,7 @@ orExpression
notExpression
: NOT notExpression
| PAREN_LEFT expression PAREN_RIGHT
| jsonpath__ ( ( EQ | NE | LT | LE | GT | GE | CN ) jsonpath__ )?
| jsonpath__ ( ( EQ | NE | LT | LE | GT | GE | CN | RE ) jsonpath__ )?
;


Expand Down
4 changes: 3 additions & 1 deletion jsonpath2/parser/JSONPath.interp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ null
'<='
'<'
'!='
'~='
'not'
'or'
'contains'
Expand Down Expand Up @@ -46,6 +47,7 @@ GT
LE
LT
NE
RE
NOT
OR
CN
Expand Down Expand Up @@ -88,4 +90,4 @@ value


atn:
[4, 1, 31, 201, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 1, 0, 1, 0, 3, 0, 39, 8, 0, 1, 0, 1, 0, 1, 1, 1, 1, 3, 1, 45, 8, 1, 1, 2, 1, 2, 3, 2, 49, 8, 2, 1, 3, 1, 3, 1, 3, 3, 3, 54, 8, 3, 1, 3, 3, 3, 57, 8, 3, 1, 3, 1, 3, 1, 3, 3, 3, 62, 8, 3, 1, 3, 1, 3, 3, 3, 66, 8, 3, 3, 3, 68, 8, 3, 1, 4, 1, 4, 1, 4, 1, 4, 5, 4, 74, 8, 4, 10, 4, 12, 4, 77, 9, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 85, 8, 5, 10, 5, 12, 5, 88, 9, 5, 3, 5, 90, 8, 5, 1, 5, 1, 5, 1, 6, 1, 6, 3, 6, 96, 8, 6, 1, 6, 3, 6, 99, 8, 6, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 105, 8, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 117, 8, 7, 1, 8, 1, 8, 1, 8, 3, 8, 122, 8, 8, 1, 8, 1, 8, 1, 8, 3, 8, 127, 8, 8, 3, 8, 129, 8, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 3, 10, 136, 8, 10, 1, 11, 1, 11, 1, 11, 3, 11, 141, 8, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 152, 8, 12, 3, 12, 154, 8, 12, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 5, 14, 162, 8, 14, 10, 14, 12, 14, 165, 9, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 171, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 5, 16, 181, 8, 16, 10, 16, 12, 16, 184, 9, 16, 1, 16, 1, 16, 1, 16, 1, 16, 3, 16, 190, 8, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 3, 17, 199, 8, 17, 1, 17, 0, 0, 18, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 0, 2, 2, 0, 1, 1, 3, 3, 2, 0, 7, 12, 15, 15, 221, 0, 36, 1, 0, 0, 0, 2, 42, 1, 0, 0, 0, 4, 48, 1, 0, 0, 0, 6, 67, 1, 0, 0, 0, 8, 69, 1, 0, 0, 0, 10, 80, 1, 0, 0, 0, 12, 98, 1, 0, 0, 0, 14, 116, 1, 0, 0, 0, 16, 118, 1, 0, 0, 0, 18, 130, 1, 0, 0, 0, 20, 132, 1, 0, 0, 0, 22, 137, 1, 0, 0, 0, 24, 153, 1, 0, 0, 0, 26, 155, 1, 0, 0, 0, 28, 170, 1, 0, 0, 0, 30, 172, 1, 0, 0, 0, 32, 189, 1, 0, 0, 0, 34, 198, 1, 0, 0, 0, 36, 38, 5, 3, 0, 0, 37, 39, 3, 6, 3, 0, 38, 37, 1, 0, 0, 0, 38, 39, 1, 0, 0, 0, 39, 40, 1, 0, 0, 0, 40, 41, 5, 0, 0, 1, 41, 1, 1, 0, 0, 0, 42, 44, 7, 0, 0, 0, 43, 45, 3, 6, 3, 0, 44, 43, 1, 0, 0, 0, 44, 45, 1, 0, 0, 0, 45, 3, 1, 0, 0, 0, 46, 49, 3, 2, 1, 0, 47, 49, 3, 34, 17, 0, 48, 46, 1, 0, 0, 0, 48, 47, 1, 0, 0, 0, 49, 5, 1, 0, 0, 0, 50, 53, 5, 2, 0, 0, 51, 54, 3, 12, 6, 0, 52, 54, 3, 8, 4, 0, 53, 51, 1, 0, 0, 0, 53, 52, 1, 0, 0, 0, 54, 56, 1, 0, 0, 0, 55, 57, 3, 6, 3, 0, 56, 55, 1, 0, 0, 0, 56, 57, 1, 0, 0, 0, 57, 68, 1, 0, 0, 0, 58, 59, 5, 4, 0, 0, 59, 61, 3, 12, 6, 0, 60, 62, 3, 6, 3, 0, 61, 60, 1, 0, 0, 0, 61, 62, 1, 0, 0, 0, 62, 68, 1, 0, 0, 0, 63, 65, 3, 8, 4, 0, 64, 66, 3, 6, 3, 0, 65, 64, 1, 0, 0, 0, 65, 66, 1, 0, 0, 0, 66, 68, 1, 0, 0, 0, 67, 50, 1, 0, 0, 0, 67, 58, 1, 0, 0, 0, 67, 63, 1, 0, 0, 0, 68, 7, 1, 0, 0, 0, 69, 70, 5, 21, 0, 0, 70, 75, 3, 14, 7, 0, 71, 72, 5, 24, 0, 0, 72, 74, 3, 14, 7, 0, 73, 71, 1, 0, 0, 0, 74, 77, 1, 0, 0, 0, 75, 73, 1, 0, 0, 0, 75, 76, 1, 0, 0, 0, 76, 78, 1, 0, 0, 0, 77, 75, 1, 0, 0, 0, 78, 79, 5, 22, 0, 0, 79, 9, 1, 0, 0, 0, 80, 89, 5, 25, 0, 0, 81, 86, 3, 4, 2, 0, 82, 83, 5, 24, 0, 0, 83, 85, 3, 4, 2, 0, 84, 82, 1, 0, 0, 0, 85, 88, 1, 0, 0, 0, 86, 84, 1, 0, 0, 0, 86, 87, 1, 0, 0, 0, 87, 90, 1, 0, 0, 0, 88, 86, 1, 0, 0, 0, 89, 81, 1, 0, 0, 0, 89, 90, 1, 0, 0, 0, 90, 91, 1, 0, 0, 0, 91, 92, 5, 26, 0, 0, 92, 11, 1, 0, 0, 0, 93, 95, 5, 28, 0, 0, 94, 96, 3, 10, 5, 0, 95, 94, 1, 0, 0, 0, 95, 96, 1, 0, 0, 0, 96, 99, 1, 0, 0, 0, 97, 99, 5, 5, 0, 0, 98, 93, 1, 0, 0, 0, 98, 97, 1, 0, 0, 0, 99, 13, 1, 0, 0, 0, 100, 117, 5, 29, 0, 0, 101, 102, 5, 30, 0, 0, 102, 104, 4, 7, 0, 0, 103, 105, 3, 16, 8, 0, 104, 103, 1, 0, 0, 0, 104, 105, 1, 0, 0, 0, 105, 117, 1, 0, 0, 0, 106, 117, 3, 16, 8, 0, 107, 117, 5, 5, 0, 0, 108, 109, 5, 27, 0, 0, 109, 110, 5, 25, 0, 0, 110, 111, 3, 18, 9, 0, 111, 112, 5, 26, 0, 0, 112, 117, 1, 0, 0, 0, 113, 117, 3, 2, 1, 0, 114, 115, 5, 28, 0, 0, 115, 117, 3, 10, 5, 0, 116, 100, 1, 0, 0, 0, 116, 101, 1, 0, 0, 0, 116, 106, 1, 0, 0, 0, 116, 107, 1, 0, 0, 0, 116, 108, 1, 0, 0, 0, 116, 113, 1, 0, 0, 0, 116, 114, 1, 0, 0, 0, 117, 15, 1, 0, 0, 0, 118, 121, 5, 23, 0, 0, 119, 120, 5, 30, 0, 0, 120, 122, 4, 8, 1, 0, 121, 119, 1, 0, 0, 0, 121, 122, 1, 0, 0, 0, 122, 128, 1, 0, 0, 0, 123, 126, 5, 23, 0, 0, 124, 125, 5, 30, 0, 0, 125, 127, 4, 8, 2, 0, 126, 124, 1, 0, 0, 0, 126, 127, 1, 0, 0, 0, 127, 129, 1, 0, 0, 0, 128, 123, 1, 0, 0, 0, 128, 129, 1, 0, 0, 0, 129, 17, 1, 0, 0, 0, 130, 131, 3, 20, 10, 0, 131, 19, 1, 0, 0, 0, 132, 135, 3, 22, 11, 0, 133, 134, 5, 6, 0, 0, 134, 136, 3, 20, 10, 0, 135, 133, 1, 0, 0, 0, 135, 136, 1, 0, 0, 0, 136, 21, 1, 0, 0, 0, 137, 140, 3, 24, 12, 0, 138, 139, 5, 14, 0, 0, 139, 141, 3, 22, 11, 0, 140, 138, 1, 0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 23, 1, 0, 0, 0, 142, 143, 5, 13, 0, 0, 143, 154, 3, 24, 12, 0, 144, 145, 5, 25, 0, 0, 145, 146, 3, 18, 9, 0, 146, 147, 5, 26, 0, 0, 147, 154, 1, 0, 0, 0, 148, 151, 3, 4, 2, 0, 149, 150, 7, 1, 0, 0, 150, 152, 3, 4, 2, 0, 151, 149, 1, 0, 0, 0, 151, 152, 1, 0, 0, 0, 152, 154, 1, 0, 0, 0, 153, 142, 1, 0, 0, 0, 153, 144, 1, 0, 0, 0, 153, 148, 1, 0, 0, 0, 154, 25, 1, 0, 0, 0, 155, 156, 3, 34, 17, 0, 156, 27, 1, 0, 0, 0, 157, 158, 5, 19, 0, 0, 158, 163, 3, 30, 15, 0, 159, 160, 5, 24, 0, 0, 160, 162, 3, 30, 15, 0, 161, 159, 1, 0, 0, 0, 162, 165, 1, 0, 0, 0, 163, 161, 1, 0, 0, 0, 163, 164, 1, 0, 0, 0, 164, 166, 1, 0, 0, 0, 165, 163, 1, 0, 0, 0, 166, 167, 5, 20, 0, 0, 167, 171, 1, 0, 0, 0, 168, 169, 5, 19, 0, 0, 169, 171, 5, 20, 0, 0, 170, 157, 1, 0, 0, 0, 170, 168, 1, 0, 0, 0, 171, 29, 1, 0, 0, 0, 172, 173, 5, 29, 0, 0, 173, 174, 5, 23, 0, 0, 174, 175, 3, 34, 17, 0, 175, 31, 1, 0, 0, 0, 176, 177, 5, 21, 0, 0, 177, 182, 3, 34, 17, 0, 178, 179, 5, 24, 0, 0, 179, 181, 3, 34, 17, 0, 180, 178, 1, 0, 0, 0, 181, 184, 1, 0, 0, 0, 182, 180, 1, 0, 0, 0, 182, 183, 1, 0, 0, 0, 183, 185, 1, 0, 0, 0, 184, 182, 1, 0, 0, 0, 185, 186, 5, 22, 0, 0, 186, 190, 1, 0, 0, 0, 187, 188, 5, 21, 0, 0, 188, 190, 5, 22, 0, 0, 189, 176, 1, 0, 0, 0, 189, 187, 1, 0, 0, 0, 190, 33, 1, 0, 0, 0, 191, 199, 5, 29, 0, 0, 192, 199, 5, 30, 0, 0, 193, 199, 3, 28, 14, 0, 194, 199, 3, 32, 16, 0, 195, 199, 5, 16, 0, 0, 196, 199, 5, 17, 0, 0, 197, 199, 5, 18, 0, 0, 198, 191, 1, 0, 0, 0, 198, 192, 1, 0, 0, 0, 198, 193, 1, 0, 0, 0, 198, 194, 1, 0, 0, 0, 198, 195, 1, 0, 0, 0, 198, 196, 1, 0, 0, 0, 198, 197, 1, 0, 0, 0, 199, 35, 1, 0, 0, 0, 27, 38, 44, 48, 53, 56, 61, 65, 67, 75, 86, 89, 95, 98, 104, 116, 121, 126, 128, 135, 140, 151, 153, 163, 170, 182, 189, 198]
[4, 1, 32, 201, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 1, 0, 1, 0, 3, 0, 39, 8, 0, 1, 0, 1, 0, 1, 1, 1, 1, 3, 1, 45, 8, 1, 1, 2, 1, 2, 3, 2, 49, 8, 2, 1, 3, 1, 3, 1, 3, 3, 3, 54, 8, 3, 1, 3, 3, 3, 57, 8, 3, 1, 3, 1, 3, 1, 3, 3, 3, 62, 8, 3, 1, 3, 1, 3, 3, 3, 66, 8, 3, 3, 3, 68, 8, 3, 1, 4, 1, 4, 1, 4, 1, 4, 5, 4, 74, 8, 4, 10, 4, 12, 4, 77, 9, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 85, 8, 5, 10, 5, 12, 5, 88, 9, 5, 3, 5, 90, 8, 5, 1, 5, 1, 5, 1, 6, 1, 6, 3, 6, 96, 8, 6, 1, 6, 3, 6, 99, 8, 6, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 105, 8, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 117, 8, 7, 1, 8, 1, 8, 1, 8, 3, 8, 122, 8, 8, 1, 8, 1, 8, 1, 8, 3, 8, 127, 8, 8, 3, 8, 129, 8, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 3, 10, 136, 8, 10, 1, 11, 1, 11, 1, 11, 3, 11, 141, 8, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 3, 12, 152, 8, 12, 3, 12, 154, 8, 12, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 5, 14, 162, 8, 14, 10, 14, 12, 14, 165, 9, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 171, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 5, 16, 181, 8, 16, 10, 16, 12, 16, 184, 9, 16, 1, 16, 1, 16, 1, 16, 1, 16, 3, 16, 190, 8, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 3, 17, 199, 8, 17, 1, 17, 0, 0, 18, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 0, 2, 2, 0, 1, 1, 3, 3, 2, 0, 7, 13, 16, 16, 221, 0, 36, 1, 0, 0, 0, 2, 42, 1, 0, 0, 0, 4, 48, 1, 0, 0, 0, 6, 67, 1, 0, 0, 0, 8, 69, 1, 0, 0, 0, 10, 80, 1, 0, 0, 0, 12, 98, 1, 0, 0, 0, 14, 116, 1, 0, 0, 0, 16, 118, 1, 0, 0, 0, 18, 130, 1, 0, 0, 0, 20, 132, 1, 0, 0, 0, 22, 137, 1, 0, 0, 0, 24, 153, 1, 0, 0, 0, 26, 155, 1, 0, 0, 0, 28, 170, 1, 0, 0, 0, 30, 172, 1, 0, 0, 0, 32, 189, 1, 0, 0, 0, 34, 198, 1, 0, 0, 0, 36, 38, 5, 3, 0, 0, 37, 39, 3, 6, 3, 0, 38, 37, 1, 0, 0, 0, 38, 39, 1, 0, 0, 0, 39, 40, 1, 0, 0, 0, 40, 41, 5, 0, 0, 1, 41, 1, 1, 0, 0, 0, 42, 44, 7, 0, 0, 0, 43, 45, 3, 6, 3, 0, 44, 43, 1, 0, 0, 0, 44, 45, 1, 0, 0, 0, 45, 3, 1, 0, 0, 0, 46, 49, 3, 2, 1, 0, 47, 49, 3, 34, 17, 0, 48, 46, 1, 0, 0, 0, 48, 47, 1, 0, 0, 0, 49, 5, 1, 0, 0, 0, 50, 53, 5, 2, 0, 0, 51, 54, 3, 12, 6, 0, 52, 54, 3, 8, 4, 0, 53, 51, 1, 0, 0, 0, 53, 52, 1, 0, 0, 0, 54, 56, 1, 0, 0, 0, 55, 57, 3, 6, 3, 0, 56, 55, 1, 0, 0, 0, 56, 57, 1, 0, 0, 0, 57, 68, 1, 0, 0, 0, 58, 59, 5, 4, 0, 0, 59, 61, 3, 12, 6, 0, 60, 62, 3, 6, 3, 0, 61, 60, 1, 0, 0, 0, 61, 62, 1, 0, 0, 0, 62, 68, 1, 0, 0, 0, 63, 65, 3, 8, 4, 0, 64, 66, 3, 6, 3, 0, 65, 64, 1, 0, 0, 0, 65, 66, 1, 0, 0, 0, 66, 68, 1, 0, 0, 0, 67, 50, 1, 0, 0, 0, 67, 58, 1, 0, 0, 0, 67, 63, 1, 0, 0, 0, 68, 7, 1, 0, 0, 0, 69, 70, 5, 22, 0, 0, 70, 75, 3, 14, 7, 0, 71, 72, 5, 25, 0, 0, 72, 74, 3, 14, 7, 0, 73, 71, 1, 0, 0, 0, 74, 77, 1, 0, 0, 0, 75, 73, 1, 0, 0, 0, 75, 76, 1, 0, 0, 0, 76, 78, 1, 0, 0, 0, 77, 75, 1, 0, 0, 0, 78, 79, 5, 23, 0, 0, 79, 9, 1, 0, 0, 0, 80, 89, 5, 26, 0, 0, 81, 86, 3, 4, 2, 0, 82, 83, 5, 25, 0, 0, 83, 85, 3, 4, 2, 0, 84, 82, 1, 0, 0, 0, 85, 88, 1, 0, 0, 0, 86, 84, 1, 0, 0, 0, 86, 87, 1, 0, 0, 0, 87, 90, 1, 0, 0, 0, 88, 86, 1, 0, 0, 0, 89, 81, 1, 0, 0, 0, 89, 90, 1, 0, 0, 0, 90, 91, 1, 0, 0, 0, 91, 92, 5, 27, 0, 0, 92, 11, 1, 0, 0, 0, 93, 95, 5, 29, 0, 0, 94, 96, 3, 10, 5, 0, 95, 94, 1, 0, 0, 0, 95, 96, 1, 0, 0, 0, 96, 99, 1, 0, 0, 0, 97, 99, 5, 5, 0, 0, 98, 93, 1, 0, 0, 0, 98, 97, 1, 0, 0, 0, 99, 13, 1, 0, 0, 0, 100, 117, 5, 30, 0, 0, 101, 102, 5, 31, 0, 0, 102, 104, 4, 7, 0, 0, 103, 105, 3, 16, 8, 0, 104, 103, 1, 0, 0, 0, 104, 105, 1, 0, 0, 0, 105, 117, 1, 0, 0, 0, 106, 117, 3, 16, 8, 0, 107, 117, 5, 5, 0, 0, 108, 109, 5, 28, 0, 0, 109, 110, 5, 26, 0, 0, 110, 111, 3, 18, 9, 0, 111, 112, 5, 27, 0, 0, 112, 117, 1, 0, 0, 0, 113, 117, 3, 2, 1, 0, 114, 115, 5, 29, 0, 0, 115, 117, 3, 10, 5, 0, 116, 100, 1, 0, 0, 0, 116, 101, 1, 0, 0, 0, 116, 106, 1, 0, 0, 0, 116, 107, 1, 0, 0, 0, 116, 108, 1, 0, 0, 0, 116, 113, 1, 0, 0, 0, 116, 114, 1, 0, 0, 0, 117, 15, 1, 0, 0, 0, 118, 121, 5, 24, 0, 0, 119, 120, 5, 31, 0, 0, 120, 122, 4, 8, 1, 0, 121, 119, 1, 0, 0, 0, 121, 122, 1, 0, 0, 0, 122, 128, 1, 0, 0, 0, 123, 126, 5, 24, 0, 0, 124, 125, 5, 31, 0, 0, 125, 127, 4, 8, 2, 0, 126, 124, 1, 0, 0, 0, 126, 127, 1, 0, 0, 0, 127, 129, 1, 0, 0, 0, 128, 123, 1, 0, 0, 0, 128, 129, 1, 0, 0, 0, 129, 17, 1, 0, 0, 0, 130, 131, 3, 20, 10, 0, 131, 19, 1, 0, 0, 0, 132, 135, 3, 22, 11, 0, 133, 134, 5, 6, 0, 0, 134, 136, 3, 20, 10, 0, 135, 133, 1, 0, 0, 0, 135, 136, 1, 0, 0, 0, 136, 21, 1, 0, 0, 0, 137, 140, 3, 24, 12, 0, 138, 139, 5, 15, 0, 0, 139, 141, 3, 22, 11, 0, 140, 138, 1, 0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 23, 1, 0, 0, 0, 142, 143, 5, 14, 0, 0, 143, 154, 3, 24, 12, 0, 144, 145, 5, 26, 0, 0, 145, 146, 3, 18, 9, 0, 146, 147, 5, 27, 0, 0, 147, 154, 1, 0, 0, 0, 148, 151, 3, 4, 2, 0, 149, 150, 7, 1, 0, 0, 150, 152, 3, 4, 2, 0, 151, 149, 1, 0, 0, 0, 151, 152, 1, 0, 0, 0, 152, 154, 1, 0, 0, 0, 153, 142, 1, 0, 0, 0, 153, 144, 1, 0, 0, 0, 153, 148, 1, 0, 0, 0, 154, 25, 1, 0, 0, 0, 155, 156, 3, 34, 17, 0, 156, 27, 1, 0, 0, 0, 157, 158, 5, 20, 0, 0, 158, 163, 3, 30, 15, 0, 159, 160, 5, 25, 0, 0, 160, 162, 3, 30, 15, 0, 161, 159, 1, 0, 0, 0, 162, 165, 1, 0, 0, 0, 163, 161, 1, 0, 0, 0, 163, 164, 1, 0, 0, 0, 164, 166, 1, 0, 0, 0, 165, 163, 1, 0, 0, 0, 166, 167, 5, 21, 0, 0, 167, 171, 1, 0, 0, 0, 168, 169, 5, 20, 0, 0, 169, 171, 5, 21, 0, 0, 170, 157, 1, 0, 0, 0, 170, 168, 1, 0, 0, 0, 171, 29, 1, 0, 0, 0, 172, 173, 5, 30, 0, 0, 173, 174, 5, 24, 0, 0, 174, 175, 3, 34, 17, 0, 175, 31, 1, 0, 0, 0, 176, 177, 5, 22, 0, 0, 177, 182, 3, 34, 17, 0, 178, 179, 5, 25, 0, 0, 179, 181, 3, 34, 17, 0, 180, 178, 1, 0, 0, 0, 181, 184, 1, 0, 0, 0, 182, 180, 1, 0, 0, 0, 182, 183, 1, 0, 0, 0, 183, 185, 1, 0, 0, 0, 184, 182, 1, 0, 0, 0, 185, 186, 5, 23, 0, 0, 186, 190, 1, 0, 0, 0, 187, 188, 5, 22, 0, 0, 188, 190, 5, 23, 0, 0, 189, 176, 1, 0, 0, 0, 189, 187, 1, 0, 0, 0, 190, 33, 1, 0, 0, 0, 191, 199, 5, 30, 0, 0, 192, 199, 5, 31, 0, 0, 193, 199, 3, 28, 14, 0, 194, 199, 3, 32, 16, 0, 195, 199, 5, 17, 0, 0, 196, 199, 5, 18, 0, 0, 197, 199, 5, 19, 0, 0, 198, 191, 1, 0, 0, 0, 198, 192, 1, 0, 0, 0, 198, 193, 1, 0, 0, 0, 198, 194, 1, 0, 0, 0, 198, 195, 1, 0, 0, 0, 198, 196, 1, 0, 0, 0, 198, 197, 1, 0, 0, 0, 199, 35, 1, 0, 0, 0, 27, 38, 44, 48, 53, 56, 61, 65, 67, 75, 86, 89, 95, 98, 104, 116, 121, 126, 128, 135, 140, 151, 153, 163, 170, 182, 189, 198]
70 changes: 36 additions & 34 deletions jsonpath2/parser/JSONPath.tokens
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,26 @@ GT=9
LE=10
LT=11
NE=12
NOT=13
OR=14
CN=15
TRUE=16
FALSE=17
NULL=18
BRACE_LEFT=19
BRACE_RIGHT=20
BRACKET_LEFT=21
BRACKET_RIGHT=22
COLON=23
COMMA=24
PAREN_LEFT=25
PAREN_RIGHT=26
QUESTION=27
ID=28
STRING=29
NUMBER=30
WS=31
RE=13
NOT=14
OR=15
CN=16
TRUE=17
FALSE=18
NULL=19
BRACE_LEFT=20
BRACE_RIGHT=21
BRACKET_LEFT=22
BRACKET_RIGHT=23
COLON=24
COMMA=25
PAREN_LEFT=26
PAREN_RIGHT=27
QUESTION=28
ID=29
STRING=30
NUMBER=31
WS=32
'@'=1
'..'=2
'$'=3
Expand All @@ -41,18 +42,19 @@ WS=31
'<='=10
'<'=11
'!='=12
'not'=13
'or'=14
'contains'=15
'true'=16
'false'=17
'null'=18
'{'=19
'}'=20
'['=21
']'=22
':'=23
','=24
'('=25
')'=26
'?'=27
'~='=13
'not'=14
'or'=15
'contains'=16
'true'=17
'false'=18
'null'=19
'{'=20
'}'=21
'['=22
']'=23
':'=24
','=25
'('=26
')'=27
'?'=28
Loading