From 64daf4643ff86f0a05f842f62cb3d78b0a79347c Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Fri, 16 Jun 2023 16:23:57 -0700 Subject: [PATCH] use right AST --- d2compiler/compile.go | 2 +- d2ir/d2ir.go | 36 +- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 79993 -> 79993 bytes .../link-board-key-nested.exp.json | 100 ++- .../TestCompile/link-board-mixed.exp.json | 666 ++++++++++----- .../TestCompile/link-board-nested.exp.json | 293 +++---- .../TestCompile/link-board-ok.exp.json | 135 +-- .../link-board-underscore.exp.json | 406 +++++---- .../TestCompile2/boards/isFolderOnly.exp.json | 712 +++++++--------- .../TestCompile2/boards/recursive.exp.json | 804 +++++++++--------- .../TestCompile2/boards/root.exp.json | 124 ++- .../boards/scenarios_edge_index.exp.json | 302 ++++--- 12 files changed, 1841 insertions(+), 1739 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 67edfe184..b4e31cd9f 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -110,7 +110,7 @@ func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName } g2 := d2graph.NewGraph() g2.Parent = g - g2.AST = g.AST + g2.AST = ir.AST().(*d2ast.Map) c.compileBoard(g2, f.Map()) g2.Name = f.Name switch fieldName { diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index bf4b6cdd9..47651fdc6 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -25,7 +25,7 @@ type Node interface { Map() *Map Equal(n2 Node) bool - ast() d2ast.Node + AST() d2ast.Node fmt.Stringer LastRef() Reference @@ -100,11 +100,11 @@ func (n *Map) value() {} func (n *Array) composite() {} func (n *Map) composite() {} -func (n *Scalar) String() string { return d2format.Format(n.ast()) } -func (n *Field) String() string { return d2format.Format(n.ast()) } -func (n *Edge) String() string { return d2format.Format(n.ast()) } -func (n *Array) String() string { return d2format.Format(n.ast()) } -func (n *Map) String() string { return d2format.Format(n.ast()) } +func (n *Scalar) String() string { return d2format.Format(n.AST()) } +func (n *Field) String() string { return d2format.Format(n.AST()) } +func (n *Edge) String() string { return d2format.Format(n.AST()) } +func (n *Array) String() string { return d2format.Format(n.AST()) } +func (n *Map) String() string { return d2format.Format(n.AST()) } func (n *Scalar) LastRef() Reference { return parentRef(n) } func (n *Map) LastRef() Reference { return parentRef(n) } @@ -855,11 +855,11 @@ func (m *Map) CreateEdge(eid *EdgeID, refctx *RefContext) (*Edge, error) { return e, nil } -func (s *Scalar) ast() d2ast.Node { +func (s *Scalar) AST() d2ast.Node { return s.Value } -func (f *Field) ast() d2ast.Node { +func (f *Field) AST() d2ast.Node { k := &d2ast.Key{ Key: &d2ast.KeyPath{ Path: []*d2ast.StringBox{ @@ -869,16 +869,16 @@ func (f *Field) ast() d2ast.Node { } if f.Primary_ != nil { - k.Primary = d2ast.MakeValueBox(f.Primary_.ast().(d2ast.Value)).ScalarBox() + k.Primary = d2ast.MakeValueBox(f.Primary_.AST().(d2ast.Value)).ScalarBox() } if f.Composite != nil { - k.Value = d2ast.MakeValueBox(f.Composite.ast().(d2ast.Value)) + k.Value = d2ast.MakeValueBox(f.Composite.AST().(d2ast.Value)) } return k } -func (e *Edge) ast() d2ast.Node { +func (e *Edge) AST() d2ast.Node { astEdge := &d2ast.Edge{} astEdge.Src = d2ast.MakeKeyPath(e.ID.SrcPath) @@ -895,27 +895,27 @@ func (e *Edge) ast() d2ast.Node { } if e.Primary_ != nil { - k.Primary = d2ast.MakeValueBox(e.Primary_.ast().(d2ast.Value)).ScalarBox() + k.Primary = d2ast.MakeValueBox(e.Primary_.AST().(d2ast.Value)).ScalarBox() } if e.Map_ != nil { - k.Value = d2ast.MakeValueBox(e.Map_.ast().(*d2ast.Map)) + k.Value = d2ast.MakeValueBox(e.Map_.AST().(*d2ast.Map)) } return k } -func (a *Array) ast() d2ast.Node { +func (a *Array) AST() d2ast.Node { if a == nil { return nil } astArray := &d2ast.Array{} for _, av := range a.Values { - astArray.Nodes = append(astArray.Nodes, d2ast.MakeArrayNodeBox(av.ast().(d2ast.ArrayNode))) + astArray.Nodes = append(astArray.Nodes, d2ast.MakeArrayNodeBox(av.AST().(d2ast.ArrayNode))) } return astArray } -func (m *Map) ast() d2ast.Node { +func (m *Map) AST() d2ast.Node { if m == nil { return nil } @@ -926,10 +926,10 @@ func (m *Map) ast() d2ast.Node { astMap.Range = d2ast.MakeRange(",1:0:0-2:0:0") } for _, f := range m.Fields { - astMap.Nodes = append(astMap.Nodes, d2ast.MakeMapNodeBox(f.ast().(d2ast.MapNode))) + astMap.Nodes = append(astMap.Nodes, d2ast.MakeMapNodeBox(f.AST().(d2ast.MapNode))) } for _, e := range m.Edges { - astMap.Nodes = append(astMap.Nodes, d2ast.MakeMapNodeBox(e.ast().(d2ast.MapNode))) + astMap.Nodes = append(astMap.Nodes, d2ast.MakeMapNodeBox(e.AST().(d2ast.MapNode))) } return astMap } diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index 1aa634871f16cecfd859233aab46a7896e0f713a..2e67523116650f56d70d5431b6583fcf304a4b05 100644 GIT binary patch delta 54 zcmezQf#v51mWC~iRi-M2W`<@)#>U2)T>8HGDK3d6sR|k{Rz?O!#s)wch}`yhri{0l E0Quz*Z~y=R delta 54 zcmezQf#v51mWC~iRi-KimPQ69md56qT>8HGDK3d6sR|k{Rz?O!#s+3Ex$W~z8E-QI E0Q++gf&c&j diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index a2ea20a5e..b7e2cdcfc 100644 --- a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json @@ -295,21 +295,20 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-7:1:55", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-2:1:25", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "x" } ] } @@ -319,32 +318,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:3:3-2:1:25", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:18:23", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:8:13", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:2:7-1:3:8", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "y", - "raw_string": "y" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,1:4:9-1:8:13", - "value": [ - { - "string": "link", - "raw_string": "link" + "string": "y" } ] } @@ -353,11 +340,39 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ { - "string": "root.layers.x" + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.x" + } + ] + } + }, + "value": {} + } } ] } @@ -371,17 +386,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-7:1:55", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-3:6:32", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:0:26-3:6:32", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -391,21 +405,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,3:8:34-7:1:55", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:2:38-6:3:53", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:2:38-4:3:39", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:2:38-4:3:39", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "x" } ] } @@ -415,21 +428,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,4:5:41-6:3:53", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index 15c2b7076..9243134fa 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -420,29 +420,27 @@ "name": "cat", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-13:1:175", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:30:30", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "question", - "raw_string": "question" + "string": "question" } ] } } ] }, - "primary": {}, - "value": { + "primary": { "unquoted_string": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:10:10-0:30:30", "value": [ @@ -452,46 +450,41 @@ } ] } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:25:56", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:8:39", - "value": [ - { - "string": "question", - "raw_string": "question" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:9:40-1:13:44", - "value": [ - { - "string": "link", - "raw_string": "link" - } - ] - } - } - ] }, - "primary": {}, "value": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ { - "string": "root.layers.cat" + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.cat" + } + ] + } + }, + "value": {} + } } ] } @@ -500,17 +493,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-7:1:113", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-3:6:64", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-3:6:64", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -520,21 +512,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:1:113", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-6:3:111", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-4:5:73", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-4:5:73", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "cat", - "raw_string": "cat" + "string": "cat" } ] } @@ -544,24 +535,67 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:3:111", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:30:107", + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "the cat" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "meeeowwww" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", "edges": [ { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:24:101", + "range": ",0:0:0-0:0:0", "src": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "the cat", - "raw_string": "the cat" + "string": "the cat" } ] } @@ -570,15 +604,14 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "meeeowwww", - "raw_string": "meeeowwww" + "string": "meeeowwww" } ] } @@ -588,8 +621,7 @@ "dst_arrow": ">" } ], - "primary": {}, - "value": { + "primary": { "unquoted_string": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107", "value": [ @@ -599,7 +631,8 @@ } ] } - } + }, + "value": {} } } ] @@ -614,17 +647,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-13:1:175", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "scenarios", - "raw_string": "scenarios" + "string": "scenarios" } ] } @@ -634,21 +666,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:1:175", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-12:3:173", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "green", - "raw_string": "green" + "string": "green" } ] } @@ -658,57 +689,131 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:3:173", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:30:169", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:23:162", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:12:151", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "question", - "raw_string": "question" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:13:152-11:18:157", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:19:158-11:23:162", - "value": [ - { - "string": "fill", - "raw_string": "fill" + "string": "question" } ] } } ] }, - "primary": {}, - "value": { + "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:10:10-0:30:30", "value": [ { - "string": "green", - "raw_string": "green" + "string": "How does the cat go?", + "raw_string": "How does the cat go?" + } + ] + } + }, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.cat" + } + ] + } + }, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "fill" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169", + "value": [ + { + "string": "green", + "raw_string": "green" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } } ] } @@ -881,29 +986,27 @@ "name": "green", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-13:1:175", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:30:30", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "question", - "raw_string": "question" + "string": "question" } ] } } ] }, - "primary": {}, - "value": { + "primary": { "unquoted_string": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:10:10-0:30:30", "value": [ @@ -913,46 +1016,41 @@ } ] } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:25:56", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:13:44", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:0:31-1:8:39", - "value": [ - { - "string": "question", - "raw_string": "question" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:9:40-1:13:44", - "value": [ - { - "string": "link", - "raw_string": "link" - } - ] - } - } - ] }, - "primary": {}, "value": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ { - "string": "root.layers.cat" + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.cat" + } + ] + } + }, + "value": {} + } } ] } @@ -961,17 +1059,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-7:1:113", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-3:6:64", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:0:58-3:6:64", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -981,21 +1078,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,3:8:66-7:1:113", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-6:3:111", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-4:5:73", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:2:70-4:5:73", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "cat", - "raw_string": "cat" + "string": "cat" } ] } @@ -1005,24 +1101,67 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,4:7:75-6:3:111", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:30:107", + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "the cat" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "meeeowwww" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", "edges": [ { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:24:101", + "range": ",0:0:0-0:0:0", "src": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "the cat", - "raw_string": "the cat" + "string": "the cat" } ] } @@ -1031,15 +1170,14 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "meeeowwww", - "raw_string": "meeeowwww" + "string": "meeeowwww" } ] } @@ -1049,8 +1187,7 @@ "dst_arrow": ">" } ], - "primary": {}, - "value": { + "primary": { "unquoted_string": { "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:26:103-5:30:107", "value": [ @@ -1060,7 +1197,8 @@ } ] } - } + }, + "value": {} } } ] @@ -1075,17 +1213,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-13:1:175", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:0:115-9:9:124", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "scenarios", - "raw_string": "scenarios" + "string": "scenarios" } ] } @@ -1095,21 +1232,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,9:11:126-13:1:175", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-12:3:173", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:2:130-10:7:135", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "green", - "raw_string": "green" + "string": "green" } ] } @@ -1119,57 +1255,131 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,10:9:137-12:3:173", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:30:169", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:23:162", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:4:143-11:12:151", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "question", - "raw_string": "question" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:13:152-11:18:157", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:19:158-11:23:162", - "value": [ - { - "string": "fill", - "raw_string": "fill" + "string": "question" } ] } } ] }, - "primary": {}, - "value": { + "primary": { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:10:10-0:30:30", "value": [ { - "string": "green", - "raw_string": "green" + "string": "How does the cat go?", + "raw_string": "How does the cat go?" + } + ] + } + }, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.cat" + } + ] + } + }, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "fill" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:25:164-11:30:169", + "value": [ + { + "string": "green", + "raw_string": "green" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } } ] } diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 4ea2f48a0..94422bd7d 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -279,64 +279,20 @@ "name": "x", "isFolderOnly": true, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-9:1:101", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:25:25", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:2:2-0:6:6", - "value": [ - { - "string": "link", - "raw_string": "link" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x.layers.x" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-9:1:101", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", - "value": [ - { - "string": "layers", - "raw_string": "layers" + "string": "x" } ] } @@ -346,21 +302,79 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:1:101", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-8:3:99", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-2:3:39", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-2:3:39", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.x.layers.x" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "x" } ] } @@ -370,21 +384,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:3:99", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-7:5:95", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -394,21 +407,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:5:95", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-6:7:89", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "x" } ] } @@ -418,21 +430,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:7:89", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "hello", - "raw_string": "hello" + "string": "hello" } ] } @@ -495,64 +506,20 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-9:1:101", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:25:25", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:6:6", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:2:2-0:6:6", - "value": [ - { - "string": "link", - "raw_string": "link" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x.layers.x" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-9:1:101", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:26-1:6:32", - "value": [ - { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -562,21 +529,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:8:34-9:1:101", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-8:3:99", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-2:3:39", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:2:38-2:3:39", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "x" } ] } @@ -586,21 +552,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,2:5:41-8:3:99", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-7:5:95", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "hello" } ] } @@ -608,65 +573,7 @@ ] }, "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:12:55-7:5:95", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-6:7:89", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:9:66-6:7:89", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", - "value": [ - { - "string": "hello", - "raw_string": "hello" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } - } - ] - } - } + "value": {} } } ] diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index d81c69956..39fc98f06 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -221,64 +221,20 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-5:1:42", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:16:16", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:6:6", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:2:2-0:6:6", - "value": [ - { - "string": "link", - "raw_string": "link" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-5:1:42", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-1:6:23", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:0:17-1:6:23", - "value": [ - { - "string": "layers", - "raw_string": "layers" + "string": "x" } ] } @@ -288,21 +244,79 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,1:8:25-5:1:42", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:1:28-4:2:40", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:1:28-2:2:29", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:1:28-2:2:29", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.x" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "x" } ] } @@ -312,21 +326,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,2:4:31-4:2:40", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "y", - "raw_string": "y" + "string": "y" } ] } diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json index 89bdcb03b..a4c160eda 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -331,21 +331,20 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-11:1:121", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "x" } ] } @@ -358,17 +357,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-11:1:121", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -378,21 +376,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:1:121", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-10:3:119", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "x" } ] } @@ -402,21 +399,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:3:119", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "yo", - "raw_string": "yo" + "string": "yo" } ] } @@ -429,17 +425,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-9:5:115", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -449,21 +444,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:5:115", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-8:7:109", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "x" } ] } @@ -473,32 +467,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:7:109", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:32:81", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:18:67", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:13:62", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "hello", - "raw_string": "hello" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:14:63-6:18:67", - "value": [ - { - "string": "link", - "raw_string": "link" + "string": "hello" } ] } @@ -507,11 +489,39 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ { - "string": "root.layers.x" + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.x" + } + ] + } + }, + "value": {} + } } ] } @@ -520,28 +530,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:19:101", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:16:98", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:11:93", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "hey", - "raw_string": "hey" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:12:94-7:16:98", - "value": [ - { - "string": "link", - "raw_string": "link" + "string": "hey" } ] } @@ -550,11 +548,39 @@ }, "primary": {}, "value": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ { - "string": "root.layers.x" + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.x" + } + ] + } + }, + "value": {} + } } ] } @@ -659,21 +685,20 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-11:1:121", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-0:1:1", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "yo" } ] } @@ -686,17 +711,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-11:1:121", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:2-1:6:8", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -706,21 +730,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:8:10-11:1:121", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-10:3:119", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:1:13-2:2:14", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "x" } ] } @@ -730,44 +753,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,2:4:16-10:3:119", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "yo", - "raw_string": "yo" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-9:5:115", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", - "value": [ - { - "string": "layers", - "raw_string": "layers" + "string": "hello" } ] } @@ -777,121 +776,96 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:12:36-9:5:115", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-8:7:109", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "link" } ] } } ] }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:9:47-8:7:109", - "nodes": [ + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:32:81", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:18:67", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:13:62", - "value": [ - { - "string": "hello", - "raw_string": "hello" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:14:63-6:18:67", - "value": [ - { - "string": "link", - "raw_string": "link" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:19:101", - "key": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:16:98", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:11:93", - "value": [ - { - "string": "hey", - "raw_string": "hey" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:12:94-7:16:98", - "value": [ - { - "string": "link", - "raw_string": "link" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "root.layers.x" - } - ] - } - } - } + "string": "root.layers.x" } ] } + }, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "hey" } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.x" + } + ] + } + }, + "value": {} } } ] diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json index 5ee5d2dc2..b7be79f41 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json @@ -318,21 +318,20 @@ "name": "one", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-18:0:165", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-17:1:164", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -342,21 +341,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:1:164", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-4:3:33", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "one", - "raw_string": "one" + "string": "one" } ] } @@ -366,21 +364,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:3:33", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "santa", - "raw_string": "santa" + "string": "santa" } ] } @@ -398,17 +395,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-16:3:162", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "two", - "raw_string": "two" + "string": "two" } ] } @@ -418,21 +414,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:3:162", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "clause", - "raw_string": "clause" + "string": "clause" } ] } @@ -445,17 +440,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-15:3:158", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "scenarios", - "raw_string": "scenarios" + "string": "scenarios" } ] } @@ -465,21 +459,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:3:158", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-9:4:88", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "seinfeld", - "raw_string": "seinfeld" + "string": "seinfeld" } ] } @@ -489,25 +482,47 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:4:88", - "nodes": null + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] } } } }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-14:4:154", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "missoula", - "raw_string": "missoula" + "string": "missoula" } ] } @@ -517,21 +532,42 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:4:154", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-13:5:149", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "steps", - "raw_string": "steps" + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "steps" } ] } @@ -541,29 +577,27 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:5:149", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:26:143", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "missus", - "raw_string": "missus" + "string": "missus" } ] } } ] }, - "primary": {}, - "value": { + "primary": { "unquoted_string": { "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", "value": [ @@ -573,7 +607,8 @@ } ] } - } + }, + "value": {} } } ] @@ -679,21 +714,20 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-18:0:165", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-17:1:164", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -703,21 +737,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:1:164", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-4:3:33", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "one", - "raw_string": "one" + "string": "one" } ] } @@ -727,21 +760,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:3:33", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "santa", - "raw_string": "santa" + "string": "santa" } ] } @@ -759,17 +791,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-16:3:162", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "two", - "raw_string": "two" + "string": "two" } ] } @@ -779,21 +810,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:3:162", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "clause", - "raw_string": "clause" + "string": "clause" } ] } @@ -806,17 +836,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-15:3:158", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "scenarios", - "raw_string": "scenarios" + "string": "scenarios" } ] } @@ -826,21 +855,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:3:158", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-9:4:88", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "seinfeld", - "raw_string": "seinfeld" + "string": "seinfeld" } ] } @@ -850,25 +878,47 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:4:88", - "nodes": null + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] } } } }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-14:4:154", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "missoula", - "raw_string": "missoula" + "string": "missoula" } ] } @@ -878,21 +928,42 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:4:154", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-13:5:149", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "steps", - "raw_string": "steps" + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "steps" } ] } @@ -902,29 +973,27 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:5:149", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:26:143", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "missus", - "raw_string": "missus" + "string": "missus" } ] } } ] }, - "primary": {}, - "value": { + "primary": { "unquoted_string": { "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", "value": [ @@ -934,7 +1003,8 @@ } ] } - } + }, + "value": {} } } ] @@ -1040,21 +1110,42 @@ "name": "seinfeld", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-18:0:165", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-17:1:164", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "scenarios" } ] } @@ -1064,21 +1155,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:1:164", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-4:3:33", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "one", - "raw_string": "one" + "string": "seinfeld" } ] } @@ -1088,21 +1178,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:3:33", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "santa", - "raw_string": "santa" + "string": "clause" } ] } @@ -1120,17 +1209,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-16:3:162", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "two", - "raw_string": "two" + "string": "missoula" } ] } @@ -1140,21 +1228,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:3:162", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "clause", - "raw_string": "clause" + "string": "clause" } ] } @@ -1167,17 +1254,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-15:3:158", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "scenarios", - "raw_string": "scenarios" + "string": "steps" } ] } @@ -1187,125 +1273,38 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:3:158", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-9:4:88", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "seinfeld", - "raw_string": "seinfeld" + "string": "missus" } ] } } ] }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:4:88", - "nodes": null - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-14:4:154", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", - "value": [ - { - "string": "missoula", - "raw_string": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:4:154", - "nodes": [ + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", + "value": [ { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-13:5:149", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", - "value": [ - { - "string": "steps", - "raw_string": "steps" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:5:149", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:26:143", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", - "value": [ - { - "string": "missus", - "raw_string": "missus" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", - "value": [ - { - "string": "one two three", - "raw_string": "one two three" - } - ] - } - } - } - } - ] - } - } - } + "string": "one two three", + "raw_string": "one two three" } ] } - } + }, + "value": {} } } ] @@ -1401,21 +1400,42 @@ "name": "missoula", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-18:0:165", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-17:1:164", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:1-1:6:7", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "scenarios" } ] } @@ -1425,21 +1445,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:8:9-17:1:164", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-4:3:33", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:2:13-2:5:16", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "one", - "raw_string": "one" + "string": "seinfeld" } ] } @@ -1449,21 +1468,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,2:7:18-4:3:33", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "santa", - "raw_string": "santa" + "string": "clause" } ] } @@ -1481,17 +1499,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-16:3:162", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:2:36-5:5:39", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "two", - "raw_string": "two" + "string": "missoula" } ] } @@ -1501,21 +1518,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,5:7:41-16:3:162", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "clause", - "raw_string": "clause" + "string": "clause" } ] } @@ -1528,17 +1544,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-15:3:158", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "scenarios", - "raw_string": "scenarios" + "string": "steps" } ] } @@ -1548,125 +1563,38 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:13:67-15:3:158", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-9:4:88", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "seinfeld", - "raw_string": "seinfeld" + "string": "missus" } ] } } ] }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:13:82-9:4:88", - "nodes": null - } - } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-14:4:154", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", - "value": [ - { - "string": "missoula", - "raw_string": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:13:102-14:4:154", - "nodes": [ + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", + "value": [ { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-13:5:149", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", - "value": [ - { - "string": "steps", - "raw_string": "steps" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:11:115-13:5:149", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:26:143", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", - "value": [ - { - "string": "missus", - "raw_string": "missus" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:13:130-12:26:143", - "value": [ - { - "string": "one two three", - "raw_string": "one two three" - } - ] - } - } - } - } - ] - } - } - } + "string": "one two three", + "raw_string": "one two three" } ] } - } + }, + "value": {} } } ] diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json index a304a8ff1..1789d73ba 100644 --- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json @@ -372,21 +372,20 @@ "name": "one", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "base", - "raw_string": "base" + "string": "base" } ] } @@ -399,17 +398,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-17:1:144", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -419,21 +417,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:1:144", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-5:3:38", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "one", - "raw_string": "one" + "string": "one" } ] } @@ -443,21 +440,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:3:38", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "santa", - "raw_string": "santa" + "string": "santa" } ] } @@ -475,17 +471,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-16:3:142", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "two", - "raw_string": "two" + "string": "two" } ] } @@ -495,21 +490,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:3:142", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "clause", - "raw_string": "clause" + "string": "clause" } ] } @@ -522,17 +516,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-15:3:138", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "steps", - "raw_string": "steps" + "string": "steps" } ] } @@ -542,21 +535,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:3:138", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-11:4:102", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "seinfeld", - "raw_string": "seinfeld" + "string": "seinfeld" } ] } @@ -566,21 +558,42 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:4:102", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "reindeer", - "raw_string": "reindeer" + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "reindeer" } ] } @@ -598,17 +611,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-14:4:134", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "missoula", - "raw_string": "missoula" + "string": "missoula" } ] } @@ -618,21 +630,64 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:4:134", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "montana", - "raw_string": "montana" + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "reindeer" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "montana" } ] } @@ -741,21 +796,20 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "base", - "raw_string": "base" + "string": "base" } ] } @@ -768,17 +822,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-17:1:144", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -788,21 +841,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:1:144", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-5:3:38", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "one", - "raw_string": "one" + "string": "one" } ] } @@ -812,21 +864,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:3:38", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "santa", - "raw_string": "santa" + "string": "santa" } ] } @@ -844,17 +895,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-16:3:142", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "two", - "raw_string": "two" + "string": "two" } ] } @@ -864,21 +914,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:3:142", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "clause", - "raw_string": "clause" + "string": "clause" } ] } @@ -891,17 +940,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-15:3:138", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "steps", - "raw_string": "steps" + "string": "steps" } ] } @@ -911,21 +959,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:3:138", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-11:4:102", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "seinfeld", - "raw_string": "seinfeld" + "string": "seinfeld" } ] } @@ -935,21 +982,42 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:4:102", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "reindeer", - "raw_string": "reindeer" + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "reindeer" } ] } @@ -967,17 +1035,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-14:4:134", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "missoula", - "raw_string": "missoula" + "string": "missoula" } ] } @@ -987,21 +1054,64 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:4:134", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "montana", - "raw_string": "montana" + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "reindeer" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "montana" } ] } @@ -1110,21 +1220,20 @@ "name": "seinfeld", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "base", - "raw_string": "base" + "string": "clause" } ] } @@ -1137,17 +1246,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-17:1:144", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "steps" } ] } @@ -1157,21 +1265,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:1:144", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-5:3:38", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "one", - "raw_string": "one" + "string": "seinfeld" } ] } @@ -1181,21 +1288,42 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:3:38", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "santa", - "raw_string": "santa" + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "reindeer" } ] } @@ -1213,17 +1341,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-16:3:142", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "two", - "raw_string": "two" + "string": "missoula" } ] } @@ -1233,21 +1360,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:3:142", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "clause", - "raw_string": "clause" + "string": "clause" } ] } @@ -1260,17 +1386,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-15:3:138", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "steps", - "raw_string": "steps" + "string": "reindeer" } ] } @@ -1278,117 +1403,29 @@ ] }, "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:3:138", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-11:4:102", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", - "value": [ - { - "string": "seinfeld", - "raw_string": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:4:102", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "value": [ - { - "string": "reindeer", - "raw_string": "reindeer" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "montana" } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-14:4:134", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", - "value": [ - { - "string": "missoula", - "raw_string": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:4:134", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "value": [ - { - "string": "montana", - "raw_string": "montana" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } + ] } - ] - } - } + } + ] + }, + "primary": {}, + "value": {} } } ] @@ -1524,21 +1561,20 @@ "name": "missoula", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-18:0:145", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "base", - "raw_string": "base" + "string": "clause" } ] } @@ -1551,17 +1587,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-17:1:144", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "steps" } ] } @@ -1571,21 +1606,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,2:8:14-17:1:144", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-5:3:38", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:2:18-3:5:21", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "one", - "raw_string": "one" + "string": "seinfeld" } ] } @@ -1595,21 +1629,42 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,3:7:23-5:3:38", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "santa", - "raw_string": "santa" + "string": "clause" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "reindeer" } ] } @@ -1627,17 +1682,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-16:3:142", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:2:41-6:5:44", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "two", - "raw_string": "two" + "string": "missoula" } ] } @@ -1647,21 +1701,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,6:7:46-16:3:142", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "clause", - "raw_string": "clause" + "string": "clause" } ] } @@ -1674,17 +1727,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-15:3:138", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "steps", - "raw_string": "steps" + "string": "reindeer" } ] } @@ -1692,117 +1744,29 @@ ] }, "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:9:68-15:3:138", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-11:4:102", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", - "value": [ - { - "string": "seinfeld", - "raw_string": "seinfeld" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:13:83-11:4:102", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", - "value": [ - { - "string": "reindeer", - "raw_string": "reindeer" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "montana" } - } - }, - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-14:4:134", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", - "value": [ - { - "string": "missoula", - "raw_string": "missoula" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:13:116-14:4:134", - "nodes": [ - { - "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", - "value": [ - { - "string": "montana", - "raw_string": "montana" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - } - ] - } - } - } + ] } - ] - } - } + } + ] + }, + "primary": {}, + "value": {} } } ] diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json index 37ac239ee..9e2164fac 100644 --- a/testdata/d2compiler/TestCompile2/boards/root.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json @@ -239,21 +239,20 @@ "name": "one", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-10:0:65", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "base", - "raw_string": "base" + "string": "base" } ] } @@ -266,17 +265,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:0:6-9:1:64", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -286,21 +284,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:8:14-9:1:64", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:2:18-5:3:38", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:2:18-3:5:21", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:2:18-3:5:21", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "one", - "raw_string": "one" + "string": "one" } ] } @@ -310,21 +307,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:7:23-5:3:38", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "santa", - "raw_string": "santa" + "string": "santa" } ] } @@ -342,17 +338,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:2:41-8:3:62", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:2:41-6:5:44", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:2:41-6:5:44", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "two", - "raw_string": "two" + "string": "two" } ] } @@ -362,21 +357,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:7:46-8:3:62", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "clause", - "raw_string": "clause" + "string": "clause" } ] } @@ -475,21 +469,20 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-10:0:65", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-0:4:4", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "base", - "raw_string": "base" + "string": "base" } ] } @@ -502,17 +495,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:0:6-9:1:64", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:0:6-2:6:12", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "layers", - "raw_string": "layers" + "string": "layers" } ] } @@ -522,21 +514,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,2:8:14-9:1:64", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:2:18-5:3:38", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:2:18-3:5:21", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:2:18-3:5:21", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "one", - "raw_string": "one" + "string": "one" } ] } @@ -546,21 +537,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,3:7:23-5:3:38", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,4:4:29-4:9:34", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "santa", - "raw_string": "santa" + "string": "santa" } ] } @@ -578,17 +568,16 @@ }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:2:41-8:3:62", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:2:41-6:5:44", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:2:41-6:5:44", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "two", - "raw_string": "two" + "string": "two" } ] } @@ -598,21 +587,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,6:7:46-8:3:62", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,7:4:52-7:10:58", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "clause", - "raw_string": "clause" + "string": "clause" } ] } diff --git a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json index 8c8a6eaec..520d07f2f 100644 --- a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json @@ -347,67 +347,64 @@ "name": "1", "isFolderOnly": false, "ast": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-7:0:69", + "range": ",0:0:0-1:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:6:6", - "edges": [ - { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:6:6", - "src": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:1:1", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:1:1", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "a" } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:5:5-0:6:6", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:5:5-0:6:6", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], + ] + } + } + ] + }, "primary": {}, "value": {} } }, { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,2:0:8-6:1:68", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,2:0:8-2:9:17", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,2:0:8-2:9:17", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "scenarios", - "raw_string": "scenarios" + "string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "scenarios" } ] } @@ -417,21 +414,20 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,2:11:19-6:1:68", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,3:2:23-5:3:66", + "range": ",0:0:0-0:0:0", "key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,3:2:23-3:3:24", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,3:2:23-3:3:24", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "1", - "raw_string": "1" + "string": "1" } ] } @@ -441,24 +437,67 @@ "primary": {}, "value": { "map": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,3:5:26-5:3:66", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:4:32-4:34:62", + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", "edges": [ { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:11:39", + "range": ",0:0:0-0:0:0", "src": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:6:34", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:5:33-4:6:34", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "a", - "raw_string": "a" + "string": "a" } ] } @@ -467,15 +506,14 @@ }, "src_arrow": "", "dst": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:10:38-4:11:39", + "range": ",0:0:0-0:0:0", "path": [ { "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:10:38-4:11:39", + "range": ",0:0:0-0:0:0", "value": [ { - "string": "x", - "raw_string": "x" + "string": "x" } ] } @@ -485,44 +523,68 @@ "dst_arrow": ">" } ], - "edge_index": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:12:40-4:15:43", - "int": 0, - "glob": false - }, - "edge_key": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:16:44-4:29:57", - "path": [ - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:16:44-4:21:49", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:22:50-4:29:57", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, "primary": {}, "value": { - "number": { - "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:31:59-4:34:62", - "raw": "0.1", - "value": "1/10" + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "opacity" + } + ] + } + } + ] + }, + "primary": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:31:59-4:34:62", + "raw": "0.1", + "value": "1/10" + } + }, + "value": {} + } + } + ] + } + } + } + } + ] } } } @@ -536,6 +598,50 @@ } } } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "edges": [ + { + "range": ",0:0:0-0:0:0", + "src": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "x" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } } ] },