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

sum types

Browse Source
This commit is contained in:
Alexander Medvednikov
2019-12-23 00:31:28 +03:00
parent d2c3c66ba4
commit 7ab993c218
4 changed files with 126 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
vlib/compiler/enum.v
View File

@ -21,18 +21,15 @@ fn (p mut Parser) enum_decl(no_name bool) {
if !p.builtin_mod && p.mod != 'main' {
enum_name = p.prepend_mod(enum_name)
}
// Skip empty enums
if !no_name && !p.first_pass() {
p.cgen.typedefs << 'typedef int $enum_name;'
}
p.fspace()
p.check(.lcbr)
mut val := 0
mut fields := []string
mut tuple_variants := []string
for p.tok == .name {
field := p.check_name()
if contains_capital(field) {
p.warn('enum values cannot contain uppercase letters, use snake_case instead')
if p.pass == .decl && p.tok != .lpar && contains_capital(field) {
p.warn('enum values cannot contain uppercase letters, use snake_case instead (`$field`)')
}
fields << field
name := '${mod_gen_name(p.mod)}__${enum_name}_$field'
@ -59,6 +56,18 @@ fn (p mut Parser) enum_decl(no_name bool) {
p.error_with_token_index('only numbers are allowed in enum initializations', enum_assign_tidx)
}
}
// `BoolExpr(bool)`
else if p.tok == .lpar {
if !field[0].is_capital() {
p.error('sum types must be capitalized')
}
p.check(.lpar)
tuple_variants << p.get_type()
p.check(.rpar)
if p.pass == .main {
p.cgen.consts << '#define ${field}_type $val // LOL'
}
}
if p.pass == .main {
p.cgen.consts << '#define $name $val'
}
@ -81,10 +90,25 @@ fn (p mut Parser) enum_decl(no_name bool) {
is_public: is_pub
is_flag: is_flag
}
p.table.tuple_variants[enum_name] = tuple_variants
if is_flag && !p.first_pass() {
p.gen_enum_flag_methods(mut T)
}
p.table.register_type(T)
if p.pass == .decl {
p.table.register_type(T)
}
// Register `Expression` enum
if tuple_variants.len > 0 && p.pass == .main {
p.cgen.typedefs << 'typedef struct {
void* obj;
int typ;
} $enum_name;
'
}
// Skip empty enums
else if !no_name && !p.first_pass() {
p.cgen.typedefs << 'typedef int $enum_name;'
}
p.check(.rcbr)
p.fgen_nl()
p.fgen_nl()
@ -106,3 +130,23 @@ fn (p mut Parser) check_enum_member_access() {
}
}
/*
enum Expression {
Boolean(bool),
Integer(i32),
}
fn main() {
let expr = Expression::Integer(10);
let mut val = Expression::Boolean(true);
val = expr;
match val {
Expression::Integer(n) => println!("INT {}", n),
Expression::Boolean(b) => println!("BOOL {}", b),
}
//println!("HELLO {}", val);
}
*/