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

d2ir: Fix _ with null

Browse source
This commit is contained in:
Anmol Sethi 2023-07-14 14:22:02 -07:00
parent 359976e5d4
commit 210816a42b
No known key found for this signature in database
GPG key ID: 8CEF1878FF10ADEB
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
d2ir/compile.go
View file

@ -396,15 +396,6 @@ func (c *compiler) compileKey(refctx *RefContext) {
} }
func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) { func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext) {
if refctx.Key != nil && len(refctx.Key.Edges) == 0 && refctx.Key.Value.Null != nil {
// For vars, if we delete the field, it may just resolve to an outer scope var of the same name
// Instead we keep it around, so that resolveSubstitutions can find it
if !IsVar(dst) {
dst.DeleteField(kp.IDA()...)
return
}
}
us, ok := kp.Path[0].Unbox().(*d2ast.UnquotedString) us, ok := kp.Path[0].Unbox().(*d2ast.UnquotedString)
if ok && us.Pattern != nil { if ok && us.Pattern != nil {
for _, f := range dst.Fields { for _, f := range dst.Fields {
@ -429,6 +420,15 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext)
} }
func (c *compiler) _compileField(f *Field, refctx *RefContext) { func (c *compiler) _compileField(f *Field, refctx *RefContext) {
if len(refctx.Key.Edges) == 0 && refctx.Key.Value.Null != nil {
// For vars, if we delete the field, it may just resolve to an outer scope var of the same name
// Instead we keep it around, so that resolveSubstitutions can find it
if !IsVar(ParentMap(f)) {
dst.DeleteField(f.Name)
return
}
}
if refctx.Key.Primary.Unbox() != nil { if refctx.Key.Primary.Unbox() != nil {
f.Primary_ = &Scalar{ f.Primary_ = &Scalar{
parent: f, parent: f,