Merge pull request #2324 from alixander/fix-d2oracle-delete

d2oracle: fix multiline object delete
This commit is contained in:
Alexander Wang 2025-02-02 22:20:06 -08:00 committed by GitHub
commit 7b140e7aff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
52 changed files with 498 additions and 173 deletions

View file

@ -1411,7 +1411,14 @@ func (f *Field) AST() d2ast.Node {
k.Primary = d2ast.MakeValueBox(f.Primary_.AST().(d2ast.Value)).ScalarBox() k.Primary = d2ast.MakeValueBox(f.Primary_.AST().(d2ast.Value)).ScalarBox()
} }
if f.Composite != nil { if f.Composite != nil {
k.Value = d2ast.MakeValueBox(f.Composite.AST().(d2ast.Value)) value := f.Composite.AST().(d2ast.Value)
if m, ok := value.(*d2ast.Map); ok {
path := m.Range.Path
// Treat it as multi-line, but not file-map (line 0)
m.Range = d2ast.MakeRange(",1:0:0-2:0:0")
m.Range.Path = path
}
k.Value = d2ast.MakeValueBox(value)
} }
return k return k

View file

@ -8077,6 +8077,32 @@ y
y y
(* -> *)[*].style.opacity: 0.8 (* -> *)[*].style.opacity: 0.8
`,
},
{
name: "layer-delete-complex-object",
text: `k
layers: {
x: {
a: "b" {
top: 184
left: 180
}
j
}
}
`,
key: `a`,
boardPath: []string{"x"},
exp: `k
layers: {
x: {
j
}
}
`, `,
}, },
} }

View file

@ -215,7 +215,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -239,7 +239,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/ok.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/ok.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -263,7 +263,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -287,7 +287,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -398,7 +398,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -422,7 +422,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -260,7 +260,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -283,7 +283,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -307,7 +307,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/y.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -331,7 +331,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -482,7 +482,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -301,7 +301,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -325,7 +325,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/y.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -349,7 +349,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -415,7 +415,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/y.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -552,7 +552,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -231,7 +231,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -255,7 +255,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -279,7 +279,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -340,7 +340,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -401,7 +401,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -425,7 +425,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -449,7 +449,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -510,7 +510,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -571,7 +571,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -647,7 +647,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -784,7 +784,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -845,7 +845,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -906,7 +906,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -930,7 +930,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -954,7 +954,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -1015,7 +1015,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -1076,7 +1076,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -1300,7 +1300,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -1361,7 +1361,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -1422,7 +1422,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -249,7 +249,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -273,7 +273,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -297,7 +297,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -358,7 +358,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -419,7 +419,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -443,7 +443,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -467,7 +467,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -528,7 +528,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -589,7 +589,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -665,7 +665,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -802,7 +802,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -863,7 +863,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -924,7 +924,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -948,7 +948,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -972,7 +972,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -1033,7 +1033,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -1094,7 +1094,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -1318,7 +1318,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -1379,7 +1379,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -1440,7 +1440,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -301,7 +301,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -325,7 +325,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -349,7 +349,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -500,7 +500,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -231,7 +231,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -255,7 +255,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -302,7 +302,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -326,7 +326,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -496,7 +496,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -520,7 +520,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -139,7 +139,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -163,7 +163,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/meow.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/meow.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -713,7 +713,7 @@
}, },
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -769,7 +769,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -304,7 +304,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -328,7 +328,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -272,7 +272,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -414,7 +414,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -336,7 +336,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -360,7 +360,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -384,7 +384,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -535,7 +535,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -380,7 +380,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -404,7 +404,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -428,7 +428,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -489,7 +489,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -640,7 +640,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -701,7 +701,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -230,7 +230,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -408,7 +408,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -432,7 +432,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -456,7 +456,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -517,7 +517,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -578,7 +578,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -729,7 +729,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -790,7 +790,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -851,7 +851,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -208,7 +208,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -232,7 +232,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -298,7 +298,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -322,7 +322,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/y/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/y/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -348,7 +348,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -502,7 +502,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -208,7 +208,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -269,7 +269,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -293,7 +293,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -472,7 +472,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -496,7 +496,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -548,7 +548,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -595,7 +595,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -873,7 +873,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -522,7 +522,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -546,7 +546,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -621,7 +621,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-1:0:0", "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -462,7 +462,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -573,7 +573,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -597,7 +597,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -748,7 +748,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -772,7 +772,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -925,7 +925,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -949,7 +949,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -1100,7 +1100,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -1124,7 +1124,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -460,7 +460,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -484,7 +484,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -225,7 +225,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -249,7 +249,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -316,7 +316,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -340,7 +340,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -376,7 +376,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -400,7 +400,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -314,7 +314,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -338,7 +338,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -530,7 +530,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -554,7 +554,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -372,7 +372,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -555,7 +555,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -810,7 +810,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -291,7 +291,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -229,7 +229,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -291,7 +291,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -336,7 +336,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -360,7 +360,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -384,7 +384,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -194,7 +194,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -0,0 +1,292 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-7:0:32",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1",
"value": [
{
"string": "k",
"raw_string": "k"
}
]
}
}
]
},
"primary": {},
"value": {}
}
},
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,2:0:3-6:1:31",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,2:0:3-2:6:9",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,2:0:3-2:6:9",
"value": [
{
"string": "layers",
"raw_string": "layers"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,2:8:11-6:1:31",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,3:2:15-5:3:29",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,3:2:15-3:3:16",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,3:2:15-3:3:16",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,3:5:18-5:3:29",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25",
"key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25",
"value": [
{
"string": "j",
"raw_string": "j"
}
]
}
}
]
},
"primary": {},
"value": {}
}
}
]
}
}
}
}
]
}
}
}
}
]
},
"root": {
"id": "",
"id_val": "",
"attributes": {
"label": {
"value": ""
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": ""
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
},
"edges": null,
"objects": [
{
"id": "k",
"id_val": "k",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1",
"value": [
{
"string": "k",
"raw_string": "k"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "k"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
],
"layers": [
{
"name": "x",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-1:0:0",
"nodes": [
{
"map_key": {
"range": ",0:0:0-0:0:0",
"key": {
"range": ",0:0:0-0:0:0",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25",
"value": [
{
"string": "j",
"raw_string": "j"
}
]
}
}
]
},
"primary": {},
"value": {}
}
}
]
},
"root": {
"id": "",
"id_val": "",
"attributes": {
"label": {
"value": ""
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": ""
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
},
"edges": null,
"objects": [
{
"id": "j",
"id_val": "j",
"references": [
{
"key": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25",
"value": [
{
"string": "j",
"raw_string": "j"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"attributes": {
"label": {
"value": "j"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "rectangle"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
]
}
]
},
"err": "<nil>"
}

View file

@ -240,7 +240,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -263,7 +263,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -287,7 +287,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -285,7 +285,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -309,7 +309,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -257,7 +257,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -281,7 +281,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -508,7 +508,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -558,7 +558,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -582,7 +582,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:0:0-1:0:0", "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -697,7 +697,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -1089,7 +1089,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -851,7 +851,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -508,7 +508,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -560,7 +560,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -304,7 +304,7 @@
}, },
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -328,7 +328,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -327,7 +327,7 @@
}, },
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -351,7 +351,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -317,7 +317,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -341,7 +341,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -380,7 +380,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -414,7 +414,7 @@
}, },
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -438,7 +438,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -262,7 +262,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -286,7 +286,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -287,7 +287,7 @@
}, },
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -311,7 +311,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {

View file

@ -289,7 +289,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -313,7 +313,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {
@ -425,7 +425,7 @@
"primary": {}, "primary": {},
"value": { "value": {
"map": { "map": {
"range": ",0:0:0-1:0:0", "range": ",1:0:0-2:0:0",
"nodes": [ "nodes": [
{ {
"map_key": { "map_key": {