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

remove overlayVars

Browse source
This commit is contained in:
Alexander Wang 2023-07-13 10:16:41 -07:00
parent eba41af47d
commit a54907e28a
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
4 changed files with 0 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
d2ir/compile.go
View file

@ -265,22 +265,6 @@ func (c *compiler) resolveSubstitution(vars *Map, substitution *d2ast.Substituti
return nil return nil
} }
func (c *compiler) overlayVars(base, overlay *Map) {
vars := overlay.GetField("vars")
if vars == nil {
return
}
vars = vars.Copy(base).(*Field)
baseVars := base.GetField("vars")
if baseVars != nil {
OverlayMap(vars.Map(), baseVars.Map())
base.DeleteField("vars")
}
base.Fields = append(base.Fields, vars)
}
func (c *compiler) overlay(base *Map, f *Field) { func (c *compiler) overlay(base *Map, f *Field) {
if f.Map() == nil || f.Primary() != nil { if f.Map() == nil || f.Primary() != nil {
c.errorf(f.References[0].Context.Key, "invalid %s", NodeBoardKind(f)) c.errorf(f.References[0].Context.Key, "invalid %s", NodeBoardKind(f))
@ -393,7 +377,6 @@ func (c *compiler) compileField(dst *Map, kp *d2ast.KeyPath, refctx *RefContext)
} }
} }
case BoardLayer: case BoardLayer:
c.overlayVars(f.Map(), ParentBoard(f).Map())
default: default:
// If new board type, use that as the new scope AST, otherwise, carry on // If new board type, use that as the new scope AST, otherwise, carry on
scopeAST = refctx.ScopeAST scopeAST = refctx.ScopeAST

32
testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json generated vendored
View file

@ -372,38 +372,6 @@
}, },
"value": {} "value": {}
} }
},
{
"map_key": {
"range": ",0:0:0-0:0:0",
"key": {
"range": ",0:0:0-0:0:0",
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"value": [
{
"string": "y"
}
]
}
}
]
},
"primary": {
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,3:5:30-3:15:40",
"value": [
{
"string": "root var y",
"raw_string": "root var y"
}
]
}
},
"value": {}
}
} }
] ]
} }

60
testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json generated vendored
View file

@ -191,66 +191,6 @@
"ast": { "ast": {
"range": ",1:0:0-2:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{
"map_key": {
"range": ",0:0:0-0:0:0",
"key": {
"range": ",0:0:0-0:0:0",
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"value": [
{
"string": "vars"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": ",1:0:0-2:0:0",
"nodes": [
{
"map_key": {
"range": ",0:0:0-0:0:0",
"key": {
"range": ",0:0:0-0:0:0",
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"value": [
{
"string": "x"
}
]
}
}
]
},
"primary": {
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,2:5:14-2:13:22",
"value": [
{
"string": "im a var",
"raw_string": "im a var"
}
]
}
},
"value": {}
}
}
]
}
}
}
},
{ {
"map_key": { "map_key": {
"range": ",0:0:0-0:0:0", "range": ",0:0:0-0:0:0",

32
testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json generated vendored
View file

@ -492,38 +492,6 @@
"map": { "map": {
"range": ",1:0:0-2:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{
"map_key": {
"range": ",0:0:0-0:0:0",
"key": {
"range": ",0:0:0-0:0:0",
"path": [
{
"unquoted_string": {
"range": ",0:0:0-0:0:0",
"value": [
{
"string": "x"
}
]
}
}
]
},
"primary": {
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:5:14-2:13:22",
"value": [
{
"string": "im x var",
"raw_string": "im x var"
}
]
}
},
"value": {}
}
},
{ {
"map_key": { "map_key": {
"range": ",0:0:0-0:0:0", "range": ",0:0:0-0:0:0",