vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

Prevent main function form returning value

pull/1160/head
d2verb 2019-07-15 23:32:35 +09:00 committed by Alexander Medvednikov
parent 40ad868f22
commit 4020a3ab8c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/parser.v
View File

@ -3087,12 +3087,6 @@ fn (p mut Parser) return_st() {
p.cgen.insert_before(p.cur_fn.defer) p.cgen.insert_before(p.cur_fn.defer)
p.check(.key_return) p.check(.key_return)
if p.cur_fn.name == 'main' {
p.gen('return 0')
p.returns = true
return
}
fn_returns := p.cur_fn.typ != 'void' fn_returns := p.cur_fn.typ != 'void'
if fn_returns { if fn_returns {
if p.tok == .rcbr { if p.tok == .rcbr {
@ -3118,12 +3112,17 @@ fn (p mut Parser) return_st() {
} }
else { else {
// Don't allow `return val` in functions that don't return anything // Don't allow `return val` in functions that don't return anything
// if p.tok != .rcbr && p.tok != .hash {
if false && p.tok == .name || p.tok == .integer { if false && p.tok == .name || p.tok == .integer {
p.error('function `$p.cur_fn.name` does not return a value') p.error('function `$p.cur_fn.name` does not return a value')
} }
if p.cur_fn.name == 'main' {
p.gen('return 0')
}
else {
p.gen('return') p.gen('return')
} }
}
p.returns = true p.returns = true
} }