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

cgen: correct comments and cleanup in comptime_for() (#17964)

Browse Source
This commit is contained in:
yuyi 2023-04-16 13:01:36 +08:00 committed by GitHub
parent d3de7adcc0
commit 6db904fb8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -727,15 +727,12 @@ fn (mut g Gen) resolve_comptime_type(node ast.Expr, default_type ast.Type) ast.T
return default_type return default_type
} }
//
fn (mut g Gen) comptime_for(node ast.ComptimeFor) { fn (mut g Gen) comptime_for(node ast.ComptimeFor) {
sym := g.table.final_sym(g.unwrap_generic(node.typ)) sym := g.table.final_sym(g.unwrap_generic(node.typ))
g.writeln('/* \$for ${node.val_var} in ${sym.name}(${node.kind.str()}) */ {') g.writeln('/* \$for ${node.val_var} in ${sym.name}.${node.kind.str()} */ {')
g.indent++ g.indent++
// vweb_result_type := ast.new_type(g.table.find_type_idx('vweb.Result'))
mut i := 0 mut i := 0
// g.writeln('string method = _SLIT("");')
if node.kind == .methods { if node.kind == .methods {
mut methods := sym.methods.filter(it.attrs.len == 0) // methods without attrs first mut methods := sym.methods.filter(it.attrs.len == 0) // methods without attrs first
methods_with_attrs := sym.methods.filter(it.attrs.len > 0) // methods with attrs second methods_with_attrs := sym.methods.filter(it.attrs.len > 0) // methods with attrs second
@ -809,7 +806,7 @@ fn (mut g Gen) comptime_for(node ast.ComptimeFor) {
ret_typ := method.return_type.idx() ret_typ := method.return_type.idx()
g.writeln('\t${node.val_var}.typ = ${styp};') g.writeln('\t${node.val_var}.typ = ${styp};')
g.writeln('\t${node.val_var}.return_type = ${ret_typ};') g.writeln('\t${node.val_var}.return_type = ${ret_typ};')
//
g.comptime_var_type_map['${node.val_var}.return_type'] = ret_typ g.comptime_var_type_map['${node.val_var}.return_type'] = ret_typ
g.comptime_var_type_map['${node.val_var}.typ'] = styp g.comptime_var_type_map['${node.val_var}.typ'] = styp
g.stmts(node.stmts) g.stmts(node.stmts)
@ -818,7 +815,6 @@ fn (mut g Gen) comptime_for(node ast.ComptimeFor) {
g.pop_existing_comptime_values() g.pop_existing_comptime_values()
} }
} else if node.kind == .fields { } else if node.kind == .fields {
// TODO add fields
if sym.kind in [.struct_, .interface_] { if sym.kind in [.struct_, .interface_] {
fields := match sym.info { fields := match sym.info {
ast.Struct { ast.Struct {
@ -853,7 +849,6 @@ fn (mut g Gen) comptime_for(node ast.ComptimeFor) {
attrs.join(', ') + '}));\n') attrs.join(', ') + '}));\n')
} }
field_sym := g.table.sym(field.typ) field_sym := g.table.sym(field.typ)
// g.writeln('\t${node.val_var}.typ = _SLIT("$field_sym.name");')
styp := field.typ styp := field.typ
unaliased_styp := g.table.unaliased_type(styp) unaliased_styp := g.table.unaliased_type(styp)
@ -861,20 +856,20 @@ fn (mut g Gen) comptime_for(node ast.ComptimeFor) {
g.writeln('\t${node.val_var}.unaliased_typ = ${unaliased_styp.idx()};') g.writeln('\t${node.val_var}.unaliased_typ = ${unaliased_styp.idx()};')
g.writeln('\t${node.val_var}.is_pub = ${field.is_pub};') g.writeln('\t${node.val_var}.is_pub = ${field.is_pub};')
g.writeln('\t${node.val_var}.is_mut = ${field.is_mut};') g.writeln('\t${node.val_var}.is_mut = ${field.is_mut};')
//
g.writeln('\t${node.val_var}.is_shared = ${field.typ.has_flag(.shared_f)};') g.writeln('\t${node.val_var}.is_shared = ${field.typ.has_flag(.shared_f)};')
g.writeln('\t${node.val_var}.is_atomic = ${field.typ.has_flag(.atomic_f)};') g.writeln('\t${node.val_var}.is_atomic = ${field.typ.has_flag(.atomic_f)};')
g.writeln('\t${node.val_var}.is_option = ${field.typ.has_flag(.option)};') g.writeln('\t${node.val_var}.is_option = ${field.typ.has_flag(.option)};')
//
g.writeln('\t${node.val_var}.is_array = ${field_sym.kind in [.array, .array_fixed]};') g.writeln('\t${node.val_var}.is_array = ${field_sym.kind in [.array, .array_fixed]};')
g.writeln('\t${node.val_var}.is_map = ${field_sym.kind == .map};') g.writeln('\t${node.val_var}.is_map = ${field_sym.kind == .map};')
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}.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()};')
//
g.comptime_var_type_map['${node.val_var}.typ'] = styp g.comptime_var_type_map['${node.val_var}.typ'] = styp
g.comptime_var_type_map['${node.val_var}.unaliased_typ'] = unaliased_styp g.comptime_var_type_map['${node.val_var}.unaliased_typ'] = unaliased_styp
g.stmts(node.stmts) g.stmts(node.stmts)