From 81762447b89dc1070fe19f750828f7bdb4df6808 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Amiel Date: Tue, 25 Jun 2024 10:40:39 +0200 Subject: [PATCH] Update grammar. --- docs/grammar.md | 8 +++++--- docs/spec/grammar/hurl.grammar | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/grammar.md b/docs/grammar.md index 9c88b6899..df33807d9 100644 --- a/docs/grammar.md +++ b/docs/grammar.md @@ -77,7 +77,7 @@ Short description:
assert(used by asserts-section)
lt*
query (sp filter)* sp predicate lt
option(used by options-section)
lt*
-(aws-sigv4-option|ca-certificate-option|client-certificate-option|client-key-option|compressed-option|connect-to-option|delay-option|follow-redirect-option|follow-redirect-trusted-option|http10-option|http11-option|http2-option|http3-option|insecure-option|ipv4-option|ipv6-option|max-redirs-option|netrc-option|netrc-file-option|netrc-optional-option|output-option|path-as-is-option|proxy-option|resolve-option|retry-option|retry-interval-option|skip-option|unix-socket-option|user-option|variable-option|verbose-option|very-verbose-option)
+(aws-sigv4-option|ca-certificate-option|client-certificate-option|client-key-option|compressed-option|connect-to-option|delay-option|follow-redirect-option|follow-redirect-trusted-option|http10-option|http11-option|http2-option|http3-option|insecure-option|ipv4-option|ipv6-option|max-redirs-option|netrc-option|netrc-file-option|netrc-optional-option|output-option|path-as-is-option|proxy-option|repeat-option|resolve-option|retry-option|retry-interval-option|skip-option|unix-socket-option|user-option|variable-option|verbose-option|very-verbose-option)
aws-sigv4-option(used by option)
aws-sigv4 : value-string lt
ca-certificate-option(used by option)
cacert : filename lt
client-certificate-option(used by option)
cert : filename-password lt
@@ -102,6 +102,7 @@ Short description:
path-as-is-option(used by option)
path-as-is : boolean-option lt
proxy-option(used by option)
proxy : value-string lt
resolve-option(used by option)
resolve : value-string lt
+
repeat-option(used by option)
repeat : integer-option lt
retry-option(used by option)
retry : integer-option lt
retry-interval-option(used by option)
retry-interval : integer-option lt
skip-option(used by option)
skip : boolean-option lt
@@ -112,7 +113,7 @@ Short description:
very-verbose-option(used by option)
very-verbose : boolean-option lt
variable-definition(used by variable-option)
variable-name = variable-value
boolean-option(used by compressed-option, follow-redirect-option, follow-redirect-trusted-option, http10-option, http11-option, http2-option, http3-option, insecure-option, ipv4-option, ipv6-option, netrc-option, netrc-optional-option, path-as-is-option, skip-option, verbose-option, very-verbose-option)
boolean|template
-
integer-option(used by delay-option, max-redirs-option, retry-option, retry-interval-option)
integer|template
+
integer-option(used by delay-option, max-redirs-option, repeat-option, retry-option, retry-interval-option)
integer|template
variable-value(used by variable-definition)
 null
|boolean
|integer
@@ -275,6 +276,7 @@ Short description: |replace-filter
|split-filter
|to-date-filter
+|to-float-filter
|to-int-filter
|url-decode-filter
|url-encode-filter
@@ -308,7 +310,7 @@ Short description:
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, 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, aws-sigv4-option, ca-certificate-option, client-certificate-option, client-key-option, compressed-option, connect-to-option, delay-option, follow-redirect-option, follow-redirect-trusted-option, http10-option, http11-option, http2-option, http3-option, insecure-option, ipv4-option, ipv6-option, max-redirs-option, netrc-option, netrc-file-option, netrc-optional-option, output-option, path-as-is-option, proxy-option, resolve-option, retry-option, retry-interval-option, skip-option, unix-socket-option, user-option, variable-option, verbose-option, very-verbose-option, multiline-string)
sp* comment? [\n]?
+
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, aws-sigv4-option, ca-certificate-option, client-certificate-option, client-key-option, compressed-option, connect-to-option, delay-option, follow-redirect-option, follow-redirect-trusted-option, http10-option, http11-option, http2-option, http3-option, insecure-option, ipv4-option, ipv6-option, max-redirs-option, netrc-option, netrc-file-option, netrc-optional-option, output-option, path-as-is-option, proxy-option, resolve-option, repeat-option, retry-option, retry-interval-option, skip-option, unix-socket-option, user-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 /
regex-content(used by regex)
(regex-text|regex-escaped-char)*
diff --git a/docs/spec/grammar/hurl.grammar b/docs/spec/grammar/hurl.grammar index f7906a142..5cc61c4f6 100644 --- a/docs/spec/grammar/hurl.grammar +++ b/docs/spec/grammar/hurl.grammar @@ -139,6 +139,7 @@ option: | output-option | path-as-is-option | proxy-option + | repeat-option | resolve-option | retry-option | retry-interval-option @@ -198,6 +199,8 @@ proxy-option: "proxy" ":" value-string lt resolve-option: "resolve" ":" value-string lt +repeat-option: "repeat" ":" integer-option lt + retry-option: "retry" ":" integer-option lt retry-interval-option: "retry-interval" ":" integer-option lt @@ -506,6 +509,7 @@ filter: | replace-filter | split-filter | to-date-filter + | to-float-filter | to-int-filter | url-decode-filter | url-encode-filter