2019-10-24 14:56:10 +02:00
|
|
|
// Copyright (c) 2019 Alexander Medvednikov. All rights reserved.
|
|
|
|
// Use of this source code is governed by an MIT license
|
|
|
|
// that can be found in the LICENSE file.
|
|
|
|
module compiler
|
|
|
|
|
2019-12-17 15:28:25 +01:00
|
|
|
import (
|
|
|
|
strings
|
|
|
|
)
|
2019-10-24 14:56:10 +02:00
|
|
|
// also unions and interfaces
|
2019-12-19 22:29:37 +01:00
|
|
|
|
|
|
|
|
2019-10-24 14:56:10 +02:00
|
|
|
fn (p mut Parser) struct_decl() {
|
|
|
|
is_pub := p.tok == .key_pub
|
|
|
|
if is_pub {
|
|
|
|
p.next()
|
2019-11-09 20:05:44 +01:00
|
|
|
p.fspace()
|
2019-12-03 11:08:57 +01:00
|
|
|
}
|
2019-10-24 14:56:10 +02:00
|
|
|
// V can generate Objective C for integration with Cocoa
|
|
|
|
// `[objc_interface:ParentInterface]`
|
|
|
|
is_objc := p.attr.starts_with('objc_interface')
|
2019-10-27 08:03:15 +01:00
|
|
|
objc_parent := if is_objc { p.attr[15..] } else { '' }
|
2019-10-24 14:56:10 +02:00
|
|
|
// interface, union, struct
|
|
|
|
is_interface := p.tok == .key_interface
|
|
|
|
is_union := p.tok == .key_union
|
|
|
|
is_struct := p.tok == .key_struct
|
|
|
|
mut cat := key_to_type_cat(p.tok)
|
|
|
|
if is_objc {
|
|
|
|
cat = .objc_interface
|
|
|
|
}
|
|
|
|
p.next()
|
2019-11-09 17:13:26 +01:00
|
|
|
p.fspace()
|
|
|
|
// Get type name
|
2019-10-24 14:56:10 +02:00
|
|
|
mut name := p.check_name()
|
|
|
|
if name.contains('_') && !p.pref.translated {
|
|
|
|
p.error('type names cannot contain `_`')
|
|
|
|
}
|
|
|
|
if !p.builtin_mod && !name[0].is_capital() {
|
2019-11-11 15:18:32 +01:00
|
|
|
p.error('mod=$p.mod struct names must be capitalized: use `struct ${name.capitalize()}`')
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
|
|
|
if is_interface && !name.ends_with('er') {
|
|
|
|
p.error('interface names temporarily have to end with `er` (e.g. `Speaker`, `Reader`)')
|
|
|
|
}
|
|
|
|
is_c := name == 'C' && p.tok == .dot
|
|
|
|
if is_c {
|
2019-11-06 02:43:13 +01:00
|
|
|
/*
|
2019-11-05 22:32:15 +01:00
|
|
|
if !p.pref.building_v && !p.fileis('vlib') {
|
|
|
|
p.warn('Virtual C structs will soon be removed from the language' +
|
|
|
|
'\ndefine the C structs and functions in V')
|
|
|
|
}
|
2019-11-06 02:43:13 +01:00
|
|
|
*/
|
2019-10-24 14:56:10 +02:00
|
|
|
p.check(.dot)
|
|
|
|
name = p.check_name()
|
|
|
|
cat = .c_struct
|
|
|
|
if p.attr == 'typedef' {
|
|
|
|
cat = .c_typedef
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if name.len == 1 && !p.pref.building_v && !p.pref.is_repl {
|
|
|
|
p.warn('struct names must have more than one character')
|
2019-12-03 11:08:57 +01:00
|
|
|
}
|
2019-10-24 14:56:10 +02:00
|
|
|
if !is_c && !good_type_name(name) {
|
|
|
|
p.error('bad struct name, e.g. use `HttpRequest` instead of `HTTPRequest`')
|
|
|
|
}
|
|
|
|
// Specify full type name
|
|
|
|
if !is_c && !p.builtin_mod && p.mod != 'main' {
|
|
|
|
name = p.prepend_mod(name)
|
|
|
|
}
|
|
|
|
mut typ := p.table.find_type(name)
|
|
|
|
if p.pass == .decl && p.table.known_type_fast(typ) {
|
2019-12-19 22:29:37 +01:00
|
|
|
// if name in reserved_type_param_names {
|
|
|
|
// p.error('name `$name` is reserved for type parameters')
|
|
|
|
// } else {
|
2019-10-24 14:56:10 +02:00
|
|
|
p.error('type `$name` redeclared')
|
2019-12-19 22:29:37 +01:00
|
|
|
// }
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
|
|
|
if is_objc {
|
|
|
|
// Forward declaration of an Objective-C interface with `@class` :)
|
|
|
|
p.gen_typedef('@class $name;')
|
|
|
|
}
|
|
|
|
else if !is_c {
|
2019-12-19 22:29:37 +01:00
|
|
|
kind := if is_union { 'union' } else { 'struct' }
|
2019-10-24 14:56:10 +02:00
|
|
|
p.gen_typedef('typedef $kind $name $name;')
|
|
|
|
}
|
|
|
|
// Register the type
|
|
|
|
mut is_ph := false
|
|
|
|
if typ.is_placeholder {
|
|
|
|
// Update the placeholder
|
|
|
|
is_ph = true
|
|
|
|
typ.name = name
|
|
|
|
typ.mod = p.mod
|
|
|
|
typ.is_c = is_c
|
|
|
|
typ.is_placeholder = false
|
|
|
|
typ.cat = cat
|
|
|
|
typ.parent = objc_parent
|
2019-10-31 11:08:01 +01:00
|
|
|
typ.is_public = is_pub || p.is_vh
|
2019-10-24 14:56:10 +02:00
|
|
|
p.table.rewrite_type(typ)
|
|
|
|
}
|
|
|
|
else {
|
2019-12-19 22:29:37 +01:00
|
|
|
typ = Type{
|
2019-10-24 14:56:10 +02:00
|
|
|
name: name
|
|
|
|
mod: p.mod
|
|
|
|
is_c: is_c
|
|
|
|
cat: cat
|
|
|
|
parent: objc_parent
|
2019-10-31 11:08:01 +01:00
|
|
|
is_public: is_pub || p.is_vh
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// Struct `C.Foo` declaration, no body
|
|
|
|
if is_c && is_struct && p.tok != .lcbr {
|
2019-12-05 12:09:33 +01:00
|
|
|
p.table.register_type(typ)
|
2019-10-24 14:56:10 +02:00
|
|
|
return
|
|
|
|
}
|
2019-11-09 17:13:26 +01:00
|
|
|
p.fspace()
|
2019-10-24 14:56:10 +02:00
|
|
|
p.check(.lcbr)
|
|
|
|
// Struct fields
|
2019-12-13 15:18:01 +01:00
|
|
|
mut access_mod := AccessMod.private
|
2019-12-19 22:29:37 +01:00
|
|
|
// mut is_pub_field := false
|
|
|
|
// mut is_mut := false
|
|
|
|
mut names := []string // to avoid dup names TODO alloc perf
|
2019-12-17 15:28:25 +01:00
|
|
|
mut fmt_max_len := p.table.max_field_len[name]
|
2019-12-19 22:29:37 +01:00
|
|
|
// println('fmt max len = $max_len nrfields=$typ.fields.len pass=$p.pass')
|
2019-10-24 14:56:10 +02:00
|
|
|
if !is_ph && p.first_pass() {
|
2019-12-05 12:09:33 +01:00
|
|
|
p.table.register_type(typ)
|
2019-12-19 22:29:37 +01:00
|
|
|
// println('registering 1 nrfields=$typ.fields.len')
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
|
|
|
mut did_gen_something := false
|
2019-12-13 15:18:01 +01:00
|
|
|
mut used := []AccessMod
|
2019-11-24 11:53:59 +01:00
|
|
|
mut i := -1
|
2019-10-24 14:56:10 +02:00
|
|
|
for p.tok != .rcbr {
|
2019-11-24 11:53:59 +01:00
|
|
|
i++
|
2019-12-13 15:18:01 +01:00
|
|
|
mut new_access_mod := access_mod
|
2019-10-24 14:56:10 +02:00
|
|
|
if p.tok == .key_pub {
|
2019-12-17 15:28:25 +01:00
|
|
|
p.fmt_dec()
|
2019-10-24 14:56:10 +02:00
|
|
|
p.check(.key_pub)
|
2019-12-13 15:18:01 +01:00
|
|
|
if p.tok == .key_mut {
|
2019-12-17 15:28:25 +01:00
|
|
|
p.fspace()
|
2019-12-13 15:18:01 +01:00
|
|
|
new_access_mod = .public_mut
|
|
|
|
p.next() // skip `mut`
|
2019-12-19 22:29:37 +01:00
|
|
|
}
|
|
|
|
else {
|
2019-12-13 15:18:01 +01:00
|
|
|
new_access_mod = .public
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
2019-12-13 15:18:01 +01:00
|
|
|
if new_access_mod in used {
|
|
|
|
p.error('structs can only have one `pub:`/`pub mut:`, all public fields have to be grouped')
|
|
|
|
}
|
|
|
|
p.check(.colon)
|
2019-10-24 14:56:10 +02:00
|
|
|
p.fmt_inc()
|
2019-11-18 11:10:31 +01:00
|
|
|
p.fgen_nl()
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
2019-12-13 15:18:01 +01:00
|
|
|
else if p.tok == .key_mut {
|
|
|
|
new_access_mod = .private_mut
|
|
|
|
if new_access_mod in used {
|
2019-10-24 14:56:10 +02:00
|
|
|
p.error('structs can only have one `mut:`, all private mutable fields have to be grouped')
|
|
|
|
}
|
|
|
|
p.fmt_dec()
|
|
|
|
p.check(.key_mut)
|
2019-12-13 15:18:01 +01:00
|
|
|
p.check(.colon)
|
2019-10-24 14:56:10 +02:00
|
|
|
p.fmt_inc()
|
2019-11-18 11:10:31 +01:00
|
|
|
p.fgen_nl()
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
2019-12-13 18:28:28 +01:00
|
|
|
else if p.tok == .key_global {
|
|
|
|
new_access_mod = .global
|
|
|
|
if new_access_mod in used {
|
|
|
|
p.error('structs can only have one `__global:`, all global fields have to be grouped')
|
|
|
|
}
|
|
|
|
p.fmt_dec()
|
|
|
|
p.check(.key_global)
|
|
|
|
p.check(.colon)
|
|
|
|
p.fmt_inc()
|
|
|
|
p.fgen_nl()
|
|
|
|
}
|
2019-12-13 15:18:01 +01:00
|
|
|
if new_access_mod != access_mod {
|
|
|
|
used << new_access_mod
|
|
|
|
}
|
|
|
|
access_mod = new_access_mod
|
2019-10-24 14:56:10 +02:00
|
|
|
// (mut) user *User
|
|
|
|
// if p.tok == .plus {
|
|
|
|
// p.next()
|
|
|
|
// }
|
|
|
|
// Check if reserved name
|
|
|
|
field_name_token_idx := p.cur_tok_index()
|
2019-11-20 16:19:13 +01:00
|
|
|
field_name := if name != 'Option' && !is_interface { p.table.var_cgen_name(p.check_name()) } else { p.check_name() }
|
2019-12-17 15:28:25 +01:00
|
|
|
if p.pass == .main {
|
2019-11-11 15:18:32 +01:00
|
|
|
p.fgen(strings.repeat(` `, fmt_max_len - field_name.len))
|
|
|
|
}
|
2019-10-24 14:56:10 +02:00
|
|
|
// Check dups
|
|
|
|
if field_name in names {
|
|
|
|
p.error('duplicate field `$field_name`')
|
|
|
|
}
|
2019-12-17 15:28:25 +01:00
|
|
|
if p.scanner.is_fmt && p.pass == .decl && field_name.len > fmt_max_len {
|
|
|
|
fmt_max_len = field_name.len
|
|
|
|
}
|
2019-10-24 14:56:10 +02:00
|
|
|
if !is_c && p.mod != 'os' && contains_capital(field_name) {
|
|
|
|
p.error('struct fields cannot contain uppercase letters, use snake_case instead')
|
|
|
|
}
|
|
|
|
names << field_name
|
|
|
|
// We are in an interface?
|
|
|
|
// `run() string` => run is a method, not a struct field
|
|
|
|
if is_interface {
|
|
|
|
f := p.interface_method(field_name, name)
|
|
|
|
if p.first_pass() {
|
|
|
|
p.add_method(typ.name, f)
|
|
|
|
}
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
// `pub` access mod
|
2019-12-19 22:29:37 +01:00
|
|
|
// access_mod := if is_pub_field { AccessMod.public } else { AccessMod.private}
|
2019-11-09 17:13:26 +01:00
|
|
|
p.fspace()
|
2019-12-05 17:02:33 +01:00
|
|
|
tt := p.get_type2()
|
|
|
|
field_type := tt.name
|
2019-10-24 14:56:10 +02:00
|
|
|
if field_type == name {
|
2019-12-05 17:02:33 +01:00
|
|
|
p.error_with_token_index('cannot embed struct `$name` in itself (field `$field_name`)', field_name_token_idx)
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
2019-11-19 22:58:31 +01:00
|
|
|
// Register ?option type
|
|
|
|
if field_type.starts_with('Option_') {
|
|
|
|
p.gen_typedef('typedef Option $field_type;')
|
|
|
|
}
|
2019-10-24 14:56:10 +02:00
|
|
|
p.check_and_register_used_imported_type(field_type)
|
|
|
|
is_atomic := p.tok == .key_atomic
|
|
|
|
if is_atomic {
|
|
|
|
p.next()
|
|
|
|
}
|
2019-11-24 11:53:59 +01:00
|
|
|
// `a int = 4`
|
|
|
|
if p.tok == .assign {
|
|
|
|
p.next()
|
2019-12-19 22:29:37 +01:00
|
|
|
def_val_type,expr := p.tmp_expr()
|
2019-11-24 11:53:59 +01:00
|
|
|
if def_val_type != field_type {
|
|
|
|
p.error('expected `$field_type` but got `$def_val_type`')
|
|
|
|
}
|
2019-12-19 22:29:37 +01:00
|
|
|
// println('pass=$p.pass $typ.name ADDING field=$field_name "$def_val_type" "$expr"')
|
2019-11-24 13:56:14 +01:00
|
|
|
if !p.first_pass() {
|
|
|
|
p.table.add_default_val(i, typ.name, expr)
|
|
|
|
}
|
2019-12-03 11:08:57 +01:00
|
|
|
}
|
2019-10-24 14:56:10 +02:00
|
|
|
// [ATTR]
|
|
|
|
mut attr := ''
|
|
|
|
if p.tok == .lsbr {
|
2019-11-09 17:13:26 +01:00
|
|
|
p.fspace()
|
2019-10-24 14:56:10 +02:00
|
|
|
p.next()
|
|
|
|
attr = p.check_name()
|
|
|
|
if p.tok == .colon {
|
|
|
|
p.check(.colon)
|
|
|
|
mut val := ''
|
|
|
|
match p.tok {
|
2019-12-19 22:29:37 +01:00
|
|
|
.name {
|
|
|
|
val = p.check_name()
|
|
|
|
}
|
|
|
|
.str {
|
|
|
|
val = p.check_string()
|
|
|
|
}
|
2019-10-24 14:56:10 +02:00
|
|
|
else {
|
|
|
|
p.error('attribute value should be either name or string')
|
2019-12-19 22:29:37 +01:00
|
|
|
}}
|
2019-10-24 14:56:10 +02:00
|
|
|
attr += ':' + val
|
|
|
|
}
|
|
|
|
p.check(.rsbr)
|
|
|
|
}
|
|
|
|
if attr == 'raw' && field_type != 'string' {
|
|
|
|
p.error('struct field with attribute "raw" should be of type "string" but got "$field_type"')
|
|
|
|
}
|
|
|
|
did_gen_something = true
|
2019-12-13 18:28:28 +01:00
|
|
|
is_mut := access_mod in [.private_mut, .public_mut, .global]
|
2019-10-24 14:56:10 +02:00
|
|
|
if p.first_pass() {
|
2019-12-19 22:29:37 +01:00
|
|
|
p.table.add_field(typ.name, field_name, field_type, is_mut, attr, access_mod)
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
2019-11-18 11:10:31 +01:00
|
|
|
p.fgen_nl() // newline between struct fields
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
2019-12-17 15:28:25 +01:00
|
|
|
if p.scanner.is_fmt && p.pass == .decl {
|
|
|
|
p.table.max_field_len[typ.name] = fmt_max_len
|
|
|
|
}
|
2019-12-19 22:29:37 +01:00
|
|
|
// p.fgen_require_nl()
|
2019-10-24 14:56:10 +02:00
|
|
|
p.check(.rcbr)
|
2019-11-08 04:03:06 +01:00
|
|
|
if !is_c && !did_gen_something && p.first_pass() {
|
|
|
|
p.table.add_field(typ.name, '', 'EMPTY_STRUCT_DECLARATION', false, '', .private)
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
2019-12-17 15:28:25 +01:00
|
|
|
p.fgen_nl()
|
|
|
|
p.fgen_nl()
|
2019-12-19 22:29:37 +01:00
|
|
|
// p.fgenln('//kek')
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
|
|
|
// `User{ foo: bar }`
|
|
|
|
fn (p mut Parser) struct_init(typ string) string {
|
|
|
|
p.is_struct_init = true
|
|
|
|
t := p.table.find_type(typ)
|
|
|
|
if !t.is_public && t.mod != p.mod {
|
|
|
|
p.warn('type `$t.name` is private')
|
2019-12-03 11:08:57 +01:00
|
|
|
}
|
2019-12-19 22:29:37 +01:00
|
|
|
if p.gen_struct_init(typ, t) {
|
|
|
|
return typ
|
|
|
|
}
|
2019-10-24 14:56:10 +02:00
|
|
|
ptr := typ.contains('*')
|
|
|
|
mut did_gen_something := false
|
|
|
|
// Loop thru all struct init keys and assign values
|
|
|
|
// u := User{age:20, name:'bob'}
|
|
|
|
// Remember which fields were set, so that we dont have to zero them later
|
|
|
|
mut inited_fields := []string
|
|
|
|
peek := p.peek()
|
|
|
|
if peek == .colon || p.tok == .rcbr {
|
|
|
|
for p.tok != .rcbr {
|
2019-12-19 22:29:37 +01:00
|
|
|
field := if typ != 'Option' { p.table.var_cgen_name(p.check_name()) } else { p.check_name() }
|
2019-10-24 14:56:10 +02:00
|
|
|
if !p.first_pass() && !t.has_field(field) {
|
|
|
|
p.error('`$t.name` has no field `$field`')
|
|
|
|
}
|
|
|
|
if field in inited_fields {
|
|
|
|
p.error('already initialized field `$field` in `$t.name`')
|
|
|
|
}
|
|
|
|
f := t.find_field(field) or {
|
|
|
|
p.error('no such field: "$field" in type $typ')
|
|
|
|
break
|
|
|
|
}
|
2019-12-10 04:16:47 +01:00
|
|
|
tt := p.table.find_type(f.typ)
|
|
|
|
if tt.is_flag {
|
|
|
|
p.error(err_modify_bitfield)
|
|
|
|
}
|
2019-10-24 14:56:10 +02:00
|
|
|
inited_fields << field
|
|
|
|
p.gen_struct_field_init(field)
|
|
|
|
p.check(.colon)
|
|
|
|
p.fspace()
|
2019-11-06 02:43:13 +01:00
|
|
|
p.expected_type = f.typ
|
2019-12-19 22:29:37 +01:00
|
|
|
p.check_types(p.bool_expression(), f.typ)
|
2019-10-24 14:56:10 +02:00
|
|
|
if p.tok == .comma {
|
|
|
|
p.next()
|
2019-12-18 06:13:31 +01:00
|
|
|
p.fremove_last()
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
|
|
|
if p.tok != .rcbr {
|
|
|
|
p.gen(',')
|
|
|
|
}
|
2019-11-09 17:13:26 +01:00
|
|
|
p.fspace()
|
2019-10-24 14:56:10 +02:00
|
|
|
did_gen_something = true
|
2019-11-18 11:10:31 +01:00
|
|
|
p.fgen_nl() // newline between struct fields
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
|
|
|
// If we already set some fields, need to prepend a comma
|
|
|
|
if t.fields.len != inited_fields.len && inited_fields.len > 0 {
|
|
|
|
p.gen(',')
|
|
|
|
}
|
|
|
|
// Zero values: init all fields (ints to 0, strings to '' etc)
|
|
|
|
for i, field in t.fields {
|
2019-12-19 22:29:37 +01:00
|
|
|
sanitized_name := if typ != 'Option' { p.table.var_cgen_name(field.name) } else { field.name }
|
2019-10-24 14:56:10 +02:00
|
|
|
// println('### field.name')
|
|
|
|
// Skip if this field has already been assigned to
|
|
|
|
if sanitized_name in inited_fields {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
field_typ := field.typ
|
2019-12-19 22:29:37 +01:00
|
|
|
if !p.builtin_mod && field_typ.ends_with('*') && p.mod != 'os' {
|
|
|
|
// &&
|
2019-12-03 11:08:57 +01:00
|
|
|
p.warn('reference field `${typ}.${field.name}` must be initialized')
|
2019-10-24 14:56:10 +02:00
|
|
|
}
|
|
|
|
// init map fields
|
|
|
|
if field_typ.starts_with('map_') {
|
|
|
|
p.gen_struct_field_init(sanitized_name)
|
2019-10-27 08:03:15 +01:00
|
|
|
p.gen_empty_map(field_typ[4..])
|
2019-10-24 14:56:10 +02:00
|
|
|
inited_fields << sanitized_name
|
|
|
|
if i != t.fields.len - 1 {
|
|
|
|
p.gen(',')
|
|
|
|
}
|
|
|
|
did_gen_something = true
|
|
|
|
continue
|
|
|
|
}
|
2019-11-24 13:56:14 +01:00
|
|
|
// Did the user provide a default value for this struct field?
|
|
|
|
// Use it. Otherwise zero it.
|
2019-12-19 22:29:37 +01:00
|
|
|
def_val := if t.default_vals.len > i && t.default_vals[i] != '' { t.default_vals[i] } else { type_default(field_typ) }
|
2019-10-24 14:56:10 +02:00
|
|
|
if def_val != '' && def_val != '{0}' {
|
|
|
|
p.gen_struct_field_init(sanitized_name)
|
|
|
|
p.gen(def_val)
|
|
|
|
if i != t.fields.len - 1 {
|
|
|
|
p.gen(',')
|
|
|
|
}
|
|
|
|
did_gen_something = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Point{3,4} syntax
|
|
|
|
else {
|
|
|
|
mut T := p.table.find_type(typ)
|
|
|
|
// Aliases (TODO Hack, implement proper aliases)
|
|
|
|
if T.fields.len == 0 && T.parent != '' {
|
|
|
|
T = p.table.find_type(T.parent)
|
|
|
|
}
|
|
|
|
for i, ffield in T.fields {
|
|
|
|
expr_typ := p.bool_expression()
|
|
|
|
if !p.check_types_no_throw(expr_typ, ffield.typ) {
|
|
|
|
p.error('field value #${i+1} `$ffield.name` has type `$ffield.typ`, got `$expr_typ` ')
|
|
|
|
}
|
2019-12-10 04:16:47 +01:00
|
|
|
tt := p.table.find_type(ffield.typ)
|
|
|
|
if tt.is_flag {
|
|
|
|
p.error(err_modify_bitfield)
|
|
|
|
}
|
2019-10-24 14:56:10 +02:00
|
|
|
if i < T.fields.len - 1 {
|
|
|
|
if p.tok != .comma {
|
|
|
|
p.error('too few values in `$typ` literal (${i+1} instead of $T.fields.len)')
|
|
|
|
}
|
|
|
|
p.gen(',')
|
|
|
|
p.next()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Allow `user := User{1,2,3,}`
|
|
|
|
// The final comma will be removed by vfmt, since we are not calling `p.fgen()`
|
|
|
|
if p.tok == .comma {
|
|
|
|
p.next()
|
|
|
|
}
|
|
|
|
if p.tok != .rcbr {
|
|
|
|
p.error('too many fields initialized: `$typ` has $T.fields.len field(s)')
|
|
|
|
}
|
|
|
|
did_gen_something = true
|
|
|
|
}
|
|
|
|
if !did_gen_something {
|
|
|
|
p.gen('EMPTY_STRUCT_INITIALIZATION')
|
|
|
|
}
|
|
|
|
p.gen('}')
|
|
|
|
if ptr && !p.is_js {
|
|
|
|
p.gen(', sizeof($t.name))')
|
|
|
|
}
|
|
|
|
p.check(.rcbr)
|
|
|
|
p.is_struct_init = false
|
|
|
|
p.is_c_struct_init = false
|
|
|
|
return typ
|
|
|
|
}
|
|
|
|
|