mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

fix urllib_test.v

Browse Source
This commit is contained in:
Alexander Medvednikov 2019-09-09 14:21:18 +03:00
parent 00687de43b
commit 7fc678c961
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/parser.v
View File

@ -1056,7 +1056,7 @@ fn (p mut Parser) close_scope() {
break break
} }
// Clean up memory, only do this for V compiler for now // Clean up memory, only do this for V compiler for now
if p.pref.building_v && v.is_alloc { if p.pref.building_v && v.is_alloc && !p.pref.is_test {
if v.typ.starts_with('array_') { if v.typ.starts_with('array_') {
//if false && p.returns { //if false && p.returns {
if p.returns { if p.returns {

22
vlib/net/urllib/urllib.v
View File

@ -1,10 +1,6 @@
// Copyright (c) 2019 Alexander Medvednikov. All rights reserved. // urllib parses URLs and implements query escaping.
// Use of this source code is governed by an MIT license
// that can be found in the LICENSE file.
// Package url parses URLs and implements query escaping. // See RFC 3986. This module generally follows RFC 3986, except where
// See RFC 3986. This package generally follows RFC 3986, except where
// it deviates for compatibility reasons. // it deviates for compatibility reasons.
// Based off: https://github.com/golang/go/blob/master/src/net/url/url.go // Based off: https://github.com/golang/go/blob/master/src/net/url/url.go
@ -143,7 +139,7 @@ pub fn path_unescape(s string) ?string {
// unescape unescapes a string; the mode specifies // unescape unescapes a string; the mode specifies
// which section of the URL string is being unescaped. // which section of the URL string is being unescaped.
fn unescape(s_ string, mode EncodingMode) ?string { fn unescape(s_ string, mode EncodingMode) ?string {
mut s := s_ mut s := s_
// Count %, check that they're well-formed. // Count %, check that they're well-formed.
mut n := 0 mut n := 0
mut has_plus := false mut has_plus := false
@ -153,7 +149,7 @@ fn unescape(s_ string, mode EncodingMode) ?string {
case `%`: case `%`:
if s == '' { if s == '' {
break break
} }
n++ n++
if i+2 >= s.len || !ishex(s[i+1]) || !ishex(s[i+2]) { if i+2 >= s.len || !ishex(s[i+1]) || !ishex(s[i+2]) {
s = s.right(i) s = s.right(i)
@ -554,7 +550,7 @@ fn parse_authority(authority string) ?ParseAuthorityRes {
} else { } else {
h := parse_host(authority.right(i+1)) or { h := parse_host(authority.right(i+1)) or {
return error(err) return error(err)
} }
host = h host = h
} }
if i < 0 { if i < 0 {
@ -628,7 +624,7 @@ fn parse_host(host string) ?string {
if i != -1 { if i != -1 {
colon_port = host.right(i) colon_port = host.right(i)
if !valid_optional_port(colon_port) { if !valid_optional_port(colon_port) {
return error(error_msg('invalid port $colon_port after host ', '')) return error(error_msg('invalid port $colon_port after host ', ''))
} }
} }
} }
@ -637,7 +633,7 @@ fn parse_host(host string) ?string {
h := unescape(host, .encode_host) or { h := unescape(host, .encode_host) or {
return err return err
} }
return h return h
//host = h //host = h
//return host //return host
} }
@ -694,7 +690,7 @@ fn valid_encoded_path(s string) bool {
// should_escape is not quite compliant with the RFC, // should_escape is not quite compliant with the RFC,
// so we check the sub-delims ourselves and let // so we check the sub-delims ourselves and let
// should_escape handle the others. // should_escape handle the others.
x := s[i] x := s[i]
switch x { switch x {
case `!`, `$`, `&`, `\\`, `(`, `)`, `*`, `+`, `,`, `;`, `=`, `:`, `@`: case `!`, `$`, `&`, `\\`, `(`, `)`, `*`, `+`, `,`, `;`, `=`, `:`, `@`:
// ok // ok
@ -823,7 +819,7 @@ pub fn parse_query(query string) ?Values {
} }
// parse_query_silent is the same as parse_query // parse_query_silent is the same as parse_query
// but any errors will be silent // but any errors will be silent
fn parse_query_silent(query string) Values { fn parse_query_silent(query string) Values {
mut m := new_values() mut m := new_values()
_ := _parse_query(mut m, query) _ := _parse_query(mut m, query)