Remove url-specific parser (align with grammar)

integration/hurl/tests_error_parser/parallel_parsing_error.err

@@ -1,7 +1,7 @@
-error: Parsing URL
-  --> tests_error_parser/parallel_parsing_error_c.hurl:4:5
+error: Parsing space
+  --> tests_error_parser/parallel_parsing_error_c.hurl:4:4
    |
- 4 | GET //localhost:8000/hello
-   |     ^ expecting http://, https:// or {{
+ 4 | GET//localhost:8000/hello
+   |    ^ expecting a space
    |
 

integration/hurl/tests_error_parser/parallel_parsing_error_c.hurl

@@ -1,7 +1,7 @@
 GET http://localhost:8000/hello
 HTTP 200
 
-GET //localhost:8000/hello
+GET//localhost:8000/hello
 HTTP 200
 
 GET http://localhost:8000/hello

integration/hurl/tests_ok/querystring_params.curl

@@ -1,7 +1,7 @@
-curl 'http://localhost:8000/querystring-params?param1=value1&param2=&param3=a%3Db&param4=1%2C2%2C3&$top=5'
-curl 'http://localhost:8000/querystring-params?param1=value1&param2=&param3=a%3Db&param4=1%2C2%2C3&$top=5'
-curl 'http://localhost:8000/querystring-params?param1=value1&param2=&param3=a%3db&param4=1,2,3&$top=5'
-curl 'http://localhost:8000/querystring-params?param1=value1&param2=&param3=a%3Db&param4=1%2C2%2C3&$top=5'
-curl 'http://localhost:8000/querystring-params?param1=value1&param2=&param3=a%3Db&param4=1%2C2%2C3&$top=5'
+curl 'http://localhost:8000/querystring-params?param1=value1&param2=&param3=a%3Db&param4=1%2C2%2C3&param5=\{bar\}&$top=5'
+curl 'http://localhost:8000/querystring-params?param1=value1&param2=&param3=a%3Db&param4=1%2C2%2C3&param5=\{bar\}&$top=5'
+curl 'http://localhost:8000/querystring-params?param1=value1&param2=&param3=a%3db&param4=1,2,3&param5=\{bar\}&$top=5'
+curl 'http://localhost:8000/querystring-params?param1=value1&param2=&param3=a%3Db&param4=1%2C2%2C3&param5=\{bar\}&$top=5'
+curl 'http://localhost:8000/querystring-params?param1=value1&param2=&param3=a%3Db&param4=1%2C2%2C3&param5=\{bar\}&$top=5'
 curl 'http://localhost:8000/querystring-params-encoded?value1=/&value2=%2F&value3=%2F'
 curl 'http://localhost:8000/querystring-params-encoded?value1=/&value2=%2F&value3=%2F'

integration/hurl/tests_ok/querystring_params.hurl

@@ -4,6 +4,7 @@ param1: value1
 param2:
 param3: a=b
 param4: 1,2,3
+param5: {bar}
 $top: 5
 HTTP 200
 
@@ -14,12 +15,13 @@ param1: value1
 param2:
 param3: a=b
 param4: 1,2,3
+param5: {bar}
 $top: 5
 HTTP 200
 
 
 # Same version as raw
-GET http://localhost:8000/querystring-params?param1=value1&param2=&param3=a%3db&param4=1,2,3&$top=5
+GET http://localhost:8000/querystring-params?param1=value1&param2=&param3=a%3db&param4=1,2,3&param5={bar}&$top=5
 HTTP 200
 
 
@@ -29,11 +31,12 @@ GET http://localhost:8000/querystring-params?param1=value1
 param2:
 param3: a=b
 param4: 1,2,3
+param5: {bar}
 $top: 5
 HTTP 200
 
 
-GET http://localhost:8000/querystring-params?param1=value1
+GET http://localhost:8000/querystring-params?param1=value1&param5={bar}
 [Query]
 param2:
 param3: a=b

integration/hurl/tests_ok/querystring_params.py

@@ -8,6 +8,7 @@ def querystring_params():
     assert request.args.get("param2") == ""
     assert request.args.get("param3") == "a=b"
     assert request.args.get("param4") == "1,2,3"
+    assert request.args.get("param5") == "{bar}"
     assert request.args.get("$top") == "5"
     return ""
 

integration/hurlfmt/tests_export/url.html

@@ -1,6 +1,5 @@
 <pre><code class="language-hurl"><span class="hurl-entry"><span class="request"><span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/~user</span></span>
 </span></span><span class="hurl-entry"><span class="request"><span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/%7Euser</span></span>
 </span></span><span class="hurl-entry"><span class="request"><span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/!$&amp;()*+,;=:@[]</span></span>
-</span></span><span class="line"></span>
-<span class="line"></span>
-</code></pre>
+</span></span><span class="hurl-entry"><span class="request"><span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000?foo={bar}</span></span>
+</span></span></code></pre>

integration/hurlfmt/tests_export/url.hurl

@@ -1,5 +1,4 @@
 GET http://localhost:8000/~user
 GET http://localhost:8000/%7Euser
 GET http://localhost:8000/!$&()*+,;=:@[]
-
-
+GET http://localhost:8000?foo={bar}

integration/hurlfmt/tests_export/url.json

@@ -1 +1 @@
-{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/~user"}},{"request":{"method":"GET","url":"http://localhost:8000/%7Euser"}},{"request":{"method":"GET","url":"http://localhost:8000/!$&()*+,;=:@[]"}}]}
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/~user"}},{"request":{"method":"GET","url":"http://localhost:8000/%7Euser"}},{"request":{"method":"GET","url":"http://localhost:8000/!$&()*+,;=:@[]"}},{"request":{"method":"GET","url":"http://localhost:8000?foo={bar}"}}]}

integration/hurlfmt/tests_export/url.lint.hurl

@@ -1,5 +1,4 @@
 GET http://localhost:8000/~user
 GET http://localhost:8000/%7Euser
 GET http://localhost:8000/!$&()*+,;=:@[]
-
-
+GET http://localhost:8000?foo={bar}

packages/hurl_core/src/parser/mod.rs

@@ -53,5 +53,4 @@ mod query;
 mod sections;
 mod string;
 mod template;
-mod url;
 mod xml;

packages/hurl_core/src/parser/parsers.rs

@@ -23,10 +23,11 @@ use crate::parser::error::*;
 use crate::parser::number::natural;
 use crate::parser::primitives::*;
 use crate::parser::sections::*;
-use crate::parser::url::url;
 use crate::parser::ParseResult;
 use crate::reader::Reader;
 
+use super::string::unquoted_template;
+
 pub fn hurl_file(reader: &mut Reader) -> ParseResult<HurlFile> {
     let entries = zero_or_more(entry, reader)?;
     let line_terminators = optional_line_terminators(reader)?;
@@ -52,8 +53,7 @@ fn request(reader: &mut Reader) -> ParseResult<Request> {
     let space0 = zero_or_more_spaces(reader)?;
     let m = method(reader)?;
     let space1 = one_or_more_spaces(reader)?;
-    let u = url(reader)?;
-
+    let url = unquoted_template(reader)?;
     let line_terminator0 = line_terminator(reader)?;
     let headers = zero_or_more(key_value, reader)?;
     let sections = request_sections(reader)?;
@@ -79,7 +79,7 @@ fn request(reader: &mut Reader) -> ParseResult<Request> {
         space0,
         method: m,
         space1,
-        url: u,
+        url,
         line_terminator0,
         headers,
         sections,