luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

d2ir: IR Root wip

Browse source
This commit is contained in:
Anmol Sethi 2023-01-17 17:47:47 -08:00
parent f7394133b9
commit 25ea89fea3
No known key found for this signature in database
GPG key ID: 25BC68888A99A8BA
1 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
d2ir/d2ir.go
View file

@ -386,7 +386,8 @@ func (m *Map) FieldCountRecursive() int {
} }
acc := len(m.Fields) acc := len(m.Fields)
for _, f := range m.Fields { for _, f := range m.Fields {
if f_m, ok := f.Composite.(*Map); ok { f_m := ToMap(f)
if f_m != nil {
acc += f_m.FieldCountRecursive() acc += f_m.FieldCountRecursive()
} }
} }
@ -404,7 +405,8 @@ func (m *Map) EdgeCountRecursive() int {
} }
acc := len(m.Edges) acc := len(m.Edges)
for _, f := range m.Fields { for _, f := range m.Fields {
if f_m, ok := f.Composite.(*Map); ok { f_m := ToMap(f)
if f_m != nil {
acc += f_m.EdgeCountRecursive() acc += f_m.EdgeCountRecursive()
} }
} }
@ -445,7 +447,8 @@ func (m *Map) getField(ida []string) *Field {
if len(rest) == 0 { if len(rest) == 0 {
return f return f
} }
if f_m, ok := f.Composite.(*Map); ok { f_m := ToMap(f)
if f_m != nil {
return f_m.getField(rest) return f_m.getField(rest)
} }
} }
@ -482,16 +485,17 @@ func (m *Map) ensureField(ida []string) (*Field, error) {
if len(rest) == 0 { if len(rest) == 0 {
return f, nil return f, nil
} }
switch fc := f.Composite.(type) { if _, ok := f.Composite.(*Array); ok {
case *Map:
return fc.ensureField(rest)
case *Array:
return nil, errors.New("cannot index into array") return nil, errors.New("cannot index into array")
} }
f.Composite = &Map{ f_m := ToMap(f)
parent: f, if f_m == nil {
f_m = &Map{
parent: f,
}
f.Composite = f_m
} }
return f.Composite.(*Map).ensureField(rest) return f_m.ensureField(rest)
} }
f := &Field{ f := &Field{
@ -502,10 +506,11 @@ func (m *Map) ensureField(ida []string) (*Field, error) {
if len(rest) == 0 { if len(rest) == 0 {
return f, nil return f, nil
} }
f.Composite = &Map{ f_m := &Map{
parent: f, parent: f,
} }
return f.Composite.(*Map).ensureField(rest) f.Composite = f_m
return f_m.ensureField(rest)
} }
func (m *Map) DeleteField(ida []string) bool { func (m *Map) DeleteField(ida []string) bool {
@ -524,7 +529,8 @@ func (m *Map) DeleteField(ida []string) bool {
copy(m.Fields[i:], m.Fields[i+1:]) copy(m.Fields[i:], m.Fields[i+1:])
return true return true
} }
if f_m, ok := f.Composite.(*Map); ok { f_m := ToMap(f)
if f_m != nil {
return f_m.DeleteField(rest) return f_m.DeleteField(rest)
} }
} }
@ -542,7 +548,8 @@ func (m *Map) GetEdges(eid *EdgeID) []*Edge {
if f == nil { if f == nil {
return nil return nil
} }
if f_m, ok := f.Composite.(*Map); ok { f_m := ToMap(f)
if f_m != nil {
return f_m.GetEdges(eid) return f_m.GetEdges(eid)
} }
return nil return nil
@ -568,16 +575,17 @@ func (m *Map) EnsureEdge(eid *EdgeID) (*Edge, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
switch fc := f.Composite.(type) { if _, ok := f.Composite.(*Array); ok {
case *Map:
return fc.EnsureEdge(eid)
case *Array:
return nil, errors.New("cannot index into array") return nil, errors.New("cannot index into array")
} }
f.Composite = &Map{ f_m := ToMap(f)
parent: f, if f_m == nil {
f_m = &Map{
parent: f,
}
f.Composite = f_m
} }
return f.Composite.(*Map).EnsureEdge(eid) return f_m.EnsureEdge(eid)
} }
eid.Index = nil eid.Index = nil
@ -691,7 +699,8 @@ func (m *Map) appendFieldReferences(i int, kp *d2ast.KeyPath, refctx *RefContext
if i+1 == len(kp.Path) { if i+1 == len(kp.Path) {
return return
} }
if f_m, ok := f.Composite.(*Map); ok { f_m := ToMap(f)
if f_m != nil {
f_m.appendFieldReferences(i+1, kp, refctx) f_m.appendFieldReferences(i+1, kp, refctx)
} }
} }