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

checker: remove redundant 'c.expected_type = ast.void_type' (#13687)

pull/13701/head
yuyi 2022-03-09 18:33:23 +08:00 committed by GitHub
parent d5b087de10
commit 6c7243f2f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vlib/v/checker/checker.v
View File

@ -2397,19 +2397,16 @@ fn (mut c Checker) stmts(stmts []ast.Stmt) {
fn (mut c Checker) stmts_ending_with_expression(stmts []ast.Stmt) { fn (mut c Checker) stmts_ending_with_expression(stmts []ast.Stmt) {
if stmts.len == 0 { if stmts.len == 0 {
c.scope_returns = false c.scope_returns = false
c.expected_type = ast.void_type
return return
} }
if c.stmt_level > checker.stmt_level_cutoff_limit { if c.stmt_level > checker.stmt_level_cutoff_limit {
c.scope_returns = false c.scope_returns = false
c.expected_type = ast.void_type
c.error('checker: too many stmt levels: $c.stmt_level ', stmts[0].pos) c.error('checker: too many stmt levels: $c.stmt_level ', stmts[0].pos)
return return
} }
mut unreachable := token.Pos{ mut unreachable := token.Pos{
line_nr: -1 line_nr: -1
} }
c.expected_type = ast.void_type
c.stmt_level++ c.stmt_level++
for i, stmt in stmts { for i, stmt in stmts {
c.is_last_stmt = i == stmts.len - 1 c.is_last_stmt = i == stmts.len - 1
@ -2435,7 +2432,6 @@ fn (mut c Checker) stmts_ending_with_expression(stmts []ast.Stmt) {
} }
c.find_unreachable_statements_after_noreturn_calls(stmts) c.find_unreachable_statements_after_noreturn_calls(stmts)
c.scope_returns = false c.scope_returns = false
c.expected_type = ast.void_type
} }
pub fn (mut c Checker) unwrap_generic(typ ast.Type) ast.Type { pub fn (mut c Checker) unwrap_generic(typ ast.Type) ast.Type {