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: fix infnite loop with fn foo(&) {}

Browse Source
This commit is contained in:
Alexander Medvednikov 2019-11-30 10:21:58 +03:00
parent d71532b64e
commit c00a7f3a5e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vlib/compiler/fn.v
View File

@ -331,7 +331,8 @@ fn (p mut Parser) fn_decl() {
// `os.exit()` ==> `os__exit()` // `os.exit()` ==> `os__exit()`
// if !is_c && !p.builtin_mod && receiver_typ.len == 0 { // if !is_c && !p.builtin_mod && receiver_typ.len == 0 {
if !is_c && !has_receiver && if !is_c && !has_receiver &&
(!p.builtin_mod || (p.builtin_mod && f.name == 'init')) { (!p.builtin_mod || (p.builtin_mod && f.name == 'init'))
{
f.name = p.prepend_mod(f.name) f.name = p.prepend_mod(f.name)
} }
if p.first_pass() && receiver_typ.len == 0 { if p.first_pass() && receiver_typ.len == 0 {
@ -408,7 +409,7 @@ fn (p mut Parser) fn_decl() {
if f.name == 'main__main' && !has_receiver { if f.name == 'main__main' && !has_receiver {
if p.pref.x64 && !p.first_pass() { if p.pref.x64 && !p.first_pass() {
p.x64.save_main_fn_addr() p.x64.save_main_fn_addr()
} }
if str_args != '' || typ != 'void' { if str_args != '' || typ != 'void' {
p.error_with_token_index('fn main must have no arguments and no return values', f.fn_name_token_idx) p.error_with_token_index('fn main must have no arguments and no return values', f.fn_name_token_idx)
} }
@ -528,7 +529,7 @@ fn (p mut Parser) fn_decl() {
} }
if p.pref.x64 { if p.pref.x64 {
p.x64.register_function_address(f.name) p.x64.register_function_address(f.name)
} }
p.statements_no_rcbr() p.statements_no_rcbr()
//p.cgen.nogen = false //p.cgen.nogen = false
// Print counting result after all statements in main // Print counting result after all statements in main
@ -548,7 +549,7 @@ fn (p mut Parser) fn_decl() {
} }
if p.pref.x64 && f.name == 'main__main' && !p.first_pass() { if p.pref.x64 && f.name == 'main__main' && !p.first_pass() {
p.x64.gen_exit() p.x64.gen_exit()
} }
if p.pref.x64 && !p.first_pass() { if p.pref.x64 && !p.first_pass() {
p.x64.ret() p.x64.ret()
} }
@ -568,7 +569,7 @@ fn (p mut Parser) fn_decl() {
p.check_unused_variables() p.check_unused_variables()
p.set_current_fn( EmptyFn ) p.set_current_fn( EmptyFn )
p.returns = false p.returns = false
} }
[inline] [inline]
@ -731,7 +732,7 @@ fn (p mut Parser) fn_call(f mut Fn, method_ph int, receiver_var, receiver_type s
} }
if p.pref.x64 && !p.first_pass() { if p.pref.x64 && !p.first_pass() {
p.x64.call_fn(f.name) p.x64.call_fn(f.name)
} }
p.calling_c = f.is_c p.calling_c = f.is_c
if f.is_c && !p.builtin_mod { if f.is_c && !p.builtin_mod {
if f.name == 'free' { if f.name == 'free' {
@ -848,6 +849,9 @@ fn (p mut Parser) fn_args(f mut Fn) {
if types_only { if types_only {
for p.tok != .rpar { for p.tok != .rpar {
typ := p.get_type() typ := p.get_type()
if typ == '' && !f.is_c {
p.error('bad fn arg type')
}
p.check_and_register_used_imported_type(typ) p.check_and_register_used_imported_type(typ)
v := Var { v := Var {
typ: typ typ: typ
@ -1029,7 +1033,7 @@ fn (p mut Parser) fn_call_args(f mut Fn) {
} }
} }
p.expected_type = arg.typ p.expected_type = arg.typ
clone := p.pref.autofree && p.mod != 'string' && arg.typ == 'string' && clone := p.pref.autofree && p.mod != 'string' && arg.typ == 'string' &&
!p.builtin_mod //&& arg.is_moved !p.builtin_mod //&& arg.is_moved
if clone { if clone {
p.gen('/*YY f=$f.name arg=$arg.name is_moved=$arg.is_moved*/string_clone(') p.gen('/*YY f=$f.name arg=$arg.name is_moved=$arg.is_moved*/string_clone(')