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

err msg

Browse source
This commit is contained in:
Alexander Wang 2023-07-13 08:37:22 -07:00
parent 06ed41ecae
commit ffdb5121f4
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
d2compiler/compile_test.go
View file

@ -3841,7 +3841,7 @@ z: {
...${x} ...${x}
c c
} }
`, `d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-composite into composite`) `, `d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-composite`)
}, },
}, },
{ {

2
d2ir/compile.go
View file

@ -157,7 +157,7 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) {
} }
if box.Substitution.Spread { if box.Substitution.Spread {
if resolvedField.Composite == nil { if resolvedField.Composite == nil {
c.errorf(box.Substitution, "cannot spread non-composite into composite") c.errorf(box.Substitution, "cannot spread non-composite")
continue continue
} }
switch n := node.(type) { switch n := node.(type) {

2
testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json generated vendored
View file

@ -4,7 +4,7 @@
"errs": [ "errs": [
{ {
"range": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2,5:2:26-5:9:33", "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2,5:2:26-5:9:33",
"errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-composite into composite" "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-composite"
} }
] ]
} }