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

d2compiler: Integrate d2ir (wip)

Browse source
This commit is contained in:
Anmol Sethi 2023-01-22 01:08:13 -08:00
parent 154c7e8947
commit b900f63414
No known key found for this signature in database
GPG key ID: 25BC68888A99A8BA
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
d2compiler/compile.go
View file

@ -168,6 +168,9 @@ func (c *compiler) compileLabel(attrs *d2graph.Attributes, f d2ir.Node) {
} }
func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) {
if f.Primary() == nil {
return
}
scalar := f.Primary().Value scalar := f.Primary().Value
switch f.Name { switch f.Name {
case "label": case "label":
@ -240,6 +243,9 @@ func (c *compiler) compileStyle(attrs *d2graph.Attributes, m *d2ir.Map) {
} }
func (c *compiler) compileStyleField(attrs *d2graph.Attributes, f *d2ir.Field) { func (c *compiler) compileStyleField(attrs *d2graph.Attributes, f *d2ir.Field) {
if f.Primary() == nil {
return
}
scalar := f.Primary().Value scalar := f.Primary().Value
err := attrs.Style.Apply(f.Name, scalar.ScalarString()) err := attrs.Style.Apply(f.Name, scalar.ScalarString())
if err != nil { if err != nil {

25
d2ir/d2ir.go
View file

@ -235,7 +235,8 @@ func NodeLayerKind(n Node) LayerKind {
} }
type Field struct { type Field struct {
parent *Map // *Map.
parent Node
Name string `json:"name"` Name string `json:"name"`
@ -249,7 +250,7 @@ func (f *Field) Copy(newParent Node) Node {
tmp := *f tmp := *f
f = &tmp f = &tmp
f.parent = newParent.(*Map) f.parent = newParent
f.References = append([]*FieldReference(nil), f.References...) f.References = append([]*FieldReference(nil), f.References...)
if f.Primary_ != nil { if f.Primary_ != nil {
f.Primary_ = f.Primary_.Copy(f).(*Scalar) f.Primary_ = f.Primary_.Copy(f).(*Scalar)
@ -397,7 +398,8 @@ func (eid *EdgeID) trimCommon() (common []string, _ *EdgeID) {
} }
type Edge struct { type Edge struct {
parent *Map // *Map
parent Node
ID *EdgeID `json:"edge_id"` ID *EdgeID `json:"edge_id"`
@ -411,7 +413,7 @@ func (e *Edge) Copy(newParent Node) Node {
tmp := *e tmp := *e
e = &tmp e = &tmp
e.parent = newParent.(*Map) e.parent = newParent
e.References = append([]*EdgeReference(nil), e.References...) e.References = append([]*EdgeReference(nil), e.References...)
if e.Primary_ != nil { if e.Primary_ != nil {
e.Primary_ = e.Primary_.Copy(e).(*Scalar) e.Primary_ = e.Primary_.Copy(e).(*Scalar)
@ -898,8 +900,11 @@ func (m *Map) appendFieldReferences(i int, kp *d2ast.KeyPath, refctx *RefContext
} }
func ParentMap(n Node) *Map { func ParentMap(n Node) *Map {
for n.Parent() != nil { for {
n = n.Parent() n = n.Parent()
if n == nil {
return nil
}
if m, ok := n.(*Map); ok { if m, ok := n.(*Map); ok {
return m return m
} }
@ -908,8 +913,11 @@ func ParentMap(n Node) *Map {
} }
func ParentField(n Node) *Field { func ParentField(n Node) *Field {
for n.Parent() != nil { for {
n = n.Parent() n = n.Parent()
if n == nil {
return nil
}
if f, ok := n.(*Field); ok { if f, ok := n.(*Field); ok {
return f return f
} }
@ -932,8 +940,11 @@ func ParentLayer(n Node) *Map {
} }
func ParentEdge(n Node) *Edge { func ParentEdge(n Node) *Edge {
for n.Parent() != nil { for {
n = n.Parent() n = n.Parent()
if n == nil {
return nil
}
if e, ok := n.(*Edge); ok { if e, ok := n.(*Edge); ok {
return e return e
} }