Handle structs that contain structs.

This commit is contained in:
Nigel Tao committed 2017-06-15 15:19:41 +10:00
1 parent b3c12e05cf
commit 86c6b79e1a
9 files changed
+263 -96

No files matched your search

+6
View File
@@ -469,6 +469,12 @@ func (n *TypeExpr) Min() *Expr { return n.lhs.Expr() }
func (n *TypeExpr) Max() *Expr { return n.mhs.Expr() }
func (n *TypeExpr) Inner() *TypeExpr { return n.rhs.TypeExpr() }
func (n *TypeExpr) Innermost() *TypeExpr {
for ; n != nil && n.Inner() != nil; n = n.Inner() {
}
return n
}
func (n *TypeExpr) IsBool() bool {
return n.id0 == 0 && n.id1.Key() == t.KeyBool
}
+57
View File
@@ -0,0 +1,57 @@
// Use of this source code is governed by a BSD-style license that can be found
// in the LICENSE file.
package ast
import (
t "github.com/google/puffs/lang/token"
)
func TopologicalSortStructs(ns []*Struct) (sorted []*Struct, ok bool) {
// Algorithm is a depth-first search as per
// https://en.wikipedia.org/wiki/Topological_sorting#Depth-first_search
sorted = make([]*Struct, 0, len(ns))
byName := map[t.ID]*Struct{}
for _, n := range ns {
byName[n.Name()] = n
}
marks := map[*Struct]uint8{}
for _, n := range ns {
if _, ok := marks[n]; !ok {
sorted, ok = tssVisit(sorted, n, byName, marks)
if !ok {
return nil, false
}
}
}
return sorted, true
}
func tssVisit(dst []*Struct, n *Struct, byName map[t.ID]*Struct, marks map[*Struct]uint8) ([]*Struct, bool) {
const (
unmarked = 0
temporary = 1
permanent = 2
)
if marks[n] == temporary {
return nil, false
}
marks[n] = temporary
for _, f := range n.Fields() {
x := f.Field().XType().Innermost()
if x.Decorator() != 0 {
continue
}
if o := byName[x.Name()]; o != nil {
var ok bool
dst, ok = tssVisit(dst, o, byName, marks)
if !ok {
return nil, false
}
}
}
marks[n] = permanent
return append(dst, n), true
}