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

parser: disable the duplicate import check for now

pull/5958/head
Alexander Medvednikov 2020-07-23 22:20:00 +02:00
parent 653d40bfe8
commit 32c1042ac6
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vlib/v/parser/parser.v
View File

@ -812,8 +812,7 @@ fn (mut p Parser) parse_multi_expr(is_top_level bool) ast.Stmt {
return p.partial_assign_stmt(left, left_comments) return p.partial_assign_stmt(left, left_comments)
} else if is_top_level && tok.kind !in [.key_if, .key_match, .key_lock, .key_rlock] && } else if is_top_level && tok.kind !in [.key_if, .key_match, .key_lock, .key_rlock] &&
left0 !is ast.CallExpr && left0 !is ast.PostfixExpr && !(left0 is ast.InfixExpr && left0 !is ast.CallExpr && left0 !is ast.PostfixExpr && !(left0 is ast.InfixExpr &&
(left0 as ast.InfixExpr).op == .left_shift) && (left0 as ast.InfixExpr).op == .left_shift) && left0 !is ast.ComptimeCall {
left0 !is ast.ComptimeCall {
p.error_with_pos('expression evaluated but not used', left0.position()) p.error_with_pos('expression evaluated but not used', left0.position())
} }
if left.len == 1 { if left.len == 1 {
@ -960,8 +959,8 @@ pub fn (mut p Parser) name_expr() ast.Expr {
// type cast. TODO: finish // type cast. TODO: finish
// if name in table.builtin_type_names { // if name in table.builtin_type_names {
if (!known_var && (name in p.table.type_idxs || if (!known_var && (name in p.table.type_idxs ||
name_w_mod in p.table.type_idxs) && name_w_mod in p.table.type_idxs) && name !in ['C.stat', 'C.sigaction']) ||
name !in ['C.stat', 'C.sigaction']) || is_mod_cast { is_mod_cast {
// TODO handle C.stat() // TODO handle C.stat()
mut to_typ := p.parse_type() mut to_typ := p.parse_type()
if p.is_amp { if p.is_amp {
@ -995,8 +994,8 @@ pub fn (mut p Parser) name_expr() ast.Expr {
node = p.call_expr(language, mod) node = p.call_expr(language, mod)
} }
} else if (p.peek_tok.kind == .lcbr || } else if (p.peek_tok.kind == .lcbr ||
(p.peek_tok.kind == .lt && lit0_is_capital)) && !p.inside_match && !p.inside_match_case && (p.peek_tok.kind == .lt && lit0_is_capital)) &&
!p.inside_if && !p.inside_for { // && (p.tok.lit[0].is_capital() || p.builtin_mod) { !p.inside_match && !p.inside_match_case && !p.inside_if && !p.inside_for { // && (p.tok.lit[0].is_capital() || p.builtin_mod) {
return p.struct_init(false) // short_syntax: false return p.struct_init(false) // short_syntax: false
} else if p.peek_tok.kind == .dot && (lit0_is_capital && !known_var && language == .v) { } else if p.peek_tok.kind == .dot && (lit0_is_capital && !known_var && language == .v) {
// `Color.green` // `Color.green`
@ -1398,10 +1397,10 @@ fn (mut p Parser) import_stmt() ast.Import {
} }
} }
p.imports[mod_alias] = mod_name p.imports[mod_alias] = mod_name
if mod_name !in p.table.imports { // if mod_name !in p.table.imports {
p.table.imports << mod_name p.table.imports << mod_name
p.ast_imports << node p.ast_imports << node
} // }
return node return node
} }
@ -1548,8 +1547,7 @@ const (
// left hand side of `=` or `:=` in `a,b,c := 1,2,3` // left hand side of `=` or `:=` in `a,b,c := 1,2,3`
fn (mut p Parser) global_decl() ast.GlobalDecl { fn (mut p Parser) global_decl() ast.GlobalDecl {
if !p.pref.translated && !p.pref.is_livemain && !p.builtin_mod && !p.pref.building_v && if !p.pref.translated && !p.pref.is_livemain && !p.builtin_mod && !p.pref.building_v &&
p.mod != 'ui' && p.mod != 'gg2' && p.mod != 'ui' && p.mod != 'gg2' && p.mod != 'uiold' && !p.pref.enable_globals && !p.pref.is_fmt &&
p.mod != 'uiold' && !p.pref.enable_globals && !p.pref.is_fmt &&
p.mod !in global_enabled_mods { p.mod !in global_enabled_mods {
p.error('use `v --enable-globals ...` to enable globals') p.error('use `v --enable-globals ...` to enable globals')
} }