parser: fix unreachable code error in if a := opt()

pull/2940/head
Alexander Medvednikov 2019-11-30 15:17:27 +03:00
parent 81d4f66fbb
commit 2651b8957a
2 changed files with 9 additions and 10 deletions

View File

@ -2663,6 +2663,7 @@ fn (p mut Parser) if_st(is_expr bool, elif_depth int) string {
//token_idx: var_token_idx
})
p.statements()
p.returns = false
return 'void'
} else {
p.check_types(p.bool_expression(), 'bool')

View File

@ -626,17 +626,15 @@ fn parse_host(host string) ?string {
return err
}
return host1 + host2 + host3
} else {
i = host.last_index(':')
if i != -1 {
colon_port = host[i..]
if !valid_optional_port(colon_port) {
return error(error_msg('parse_host: invalid port $colon_port after host ', ''))
}
}
i = host.last_index(':')
if i != -1 {
colon_port = host[i..]
if !valid_optional_port(colon_port) {
return error(error_msg('parse_host: invalid port $colon_port after host ', ''))
}
}
}
h := unescape(host, .encode_host) or {
return err
}
@ -852,8 +850,8 @@ fn parse_query_values(m mut Values, query string) ?bool {
continue
}
mut value := ''
i = key.index('=')
if i >= 0 {
if idx := key.index('=') {
i = idx
value = key[i+1..]
key = key[..i]
}