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

parser: disallow or{} block for non-optionals

Browse Source
This commit is contained in:
Simon Heuser 2019-10-12 16:53:53 +02:00 committed by Alexander Medvednikov
parent 336e82d162
commit 85c05b6822
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/gen_c.v
View File

@ -29,6 +29,9 @@ fn (p mut Parser) gen_var_decl(name string, is_static bool) string {
// p.assigned_var = '' // p.assigned_var = ''
p.cgen.set_placeholder(pos, '$typ $tmp = ') p.cgen.set_placeholder(pos, '$typ $tmp = ')
p.genln(';') p.genln(';')
if !typ.starts_with('Option_') {
p.error('`or` block cannot be applied to non-optional type')
}
typ = typ.replace('Option_', '') typ = typ.replace('Option_', '')
p.next() p.next()
p.check(.lcbr) p.check(.lcbr)

8
compiler/tests/option_test.v
View File

@ -31,8 +31,12 @@ fn test_option_for_base_type_without_variable() {
println('yep') println('yep')
return return
} }
println('nice') println('$val2 should have been `none`')
println(val2) assert false
// This is invalid:
// x := 5 or {
// return
// }
} }
fn test_if_opt() { fn test_if_opt() {