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

v2: map / string / builtin type fixes

Browse Source
This commit is contained in:
joe-conigliaro
2020-02-09 02:59:57 +11:00
committed by GitHub
parent c2f22a4bf3
commit a2d2586331
5 changed files with 88 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
vlib/v/parser/parse_type.v
View File

@@ -31,16 +31,18 @@ pub fn (p mut Parser) parse_array_ti(nr_muls int) table.TypeRef {
}
pub fn (p mut Parser) parse_map_type(nr_muls int) table.TypeRef {
if p.tok.kind != .lsbr {
// check notes in table/atypes.v near map_type_idx
return p.table.type_ref(p.table.type_idxs['map'])
}
p.next()
if p.tok.kind != .lsbr {
return p.table.type_ref(table.map_type_idx)
}
p.check(.lsbr)
key_ti := p.parse_type()
key_type := p.parse_type()
if key_type.typ.kind != .string {
p.error('maps can only have string keys for now')
}
p.check(.rsbr)
value_ti := p.parse_type()
idx := p.table.find_or_register_map(key_ti, value_ti)
value_type := p.parse_type()
idx := p.table.find_or_register_map(key_type, value_type)
return p.table.type_ref_ptr(idx, nr_muls)
}
@@ -99,13 +101,14 @@ pub fn (p mut Parser) parse_type() table.TypeRef {
return p.parse_multi_return_ti()
}
else {
// no defer
if name == 'map' {
return p.parse_map_type(nr_muls)
}
defer {
p.next()
}
match name {
'map' {
return p.parse_map_type(nr_muls)
}
'voidptr' {
return p.table.type_ref_ptr(table.voidptr_type_idx, nr_muls)
}

9
vlib/v/parser/parser.v
View File

@@ -458,14 +458,7 @@ pub fn (p mut Parser) name_expr() (ast.Expr,table.TypeRef) {
p.check(.dot)
}
if p.tok.lit == 'map' && p.peek_tok.kind == .lsbr {
p.next()
p.check(.lsbr)
key_type := p.check_name()
if key_type != 'string' {
p.error('maps can only have string keys for now')
}
p.check(.rsbr)
p.check_name()
map_type := p.parse_map_type(0)
return node,typ
}
// fn call or type cast