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

cleanup

Browse source
This commit is contained in:
Alexander Wang 2023-06-26 10:39:38 -07:00
parent 02fa36d598
commit 5be1f6c187
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
3 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
d2compiler/compile.go
View file

@ -245,7 +245,7 @@ func (c *compiler) compileMap(obj *d2graph.Object, m *d2ir.Map) {
} }
for _, e := range m.Edges { for _, e := range m.Edges {
c.compileEdge(obj, e, m) c.compileEdge(obj, e)
} }
} }
} }
@ -305,7 +305,6 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) {
} }
obj = obj.EnsureChild(d2graphIDA([]string{f.Name})) obj = obj.EnsureChild(d2graphIDA([]string{f.Name}))
if f.Primary() != nil { if f.Primary() != nil {
c.compileLabel(&obj.Attributes, f) c.compileLabel(&obj.Attributes, f)
} }
@ -704,13 +703,7 @@ func compileStyleFieldInit(attrs *d2graph.Attributes, f *d2ir.Field) {
} }
} }
func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge, m *d2ir.Map) { func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge) {
if e.Primary() != nil {
if _, ok := e.Primary().Value.(*d2ast.Null); ok {
return
}
}
edge, err := obj.Connect(d2graphIDA(e.ID.SrcPath), d2graphIDA(e.ID.DstPath), e.ID.SrcArrow, e.ID.DstArrow, "") edge, err := obj.Connect(d2graphIDA(e.ID.SrcPath), d2graphIDA(e.ID.DstPath), e.ID.SrcArrow, e.ID.DstArrow, "")
if err != nil { if err != nil {
c.errorf(e.References[0].AST(), err.Error()) c.errorf(e.References[0].AST(), err.Error())

1
d2ir/compile.go
View file

@ -161,7 +161,6 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext)
parent: f, parent: f,
Value: refctx.Key.Primary.Unbox(), Value: refctx.Key.Primary.Unbox(),
} }
} }
if refctx.Key.Value.Array != nil { if refctx.Key.Value.Array != nil {
a := &Array{ a := &Array{

14
d2ir/d2ir.go
View file

@ -786,20 +786,6 @@ func (m *Map) GetEdges(eid *EdgeID) []*Edge {
return ea return ea
} }
func (m *Map) DeleteEdge(eid *EdgeID) *Edge {
if eid == nil {
return nil
}
for i, e := range m.Edges {
if e.ID.Match(eid) {
m.Edges = append(m.Edges[:i], m.Edges[i+1:]...)
return e
}
}
return nil
}
func (m *Map) CreateEdge(eid *EdgeID, refctx *RefContext) (*Edge, error) { func (m *Map) CreateEdge(eid *EdgeID, refctx *RefContext) (*Edge, error) {
if ParentEdge(m) != nil { if ParentEdge(m) != nil {
return nil, d2parser.Errorf(refctx.Edge, "cannot create edge inside edge") return nil, d2parser.Errorf(refctx.Edge, "cannot create edge inside edge")