vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

checker: remove obsolete/slow const ordering code. close #12544

pull/12586/head
Joe Conigliaro 2021-11-27 05:36:27 +11:00
parent 4383cf7de5
commit 12585e88e1
No known key found for this signature in database
GPG Key ID: C12F7136C08206F1
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vlib/v/checker/checker.v
View File

@ -3683,12 +3683,10 @@ pub fn (mut c Checker) return_stmt(mut node ast.Return) {
} }
pub fn (mut c Checker) const_decl(mut node ast.ConstDecl) { pub fn (mut c Checker) const_decl(mut node ast.ConstDecl) {
mut field_names := []string{}
mut field_order := []int{}
if node.fields.len == 0 { if node.fields.len == 0 {
c.warn('const block must have at least 1 declaration', node.pos) c.warn('const block must have at least 1 declaration', node.pos)
} }
for i, field in node.fields { for field in node.fields {
// TODO Check const name once the syntax is decided // TODO Check const name once the syntax is decided
if field.name in c.const_names { if field.name in c.const_names {
name_pos := token.Position{ name_pos := token.Position{
@ -3698,11 +3696,7 @@ pub fn (mut c Checker) const_decl(mut node ast.ConstDecl) {
c.error('duplicate const `$field.name`', name_pos) c.error('duplicate const `$field.name`', name_pos)
} }
c.const_names << field.name c.const_names << field.name
field_names << field.name
field_order << i
} }
mut needs_order := false
mut done_fields := []int{}
for i, mut field in node.fields { for i, mut field in node.fields {
c.const_decl = field.name c.const_decl = field.name
c.const_deps << field.name c.const_deps << field.name
@ -3714,27 +3708,8 @@ pub fn (mut c Checker) const_decl(mut node ast.ConstDecl) {
} }
} }
node.fields[i].typ = c.table.mktyp(typ) node.fields[i].typ = c.table.mktyp(typ)
for cd in c.const_deps {
for j, f in node.fields {
if j != i && cd in field_names && cd == f.name && j !in done_fields {
needs_order = true
x := field_order[j]
field_order[j] = field_order[i]
field_order[i] = x
break
}
}
}
done_fields << i
c.const_deps = [] c.const_deps = []
} }
if needs_order {
mut ordered_fields := []ast.ConstField{}
for order in field_order {
ordered_fields << node.fields[order]
}
node.fields = ordered_fields
}
} }
pub fn (mut c Checker) enum_decl(node ast.EnumDecl) { pub fn (mut c Checker) enum_decl(node ast.EnumDecl) {