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

checker: avoid SelectorExpr filter on Ident unless it's a generic type name (#8357)

Browse Source
This commit is contained in:
Nick Treleaven 2021-01-27 12:52:52 +00:00 committed by GitHub
parent e233911a7b
commit 58a76344cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vlib/v/checker/checker.v
View File

@ -2050,7 +2050,8 @@ pub fn (mut c Checker) selector_expr(mut selector_expr ast.SelectorExpr) table.T
match mut selector_expr.expr { match mut selector_expr.expr {
ast.Ident { ast.Ident {
name := selector_expr.expr.name name := selector_expr.expr.name
valid_generic := c.cur_fn.generic_params.filter(it.name == name).len != 0 valid_generic := util.is_generic_type_name(name)
&& c.cur_fn.generic_params.filter(it.name == name).len != 0
if valid_generic { if valid_generic {
name_type = table.Type(c.table.find_type_idx(name)).set_flag(.generic) name_type = table.Type(c.table.find_type_idx(name)).set_flag(.generic)
} }

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

@ -449,7 +449,7 @@ fn (mut p Parser) parse_generic_params() []ast.GenericParam {
if name.len > 1 { if name.len > 1 {
p.error('generic parameter name needs to be exactly one char') p.error('generic parameter name needs to be exactly one char')
} }
if is_generic_name_reserved(p.tok.lit) { if !util.is_generic_type_name(p.tok.lit) {
p.error('`$p.tok.lit` is a reserved name and cannot be used for generics') p.error('`$p.tok.lit` is a reserved name and cannot be used for generics')
} }
if name in param_names { if name in param_names {
@ -467,23 +467,9 @@ fn (mut p Parser) parse_generic_params() []ast.GenericParam {
return param_names.map(ast.GenericParam{it}) return param_names.map(ast.GenericParam{it})
} }
// is_valid_generic_character returns true if the character is reserved for someting else.
fn is_generic_name_reserved(name string) bool {
// C is used for cinterop
if name == 'C' {
return true
}
return false
}
// is_generic_name returns true if the current token is a generic name.
fn is_generic_name(name string) bool {
return name.len == 1 && name.is_capital() && !is_generic_name_reserved(name)
}
// is_generic_name returns true if the current token is a generic name. // is_generic_name returns true if the current token is a generic name.
fn (p Parser) is_generic_name() bool { fn (p Parser) is_generic_name() bool {
return p.tok.kind == .name && is_generic_name(p.tok.lit) return p.tok.kind == .name && util.is_generic_type_name(p.tok.lit)
} }
fn (mut p Parser) anon_fn() ast.AnonFn { fn (mut p Parser) anon_fn() ast.AnonFn {

6
vlib/v/util/scanning.v
View File

@ -38,6 +38,12 @@ pub fn good_type_name(s string) bool {
return true return true
} }
// is_generic_type_name returns true if the current token is a generic type name.
[inline]
pub fn is_generic_type_name(name string) bool {
return name.len == 1 && name.is_capital() && name != 'C'
}
pub fn cescaped_path(s string) string { pub fn cescaped_path(s string) string {
return s.replace('\\', '\\\\') return s.replace('\\', '\\\\')
} }