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

parser: fix a +1 bug when skipping function body

pull/1820/head
Alexander Medvednikov 2019-09-02 13:40:57 +03:00
parent 33ae7520e7
commit b667940c68
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/fn.v
View File

@ -358,7 +358,6 @@ fn (p mut Parser) fn_decl() {
if p.tok == .rcbr { if p.tok == .rcbr {
closed_scopes++ closed_scopes++
} }
p.next()
// find `foo<Bar>()` in function bodies and register generic types // find `foo<Bar>()` in function bodies and register generic types
// TODO remove this once tokens are cached // TODO remove this once tokens are cached
if p.tok == .gt && p.prev_tok == .name && p.prev_tok2 == .lt && if p.tok == .gt && p.prev_tok == .name && p.prev_tok2 == .lt &&
@ -376,7 +375,7 @@ fn (p mut Parser) fn_decl() {
p.name_expr() p.name_expr()
p.scanner.pos = temp_scanner_pos p.scanner.pos = temp_scanner_pos
} }
if p.tok.is_decl() && !(p.prev_tok == .dot && p.tok == .key_type) { if p.tok.is_decl() {
break break
} }
// fn body ended, and a new fn attribute declaration like [live] is starting? // fn body ended, and a new fn attribute declaration like [live] is starting?
@ -385,6 +384,7 @@ fn (p mut Parser) fn_decl() {
break break
} }
} }
p.next()
} }
} }
// Live code reloading? Load all fns from .so // Live code reloading? Load all fns from .so
@ -485,7 +485,6 @@ _thread_so = CreateThread(0, 0, (LPTHREAD_START_ROUTINE)&reload_so, 0, 0, 0);
// p.error('unclosed {') // p.error('unclosed {')
} }
// Make sure all vars in this function are used (only in main for now) // Make sure all vars in this function are used (only in main for now)
// if p.builtin_mod || p.mod == 'os' ||p.mod=='http'{
if p.mod != 'main' { if p.mod != 'main' {
if !is_generic { if !is_generic {
p.genln('}') p.genln('}')