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

comptime: implement field.is_enum (#16920)

Browse Source
This commit is contained in:
Swastik Baranwal
2023-01-09 23:42:07 +05:30
committed by GitHub
parent c2eb4d7065
commit 413a8b5f87
4 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vlib/builtin/builtin.v
View File

@@ -125,6 +125,7 @@ pub:
is_array bool // `f []string` , TODO is_array bool // `f []string` , TODO
is_map bool // `f map[string]int` , TODO is_map bool // `f map[string]int` , TODO
is_chan bool // `f chan int` , TODO is_chan bool // `f chan int` , TODO
is_enum bool // `f Enum` where Enum is an enum
is_struct bool // `f Abc` where Abc is a struct , TODO is_struct bool // `f Abc` where Abc is a struct , TODO
is_alias bool // `f MyInt` where `type MyInt = int`, TODO is_alias bool // `f MyInt` where `type MyInt = int`, TODO
// //

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

@@ -766,7 +766,7 @@ fn (mut c Checker) check_comptime_is_field_selector(node ast.SelectorExpr) bool
fn (mut c Checker) check_comptime_is_field_selector_bool(node ast.SelectorExpr) bool { fn (mut c Checker) check_comptime_is_field_selector_bool(node ast.SelectorExpr) bool {
if c.check_comptime_is_field_selector(node) { if c.check_comptime_is_field_selector(node) {
return node.field_name in ['is_mut', 'is_pub', 'is_shared', 'is_atomic', 'is_option', return node.field_name in ['is_mut', 'is_pub', 'is_shared', 'is_atomic', 'is_option',
'is_array', 'is_map', 'is_chan', 'is_struct', 'is_alias'] 'is_array', 'is_map', 'is_chan', 'is_struct', 'is_alias', 'is_enum']
} }
return false return false
} }
@@ -787,6 +787,7 @@ fn (mut c Checker) get_comptime_selector_bool_field(field_name string) bool {
'is_chan' { return field_sym.kind == .chan } 'is_chan' { return field_sym.kind == .chan }
'is_struct' { return field_sym.kind == .struct_ } 'is_struct' { return field_sym.kind == .struct_ }
'is_alias' { return field_sym.kind == .alias } 'is_alias' { return field_sym.kind == .alias }
'is_enum' { return field_sym.kind == .enum_ }
else { return false } else { return false }
} }
} }

4
vlib/v/gen/c/comptime.v
View File

@@ -42,6 +42,7 @@ fn (mut g Gen) get_comptime_selector_bool_field(field_name string) bool {
'is_chan' { return field_sym.kind == .chan } 'is_chan' { return field_sym.kind == .chan }
'is_struct' { return field_sym.kind == .struct_ } 'is_struct' { return field_sym.kind == .struct_ }
'is_alias' { return field_sym.kind == .alias } 'is_alias' { return field_sym.kind == .alias }
'is_enum' { return field_sym.kind == .enum_ }
else { return false } else { return false }
} }
} }
@@ -571,7 +572,7 @@ fn (mut g Gen) comptime_if_cond(cond ast.Expr, pkg_exist bool) (bool, bool) {
} }
ast.SelectorExpr { ast.SelectorExpr {
if g.inside_comptime_for_field && cond.expr is ast.Ident if g.inside_comptime_for_field && cond.expr is ast.Ident
&& (cond.expr as ast.Ident).name == g.comptime_for_field_var && cond.field_name in ['is_mut', 'is_pub', 'is_shared', 'is_atomic', 'is_option', 'is_array', 'is_map', 'is_chan', 'is_struct', 'is_alias'] { && (cond.expr as ast.Ident).name == g.comptime_for_field_var && cond.field_name in ['is_mut', 'is_pub', 'is_shared', 'is_atomic', 'is_option', 'is_array', 'is_map', 'is_chan', 'is_struct', 'is_alias', 'is_enum'] {
ret_bool := g.get_comptime_selector_bool_field(cond.field_name) ret_bool := g.get_comptime_selector_bool_field(cond.field_name)
g.write(ret_bool.str()) g.write(ret_bool.str())
return ret_bool, true return ret_bool, true
@@ -744,6 +745,7 @@ fn (mut g Gen) comptime_for(node ast.ComptimeFor) {
g.writeln('\t${node.val_var}.is_chan = ${field_sym.kind == .chan};') g.writeln('\t${node.val_var}.is_chan = ${field_sym.kind == .chan};')
g.writeln('\t${node.val_var}.is_struct = ${field_sym.kind == .struct_};') g.writeln('\t${node.val_var}.is_struct = ${field_sym.kind == .struct_};')
g.writeln('\t${node.val_var}.is_alias = ${field_sym.kind == .alias};') g.writeln('\t${node.val_var}.is_alias = ${field_sym.kind == .alias};')
g.writeln('\t${node.val_var}.is_enum = ${field_sym.kind == .enum_};')
// //
g.writeln('\t${node.val_var}.indirections = ${field.typ.nr_muls()};') g.writeln('\t${node.val_var}.indirections = ${field.typ.nr_muls()};')
// //

17
vlib/v/tests/comptime_for_in_fields_FieldData_test.v
View File

@@ -6,6 +6,12 @@ struct Abc {
name string name string
} }
enum JobTitle {
manager
executive
worker
}
struct Complex { struct Complex {
s string s string
i int i int
@@ -35,6 +41,7 @@ struct Complex {
o_map_i ?map[int]int o_map_i ?map[int]int
o_my_struct ?Abc o_my_struct ?Abc
o_my_struct_shared ?shared Abc o_my_struct_shared ?shared Abc
jobtitle_enum JobTitle
} }
fn test_is_shared() { fn test_is_shared() {
@@ -117,6 +124,16 @@ fn test_is_alias() {
} }
} }
fn test_is_enum() {
$for f in Complex.fields {
if f.name.contains('_enum') {
assert f.is_enum, 'Complex.${f.name} should have f.is_enum set'
} else {
assert !f.is_enum, 'Complex.${f.name} should NOT have f.is_enum set'
}
}
}
fn test_indirections() { fn test_indirections() {
$for f in Complex.fields { $for f in Complex.fields {
if f.name.contains('pointer') || f.name in ['my_struct_shared', 'o_my_struct_shared'] { if f.name.contains('pointer') || f.name in ['my_struct_shared', 'o_my_struct_shared'] {