From b119174a0964c9b76792af6e474140001e6aca31 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 29 Jul 2023 14:58:48 -0700 Subject: [PATCH] d2ir: Fix implementation of Map.createEdge --- d2ir/compile.go | 2 +- d2ir/d2ir.go | 50 +- .../nulls/basic/attribute.exp.json | 42 + .../nulls/implicit/delete-children.exp.json | 31 + .../nulls/reappear/children-reset.exp.json | 31 + .../d2ir/TestCompile/edges/chain.exp.json | 1113 +---------------- .../d2ir/TestCompile/edges/nested.exp.json | 663 +--------- testdata/d2ir/TestCompile/edges/root.exp.json | 223 +--- .../TestCompile/edges/underscore.exp.json | 418 +------ .../layers/errs/4/good_edge.exp.json | 399 +----- .../d2ir/TestCompile/layers/root.exp.json | 223 +--- .../patterns/edge-glob-index.exp.json | 660 ---------- .../d2ir/TestCompile/patterns/edge/1.exp.json | 12 +- .../d2ir/TestCompile/patterns/edge/2.exp.json | 12 +- .../d2ir/TestCompile/patterns/edge/3.exp.json | 12 +- .../d2ir/TestCompile/scenarios/edge.exp.json | 446 +------ .../d2ir/TestCompile/scenarios/root.exp.json | 669 +--------- .../d2ir/TestCompile/steps/recursive.exp.json | 892 +------------ testdata/d2ir/TestCompile/steps/root.exp.json | 669 +--------- 19 files changed, 189 insertions(+), 6378 deletions(-) diff --git a/d2ir/compile.go b/d2ir/compile.go index 31ad34259..9d97f5b6d 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -685,8 +685,8 @@ func (c *compiler) _compileEdges(refctx *RefContext) { e.Map_ = &Map{ parent: e, } - c.compileField(e.Map_, refctx.Key.EdgeKey, refctx) } + c.compileField(e.Map_, refctx.Key.EdgeKey, refctx) } else { if refctx.Key.Primary.Unbox() != nil { e.Primary_ = &Scalar{ diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index f460d59af..dbc3daa39 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -922,13 +922,6 @@ func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, ea *[]*Edge) error { return d2parser.Errorf(refctx.Edge.Src.Path[ij].Unbox(), "edge with board keyword alone doesn't make sense") } - srcStart := len(refctx.Edge.Src.Path) - len(eid.SrcPath) - if srcStart < 0 { - srcStart = 0 - } - srcKP := refctx.Edge.Src.Copy() - srcKP.Path = srcKP.Path[srcStart:] - ij = findProhibitedEdgeKeyword(eid.DstPath...) if ij != -1 { return d2parser.Errorf(refctx.Edge.Dst.Path[ij].Unbox(), "reserved keywords are prohibited in edges") @@ -938,37 +931,34 @@ func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, ea *[]*Edge) error { return d2parser.Errorf(refctx.Edge.Dst.Path[ij].Unbox(), "edge with board keyword alone doesn't make sense") } - dstStart := len(refctx.Edge.Dst.Path) - len(eid.DstPath) - if dstStart < 0 { - dstStart = 0 - } - dstKP := refctx.Edge.Dst.Copy() - dstKP.Path = dstKP.Path[dstStart:] - - underscoresCountSrc := 0 - underscoresCountDst := 0 - for _, el := range refctx.Edge.Src.Path { - if el.ScalarString() == "_" { - underscoresCountSrc++ + srcKP := d2ast.MakeKeyPath(eid.SrcPath) + lastMatch := 0 + for i, el := range srcKP.Path { + for j := lastMatch; j < len(refctx.Edge.Src.Path); j++ { + realEl := refctx.Edge.Src.Path[j] + if el.ScalarString() == realEl.ScalarString() { + srcKP.Path[i] = realEl + lastMatch += j + 1 + } } } - for _, el := range refctx.Edge.Dst.Path { - if el.ScalarString() == "_" { - underscoresCountDst++ + dstKP := d2ast.MakeKeyPath(eid.DstPath) + lastMatch = 0 + for i, el := range dstKP.Path { + for j := lastMatch; j < len(refctx.Edge.Dst.Path); j++ { + realEl := refctx.Edge.Dst.Path[j] + if el.ScalarString() == realEl.ScalarString() { + dstKP.Path[i] = realEl + lastMatch += j + 1 + } } } - for i := 0; i < underscoresCountDst; i++ { - srcKP.Path = append([]*d2ast.StringBox{d2ast.RawStringBox(eid.SrcPath[i], true)}, srcKP.Path...) - } - for i := 0; i < underscoresCountSrc; i++ { - dstKP.Path = append([]*d2ast.StringBox{d2ast.RawStringBox(eid.DstPath[i], true)}, dstKP.Path...) - } - srcFA, err := m.EnsureField(srcKP, refctx) + srcFA, err := m.EnsureField(srcKP, nil) if err != nil { return err } - dstFA, err := m.EnsureField(dstKP, refctx) + dstFA, err := m.EnsureField(dstKP, nil) if err != nil { return err } diff --git a/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json b/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json index 8b29a9497..fb4a47fbd 100644 --- a/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json @@ -177,6 +177,48 @@ }, "key_path_index": 0, "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/attribute.d2,2:0:22-2:15:37", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/attribute.d2,2:0:22-2:1:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/attribute.d2,2:2:24-2:7:29", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/attribute.d2,2:8:30-2:15:37", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 } ], "attributes": { diff --git a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json index 7d93bdeea..758fbbabb 100644 --- a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json @@ -232,6 +232,37 @@ }, "key_path_index": 0, "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.d2,5:0:22-5:3:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.d2,5:0:22-5:1:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.d2,5:2:24-5:3:25", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 } ], "attributes": { diff --git a/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json b/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json index 3e297fcec..6af8f1845 100644 --- a/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json @@ -195,6 +195,37 @@ "key_path_index": 0, "map_key_edge_index": -1 }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.d2,2:0:7-2:3:10", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.d2,2:0:7-2:1:8", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.d2,2:2:9-2:3:10", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, { "key": { "range": "d2/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.d2,3:0:17-3:3:20", diff --git a/testdata/d2ir/TestCompile/edges/chain.exp.json b/testdata/d2ir/TestCompile/edges/chain.exp.json index 3708c3f1e..8484dbbdb 100644 --- a/testdata/d2ir/TestCompile/edges/chain.exp.json +++ b/testdata/d2ir/TestCompile/edges/chain.exp.json @@ -186,190 +186,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", - "edges": [ - { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -560,374 +376,6 @@ } } }, - { - "string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", - "edges": [ - { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, - { - "string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", - "edges": [ - { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", @@ -1301,374 +749,6 @@ } } }, - { - "string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", - "edges": [ - { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, - { - "string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", - "edges": [ - { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", @@ -2041,190 +1121,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:16:16", - "edges": [ - { - "range": "TestCompile/edges/chain.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:5:5-0:11:11", - "src": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - { - "range": "TestCompile/edges/chain.d2,0:10:10-0:16:16", - "src": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", - "value": [ - { - "string": "d", - "raw_string": "d" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -2240,7 +1136,8 @@ "b" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -2414,7 +1311,8 @@ "c" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -2588,7 +1486,8 @@ "d" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/edges/nested.exp.json b/testdata/d2ir/TestCompile/edges/nested.exp.json index e49102cd2..548780974 100644 --- a/testdata/d2ir/TestCompile/edges/nested.exp.json +++ b/testdata/d2ir/TestCompile/edges/nested.exp.json @@ -171,171 +171,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "edges": [ - { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -507,171 +342,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "edges": [ - { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -846,171 +516,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "edges": [ - { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -1182,171 +687,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "edges": [ - { - "range": "TestCompile/edges/nested.d2,0:0:0-0:10:10", - "src": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:3:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -1364,7 +704,8 @@ "p" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/edges/root.exp.json b/testdata/d2ir/TestCompile/edges/root.exp.json index 3938e435b..ec08bcf95 100644 --- a/testdata/d2ir/TestCompile/edges/root.exp.json +++ b/testdata/d2ir/TestCompile/edges/root.exp.json @@ -112,116 +112,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -337,116 +227,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/edges/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -462,7 +242,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/edges/underscore.exp.json b/testdata/d2ir/TestCompile/edges/underscore.exp.json index f97efdddb..066323086 100644 --- a/testdata/d2ir/TestCompile/edges/underscore.exp.json +++ b/testdata/d2ir/TestCompile/edges/underscore.exp.json @@ -138,148 +138,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "p" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", - "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", - "value": [ - { - "string": "_", - "raw_string": "_" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", - "edges": [ - { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", - "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", - "value": [ - { - "string": "_", - "raw_string": "_" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -400,147 +258,6 @@ } } } - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "p" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "p" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", - "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", - "value": [ - { - "string": "_", - "raw_string": "_" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", - "edges": [ - { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", - "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", - "value": [ - { - "string": "_", - "raw_string": "_" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -689,138 +406,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", - "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", - "value": [ - { - "string": "_", - "raw_string": "_" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:14:14", - "edges": [ - { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:13:13", - "src": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:8:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:5:5-0:6:6", - "value": [ - { - "string": "_", - "raw_string": "_" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -837,7 +422,8 @@ "z" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json index 754264164..c18033088 100644 --- a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json +++ b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json @@ -450,402 +450,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", - "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:6:6", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:20:20", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:21:21-0:22:22", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", - "edges": [ - { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", - "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:6:6", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:20:20", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:21:21-0:22:22", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, - { - "string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", - "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:6:6", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:20:20", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:21:21-0:22:22", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", - "edges": [ - { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:24:24", - "src": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:10:10", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:6:6", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:7:7-0:8:8", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:24:24", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:14:14-0:20:20", - "value": [ - { - "string": "layers", - "raw_string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:21:21-0:22:22", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/layers/errs/4/good_edge.d2,0:23:23-0:24:24", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] } @@ -861,7 +465,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/layers/root.exp.json b/testdata/d2ir/TestCompile/layers/root.exp.json index 6c8ca2fa4..82ca928ad 100644 --- a/testdata/d2ir/TestCompile/layers/root.exp.json +++ b/testdata/d2ir/TestCompile/layers/root.exp.json @@ -112,116 +112,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -337,116 +227,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/layers/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1025,7 +805,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json b/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json index 71a40a308..8da87a6c9 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json @@ -113,116 +113,6 @@ } } }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", @@ -333,226 +223,6 @@ } } }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", @@ -1234,116 +904,6 @@ } } }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", @@ -1454,226 +1014,6 @@ } } }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:6:13", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:0:7-1:1:8", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,1:5:12-1:6:13", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:6:20", - "src": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:0:14-2:1:15", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/patterns/edge-glob-index.d2,2:5:19-2:6:20", diff --git a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json index dff85c37a..6e38e272d 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json @@ -124,7 +124,8 @@ "animate" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -240,7 +241,8 @@ "animal" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -356,7 +358,8 @@ "animate" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -472,7 +475,8 @@ "animal" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json index b5d8b16a5..95a956c07 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json @@ -172,7 +172,8 @@ "animate" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -308,7 +309,8 @@ "animal" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -444,7 +446,8 @@ "animate" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -580,7 +583,8 @@ "animal" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json index 7f8948ac4..3316812a8 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json @@ -172,7 +172,8 @@ "animate" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -348,7 +349,8 @@ "animal" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -524,7 +526,8 @@ "animate" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -700,7 +703,8 @@ "animal" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/scenarios/edge.exp.json b/testdata/d2ir/TestCompile/scenarios/edge.exp.json index 7bfb0dce9..c0ef78879 100644 --- a/testdata/d2ir/TestCompile/scenarios/edge.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/edge.exp.json @@ -112,116 +112,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -337,116 +227,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -571,116 +351,6 @@ } } }, - { - "string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/scenarios/edge.d2,3:5:32-3:6:33", @@ -944,116 +614,6 @@ } } }, - { - "string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } - }, { "string": { "range": "TestCompile/scenarios/edge.d2,3:10:37-3:11:38", @@ -1216,7 +776,8 @@ "b" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "map": { "fields": [ @@ -2108,7 +1669,8 @@ "b" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/scenarios/root.exp.json b/testdata/d2ir/TestCompile/scenarios/root.exp.json index 31100d590..0c7ae1e33 100644 --- a/testdata/d2ir/TestCompile/scenarios/root.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/root.exp.json @@ -112,116 +112,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -337,116 +227,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -570,116 +350,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -795,116 +465,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1230,7 +790,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -1543,116 +1104,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1768,116 +1219,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1949,7 +1290,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -2325,7 +1667,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/steps/recursive.exp.json b/testdata/d2ir/TestCompile/steps/recursive.exp.json index f92eec4b9..bcaeb4be0 100644 --- a/testdata/d2ir/TestCompile/steps/recursive.exp.json +++ b/testdata/d2ir/TestCompile/steps/recursive.exp.json @@ -112,116 +112,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -337,116 +227,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -570,116 +350,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -795,116 +465,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1230,7 +790,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -1543,116 +1104,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1768,116 +1219,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -2367,116 +1708,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -2592,116 +1823,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -3139,7 +2260,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -3441,7 +2563,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -3979,7 +3102,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { diff --git a/testdata/d2ir/TestCompile/steps/root.exp.json b/testdata/d2ir/TestCompile/steps/root.exp.json index 51f9d002c..a8b486f76 100644 --- a/testdata/d2ir/TestCompile/steps/root.exp.json +++ b/testdata/d2ir/TestCompile/steps/root.exp.json @@ -112,116 +112,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -337,116 +227,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -570,116 +350,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -795,116 +465,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1230,7 +790,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -1543,116 +1104,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -1768,116 +1219,6 @@ "value": {} } } - }, - { - "string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "TestCompile/steps/root.d2,0:0:0-0:6:6", - "src": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - } } ] }, @@ -2259,7 +1600,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ { @@ -2635,7 +1977,8 @@ "y" ], "dst_arrow": true, - "index": 0 + "index": 0, + "glob": false }, "references": [ {