diff --git a/docs/grammar.md b/docs/grammar.md index eaf616c73a1..ad59b6138d3 100644 --- a/docs/grammar.md +++ b/docs/grammar.md @@ -147,10 +147,10 @@ Short description: |date-predicate
equal-predicate(used by predicate-func)
(equals|==) sp predicate-value
not-equal-predicate(used by predicate-func)
(notEquals|!=) sp predicate-value
-
greater-predicate(used by predicate-func)
(greaterThan|>) sp (integer|float|quoted-string)
-
greater-or-equal-predicate(used by predicate-func)
(greaterThanOrEquals|>=) sp sp* (integer|float|quoted-string)
-
less-predicate(used by predicate-func)
(lessThan|<) sp (integer|float|quoted-string)
-
less-or-equal-predicate(used by predicate-func)
(lessThanOrEquals|<=) sp (integer|float|quoted-string)
+
greater-predicate(used by predicate-func)
(greaterThan|>) sp (number|quoted-string)
+
greater-or-equal-predicate(used by predicate-func)
(greaterThanOrEquals|>=) sp sp* (number|quoted-string)
+
less-predicate(used by predicate-func)
(lessThan|<) sp (number|quoted-string)
+
less-or-equal-predicate(used by predicate-func)
(lessThanOrEquals|<=) sp (number|quoted-string)
start-with-predicate(used by predicate-func)
startsWith sp (quoted-string|oneline-hex|oneline-base64)
end-with-predicate(used by predicate-func)
endsWith sp (quoted-string|oneline-hex|oneline-base64)
contain-predicate(used by predicate-func)
contains sp quoted-string
@@ -164,15 +164,14 @@ Short description:
string-predicate(used by predicate-func)
isString
collection-predicate(used by predicate-func)
isCollection
date-predicate(used by predicate-func)
isDate
-
predicate-value(used by equal-predicate, not-equal-predicate, include-predicate)
 null
-|boolean
-|integer
-|float
-|quoted-string
-|oneline-hex
+
predicate-value(used by equal-predicate, not-equal-predicate, include-predicate)
 boolean
+|multiline-string
+|null
+|number
|oneline-base64
|oneline-file
-|multiline-string
+|oneline-hex
+|quoted-string
|template

Bytes

bytes(used by body)
 json-value
|xml
@@ -185,7 +184,7 @@ Short description:
oneline-base64(used by start-with-predicate, end-with-predicate, predicate-value, bytes)
base64, [A-Z0-9+-= \n]+ ;
oneline-file(used by predicate-value, bytes)
file, filename ;
oneline-hex(used by start-with-predicate, end-with-predicate, predicate-value, bytes)
hex, hexdigit* ;
-

Strings

quoted-string(used by variable-value, header-query, cookie-query, xpath-query, jsonpath-query, regex-query, variable-query, greater-predicate, greater-or-equal-predicate, less-predicate, less-or-equal-predicate, start-with-predicate, end-with-predicate, contain-predicate, match-predicate, predicate-value, regex-filter, replace-filter, split-filter, xpath-filter)
" (quoted-string-content|template)* "
+

Strings

quoted-string(used by variable-value, header-query, cookie-query, xpath-query, jsonpath-query, regex-query, variable-query, greater-predicate, greater-or-equal-predicate, less-predicate, less-or-equal-predicate, start-with-predicate, end-with-predicate, contain-predicate, match-predicate, predicate-value, jsonpath-filter, regex-filter, replace-filter, split-filter, xpath-filter)
" (quoted-string-content|template)* "
quoted-string-content(used by quoted-string)
(quoted-string-text|quoted-string-escaped-char)*
quoted-string-text(used by quoted-string-content)
~["\\]+
quoted-string-escaped-char(used by quoted-string-content)
\ ("|\|\b|\f|\n|\r|\t|\u unicode-char)
@@ -242,6 +241,7 @@ Short description: |format-filter
|html-escape-filter
|html-unescape-filter
+|jsonpath-filter
|nth-filter
|regex-filter
|replace-filter
@@ -258,6 +258,7 @@ Short description:
format-filter(used by filter)
format
html-escape-filter(used by filter)
htmlEscape
html-unescape-filter(used by filter)
htmlUnescape
+
jsonpath-filter(used by filter)
jsonpath sp quoted-string
nth-filter(used by filter)
nth sp integer
regex-filter(used by filter)
regex sp (quoted-string|regex)
replace-filter(used by filter)
replace sp (quoted-string|regex) sp quoted-string
@@ -270,13 +271,14 @@ Short description:

Lexical Grammar

boolean(used by boolean-option, variable-value, predicate-value, json-value)
true|false
null(used by variable-value, predicate-value, json-value)
null
alphanum(used by key-string-text)
[A-Za-z0-9]
-
integer(used by integer-option, variable-value, greater-predicate, greater-or-equal-predicate, less-predicate, less-or-equal-predicate, predicate-value, json-number, nth-filter, float)
digit+
-
float(used by variable-value, greater-predicate, greater-or-equal-predicate, less-predicate, less-or-equal-predicate, predicate-value)
integer fraction
+
integer(used by integer-option, variable-value, json-number, nth-filter, float, number)
digit+
+
float(used by variable-value, number)
integer fraction
+
number(used by greater-predicate, greater-or-equal-predicate, less-predicate, less-or-equal-predicate, predicate-value)
integer|float
digit(used by integer, fraction, exponent)
[0-9]
hexdigit(used by oneline-hex, unicode-char, json-string-escaped-char)
[0-9A-Fa-f]
fraction(used by json-number, float)
. digit+
exponent(used by json-number)
(e|E) (+|-)? digit+
-
sp(used by request, response, capture, assert, header-query, certificate-query, cookie-query, xpath-query, jsonpath-query, regex-query, variable-query, predicate, equal-predicate, not-equal-predicate, greater-predicate, greater-or-equal-predicate, less-predicate, less-or-equal-predicate, start-with-predicate, end-with-predicate, contain-predicate, match-predicate, include-predicate, expr, nth-filter, regex-filter, replace-filter, split-filter, xpath-filter, lt)
[ \t]
+
sp(used by request, response, capture, assert, header-query, certificate-query, cookie-query, xpath-query, jsonpath-query, regex-query, variable-query, predicate, equal-predicate, not-equal-predicate, greater-predicate, greater-or-equal-predicate, less-predicate, less-or-equal-predicate, start-with-predicate, end-with-predicate, contain-predicate, match-predicate, include-predicate, expr, jsonpath-filter, nth-filter, regex-filter, replace-filter, split-filter, xpath-filter, lt)
[ \t]
lt(used by hurl-file, request, response, header, body, query-string-params-section, form-params-section, multipart-form-data-section, cookies-section, captures-section, asserts-section, basic-auth-section, options-section, file-param, capture, assert, option, ca-certificate-option, follow-redirect-option, insecure-option, max-redirs-option, resolve-option, retry-option, retry-interval-option, variable-option, verbose-option, very-verbose-option, multiline-string)
sp* comment? [\n]?
comment(used by lt)
# ~[\n]*
regex(used by regex-query, match-predicate, regex-filter, replace-filter)
/ regex-content /
diff --git a/docs/spec/grammar/hurl.grammar b/docs/spec/grammar/hurl.grammar index 327b926aa9c..bfef5987a88 100644 --- a/docs/spec/grammar/hurl.grammar +++ b/docs/spec/grammar/hurl.grammar @@ -238,13 +238,13 @@ equal-predicate: ("equals" | "==") sp predicate-value not-equal-predicate: ("notEquals" | "!=") sp predicate-value -greater-predicate: ("greaterThan" | ">") sp (integer | float | quoted-string) +greater-predicate: ("greaterThan" | ">") sp (number | quoted-string) -greater-or-equal-predicate: ("greaterThanOrEquals" | ">=") sp sp* (integer | float | quoted-string) +greater-or-equal-predicate: ("greaterThanOrEquals" | ">=") sp sp* (number | quoted-string) -less-predicate: ("lessThan" | "<") sp (integer | float | quoted-string) +less-predicate: ("lessThan" | "<") sp (number | quoted-string) -less-or-equal-predicate: ("lessThanOrEquals" | "<=") sp (integer | float | quoted-string) +less-or-equal-predicate: ("lessThanOrEquals" | "<=") sp (number | quoted-string) start-with-predicate: "startsWith" sp (quoted-string | oneline-hex | oneline-base64) @@ -273,15 +273,14 @@ collection-predicate: "isCollection" date-predicate: "isDate" predicate-value: - null - | boolean - | integer - | float - | quoted-string - | oneline-hex + boolean + | multiline-string + | null + | number | oneline-base64 | oneline-file - | multiline-string + | oneline-hex + | quoted-string | template @@ -424,7 +423,7 @@ filter: | format-filter | html-escape-filter | html-unescape-filter - | json-filter + | jsonpath-filter | nth-filter | regex-filter | replace-filter @@ -449,6 +448,8 @@ html-escape-filter: "htmlEscape" html-unescape-filter: "htmlUnescape" +jsonpath-filter: "jsonpath" sp quoted-string + nth-filter: "nth" sp integer regex-filter: "regex" sp (quoted-string | regex) @@ -480,6 +481,8 @@ integer: digit+ float: integer fraction +number: integer | float + digit: [0-9] hexdigit: [0-9A-Fa-f] diff --git a/packages/hurl_core/src/ast/core.rs b/packages/hurl_core/src/ast/core.rs index ada740d6673..1a5370f9960 100644 --- a/packages/hurl_core/src/ast/core.rs +++ b/packages/hurl_core/src/ast/core.rs @@ -412,15 +412,15 @@ pub struct PredicateFunc { #[derive(Clone, Debug, PartialEq, Eq)] #[allow(clippy::large_enum_variant)] pub enum PredicateValue { - String(Template), - MultilineString(MultilineString), - Number(Number), - Bool(bool), - Null, - Hex(Hex), Base64(Base64), + Bool(bool), Expression(Expr), + Hex(Hex), + MultilineString(MultilineString), + Null, + Number(Number), Regex(Regex), + String(Template), } #[derive(Clone, Debug, PartialEq, Eq)]