diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index f10bc63aa..87bf71fa5 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -873,7 +873,7 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, create b if _, ok := d2ast.ReservedKeywords[strings.ToLower(head.ScalarString())]; ok && head.IsUnquoted() { if _, ok := d2ast.CompositeReservedKeywords[strings.ToLower(head.ScalarString())]; !ok && i < len(kp.Path)-1 { - return d2parser.Errorf(kp.Path[i].Unbox(), fmt.Sprintf(`"%s" must be the last part of the key`, head)) + return d2parser.Errorf(kp.Path[i].Unbox(), fmt.Sprintf(`"%s" must be the last part of the key`, head.ScalarString())) } } @@ -882,11 +882,11 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, create b } if head.ScalarString() == "classes" && head.IsUnquoted() && NodeBoardKind(m) == "" { - return d2parser.Errorf(kp.Path[i].Unbox(), "%s is only allowed at a board root", head) + return d2parser.Errorf(kp.Path[i].Unbox(), "%s is only allowed at a board root", head.ScalarString()) } if findBoardKeyword(head.ScalarString()) != -1 && head.IsUnquoted() && NodeBoardKind(m) == "" { - return d2parser.Errorf(kp.Path[i].Unbox(), "%s is only allowed at a board root", head) + return d2parser.Errorf(kp.Path[i].Unbox(), "%s is only allowed at a board root", head.ScalarString()) } for _, f := range m.Fields { diff --git a/testdata/d2ir/TestCompile/classes/inherited.exp.json b/testdata/d2ir/TestCompile/classes/inherited.exp.json index 1cce8f672..e0eeeaccd 100644 --- a/testdata/d2ir/TestCompile/classes/inherited.exp.json +++ b/testdata/d2ir/TestCompile/classes/inherited.exp.json @@ -1,19 +1,51 @@ { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/inherited.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/inherited.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", @@ -452,27 +484,75 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/classes/inherited.d2,5:0:51-5:9:60", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "hawaii", + "name": { + "range": "TestCompile/classes/inherited.d2,6:2:66-6:8:72", + "value": [ + { + "string": "hawaii", + "raw_string": "hawaii" + } + ] + }, "composite": { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/inherited.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/inherited.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", @@ -911,27 +991,75 @@ ] }, { - "name": "steps", + "name": { + "range": "TestCompile/classes/inherited.d2,7:2:78-7:7:83", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + }, "composite": { "fields": [ { - "name": "1", + "name": { + "range": "TestCompile/classes/inherited.d2,8:6:93-8:7:94", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, "composite": { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/inherited.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/inherited.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", @@ -1232,15 +1360,39 @@ ] }, { - "name": "cherry", + "name": { + "range": "TestCompile/classes/inherited.d2,10:10:127-10:16:133", + "value": [ + { + "string": "cherry", + "raw_string": "cherry" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,11:12:149-11:17:154", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,11:18:155-11:22:159", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", @@ -1811,7 +1963,15 @@ ] }, { - "name": "x", + "name": { + "range": "TestCompile/classes/inherited.d2,14:8:195-14:9:196", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -2059,23 +2219,63 @@ ] }, { - "name": "2", + "name": { + "range": "TestCompile/classes/inherited.d2,16:6:211-16:7:212", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + }, "composite": { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/inherited.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/inherited.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", @@ -2376,15 +2576,39 @@ ] }, { - "name": "cherry", + "name": { + "range": "TestCompile/classes/inherited.d2,10:10:127-10:16:133", + "value": [ + { + "string": "cherry", + "raw_string": "cherry" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,11:12:149-11:17:154", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,11:18:155-11:22:159", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", @@ -2955,7 +3179,15 @@ ] }, { - "name": "x", + "name": { + "range": "TestCompile/classes/inherited.d2,14:8:195-14:9:196", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -3013,7 +3245,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/classes/inherited.d2,17:8:224-17:9:225", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -3159,23 +3399,63 @@ ] }, { - "name": "3", + "name": { + "range": "TestCompile/classes/inherited.d2,19:6:240-19:7:241", + "value": [ + { + "string": "3", + "raw_string": "3" + } + ] + }, "composite": { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/inherited.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/inherited.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", @@ -3476,15 +3756,39 @@ ] }, { - "name": "cherry", + "name": { + "range": "TestCompile/classes/inherited.d2,10:10:127-10:16:133", + "value": [ + { + "string": "cherry", + "raw_string": "cherry" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,11:12:149-11:17:154", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,11:18:155-11:22:159", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", @@ -4460,7 +4764,15 @@ ] }, { - "name": "x", + "name": { + "range": "TestCompile/classes/inherited.d2,14:8:195-14:9:196", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -4518,7 +4830,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/classes/inherited.d2,17:8:224-17:9:225", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -4819,23 +5139,63 @@ ] }, { - "name": "4", + "name": { + "range": "TestCompile/classes/inherited.d2,27:6:359-27:7:360", + "value": [ + { + "string": "4", + "raw_string": "4" + } + ] + }, "composite": { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/inherited.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/inherited.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", @@ -5136,15 +5496,39 @@ ] }, { - "name": "cherry", + "name": { + "range": "TestCompile/classes/inherited.d2,10:10:127-10:16:133", + "value": [ + { + "string": "cherry", + "raw_string": "cherry" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,11:12:149-11:17:154", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,11:18:155-11:22:159", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", @@ -6120,7 +6504,15 @@ ] }, { - "name": "x", + "name": { + "range": "TestCompile/classes/inherited.d2,14:8:195-14:9:196", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -6231,7 +6623,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/classes/inherited.d2,17:8:224-17:9:225", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -6342,15 +6742,39 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/classes/inherited.d2,28:8:372-28:14:378", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "deep", + "name": { + "range": "TestCompile/classes/inherited.d2,29:10:392-29:14:396", + "value": [ + { + "string": "deep", + "raw_string": "deep" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/classes/inherited.d2,30:12:412-30:13:413", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -6408,19 +6832,51 @@ ] }, { - "name": "classes", + "name": { + "range": "TestCompile/classes/inherited.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/inherited.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", @@ -6721,15 +7177,39 @@ ] }, { - "name": "cherry", + "name": { + "range": "TestCompile/classes/inherited.d2,10:10:127-10:16:133", + "value": [ + { + "string": "cherry", + "raw_string": "cherry" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,11:12:149-11:17:154", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,11:18:155-11:22:159", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", diff --git a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json index a3cb58791..22838f5c1 100644 --- a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json +++ b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json @@ -1,19 +1,51 @@ { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/layer-modify.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "orb", + "name": { + "range": "TestCompile/classes/layer-modify.d2,1:2:13-1:5:16", + "value": [ + { + "string": "orb", + "raw_string": "orb" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/layer-modify.d2,2:4:24-2:9:29", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/layer-modify.d2,2:10:30-2:14:34", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", @@ -452,27 +484,75 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/classes/layer-modify.d2,5:0:49-5:6:55", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/classes/layer-modify.d2,6:2:61-6:3:62", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/layer-modify.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "orb", + "name": { + "range": "TestCompile/classes/layer-modify.d2,1:2:13-1:5:16", + "value": [ + { + "string": "orb", + "raw_string": "orb" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/layer-modify.d2,2:4:24-2:9:29", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/layer-modify.d2,2:10:30-2:14:34", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", @@ -573,7 +653,15 @@ ] }, { - "name": "stroke", + "name": { + "range": "TestCompile/classes/layer-modify.d2,7:22:88-7:28:94", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99", diff --git a/testdata/d2ir/TestCompile/classes/merge.exp.json b/testdata/d2ir/TestCompile/classes/merge.exp.json index b192ca8a3..50d54cbd5 100644 --- a/testdata/d2ir/TestCompile/classes/merge.exp.json +++ b/testdata/d2ir/TestCompile/classes/merge.exp.json @@ -1,19 +1,51 @@ { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/merge.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/merge.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/merge.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/merge.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", @@ -205,7 +237,15 @@ ] }, { - "name": "width", + "name": { + "range": "TestCompile/classes/merge.d2,3:2:47-3:7:52", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/merge.d2,3:9:54-3:11:56", @@ -581,27 +621,75 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/classes/merge.d2,6:0:63-6:6:69", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "hawaii", + "name": { + "range": "TestCompile/classes/merge.d2,7:2:75-7:8:81", + "value": [ + { + "string": "hawaii", + "raw_string": "hawaii" + } + ] + }, "composite": { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/merge.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/merge.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/merge.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/merge.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", @@ -793,7 +881,15 @@ ] }, { - "name": "width", + "name": { + "range": "TestCompile/classes/merge.d2,3:2:47-3:7:52", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/merge.d2,10:15:130-10:19:134", diff --git a/testdata/d2ir/TestCompile/classes/nested.exp.json b/testdata/d2ir/TestCompile/classes/nested.exp.json index 007eecf1b..0c8c582de 100644 --- a/testdata/d2ir/TestCompile/classes/nested.exp.json +++ b/testdata/d2ir/TestCompile/classes/nested.exp.json @@ -1,19 +1,51 @@ { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/nested.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/nested.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/nested.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/nested.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", @@ -452,23 +484,63 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/classes/nested.d2,5:0:51-5:6:57", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "hawaii", + "name": { + "range": "TestCompile/classes/nested.d2,6:2:63-6:8:69", + "value": [ + { + "string": "hawaii", + "raw_string": "hawaii" + } + ] + }, "composite": { "fields": [ { - "name": "layers", + "name": { + "range": "TestCompile/classes/nested.d2,7:2:75-7:8:81", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "maui", + "name": { + "range": "TestCompile/classes/nested.d2,8:6:91-8:10:95", + "value": [ + { + "string": "maui", + "raw_string": "maui" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/classes/nested.d2,9:8:107-9:9:108", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -526,19 +598,51 @@ ] }, { - "name": "classes", + "name": { + "range": "TestCompile/classes/nested.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/nested.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/nested.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/nested.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", @@ -1182,19 +1286,51 @@ ] }, { - "name": "classes", + "name": { + "range": "TestCompile/classes/nested.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/nested.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/nested.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/nested.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", diff --git a/testdata/d2ir/TestCompile/edges/chain.exp.json b/testdata/d2ir/TestCompile/edges/chain.exp.json index 0500f467b..aeb0aafab 100644 --- a/testdata/d2ir/TestCompile/edges/chain.exp.json +++ b/testdata/d2ir/TestCompile/edges/chain.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -192,7 +200,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -569,7 +585,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -946,7 +970,15 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/edges/nested.exp.json b/testdata/d2ir/TestCompile/edges/nested.exp.json index 5be013c80..bb4c4c6a2 100644 --- a/testdata/d2ir/TestCompile/edges/nested.exp.json +++ b/testdata/d2ir/TestCompile/edges/nested.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "y", + "name": { + "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -350,11 +366,27 @@ ] }, { - "name": "z", + "name": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "composite": { "fields": [ { - "name": "p", + "name": { + "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/edges/root.exp.json b/testdata/d2ir/TestCompile/edges/root.exp.json index 2c986a481..b442d6bdd 100644 --- a/testdata/d2ir/TestCompile/edges/root.exp.json +++ b/testdata/d2ir/TestCompile/edges/root.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/edges/underscore.exp.json b/testdata/d2ir/TestCompile/edges/underscore.exp.json index bdb82ef60..3145a947b 100644 --- a/testdata/d2ir/TestCompile/edges/underscore.exp.json +++ b/testdata/d2ir/TestCompile/edges/underscore.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "p", + "name": { + "range": "TestCompile/edges/underscore.d2,0:0:0-0:1:1", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -266,7 +282,15 @@ ] }, { - "name": "x", + "name": { + "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/filters/array.exp.json b/testdata/d2ir/TestCompile/filters/array.exp.json index b65935e1b..d45038668 100644 --- a/testdata/d2ir/TestCompile/filters/array.exp.json +++ b/testdata/d2ir/TestCompile/filters/array.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "the-little-cannon", + "name": { + "range": "TestCompile/filters/array.d2,0:0:0-0:17:17", + "value": [ + { + "string": "the-little-cannon", + "raw_string": "the-little-cannon" + } + ] + }, "composite": { "fields": [ { - "name": "class", + "name": { + "range": "TestCompile/filters/array.d2,1:1:22-1:6:27", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, "composite": { "values": [ { @@ -245,11 +261,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/filters/array.d2,12:1:150-12:6:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "multiple", + "name": { + "range": "TestCompile/filters/array.d2,12:7:156-12:15:164", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/array.d2,12:17:166-12:21:170", @@ -542,11 +574,27 @@ ] }, { - "name": "dino", + "name": { + "range": "TestCompile/filters/array.d2,3:0:50-3:4:54", + "value": [ + { + "string": "dino", + "raw_string": "dino" + } + ] + }, "composite": { "fields": [ { - "name": "class", + "name": { + "range": "TestCompile/filters/array.d2,4:1:59-4:6:64", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, "composite": { "values": [ { @@ -838,11 +886,27 @@ ] }, { - "name": "catapult", + "name": { + "range": "TestCompile/filters/array.d2,6:0:89-6:8:97", + "value": [ + { + "string": "catapult", + "raw_string": "catapult" + } + ] + }, "composite": { "fields": [ { - "name": "class", + "name": { + "range": "TestCompile/filters/array.d2,7:1:102-7:6:107", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, "composite": { "values": [ { @@ -1082,11 +1146,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/filters/array.d2,12:1:150-12:6:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "multiple", + "name": { + "range": "TestCompile/filters/array.d2,12:7:156-12:15:164", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/array.d2,12:17:166-12:21:170", diff --git a/testdata/d2ir/TestCompile/filters/base.exp.json b/testdata/d2ir/TestCompile/filters/base.exp.json index 98d52c7fe..20ddadedf 100644 --- a/testdata/d2ir/TestCompile/filters/base.exp.json +++ b/testdata/d2ir/TestCompile/filters/base.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "jacob", + "name": { + "range": "TestCompile/filters/base.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/base.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/base.d2,1:8:17-1:14:23", @@ -246,11 +262,27 @@ ] }, { - "name": "jeremy", + "name": { + "range": "TestCompile/filters/base.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/base.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/base.d2,4:8:44-4:17:53", @@ -457,7 +489,15 @@ ] }, { - "name": "label", + "name": { + "range": "TestCompile/filters/base.d2,8:1:81-8:6:86", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/base.d2,8:8:88-8:23:103", diff --git a/testdata/d2ir/TestCompile/filters/edge.exp.json b/testdata/d2ir/TestCompile/filters/edge.exp.json index b975d17d3..6ca3f3911 100644 --- a/testdata/d2ir/TestCompile/filters/edge.exp.json +++ b/testdata/d2ir/TestCompile/filters/edge.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -828,7 +836,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -1168,11 +1184,27 @@ "map": { "fields": [ { - "name": "source-arrowhead", + "name": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:17:27", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/edge.d2,1:18:28-1:23:33", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/edge.d2,1:25:35-1:32:42", @@ -1536,11 +1568,27 @@ ] }, { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:17:60", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/edge.d2,2:18:61-2:23:66", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/edge.d2,2:25:68-2:32:75", @@ -1904,7 +1952,15 @@ ] }, { - "name": "label", + "name": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/edge.d2,9:8:177-9:32:201", diff --git a/testdata/d2ir/TestCompile/filters/label-filter/1.exp.json b/testdata/d2ir/TestCompile/filters/label-filter/1.exp.json index a6cb88ffd..919c0b32e 100644 --- a/testdata/d2ir/TestCompile/filters/label-filter/1.exp.json +++ b/testdata/d2ir/TestCompile/filters/label-filter/1.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/1.d2,9:17:80-9:18:81", @@ -684,15 +708,39 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,2:0:3-2:1:4", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", @@ -1205,7 +1253,15 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,3:0:5-3:1:6", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/1.d2,3:3:8-3:4:9", @@ -1220,11 +1276,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/1.d2,13:17:118-13:20:121", @@ -1909,15 +1981,39 @@ ] }, { - "name": "a", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,4:0:10-4:1:11", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", @@ -2499,15 +2595,39 @@ ] }, { - "name": "z", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,4:5:15-4:6:16", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", @@ -3117,11 +3237,27 @@ "map": { "fields": [ { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,17:1:155-17:17:171", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,17:18:172-17:23:177", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/1.d2,17:25:179-17:32:186", diff --git a/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json b/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json index 0fc2941dc..43db3ce00 100644 --- a/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json +++ b/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/filters/label-filter/2.d2,8:0:83-8:1:84", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -240,7 +248,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/filters/label-filter/2.d2,8:5:88-8:6:89", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -507,11 +523,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/2.d2,1:12:13-1:17:18", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/2.d2,1:18:19-1:25:26", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/2.d2,5:17:78-5:18:79", @@ -1844,11 +1876,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/2.d2,1:12:13-1:17:18", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/2.d2,1:18:19-1:25:26", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/2.d2,1:27:28-1:30:31", diff --git a/testdata/d2ir/TestCompile/filters/label-filter/3.exp.json b/testdata/d2ir/TestCompile/filters/label-filter/3.exp.json index 868349959..d238e7807 100644 --- a/testdata/d2ir/TestCompile/filters/label-filter/3.exp.json +++ b/testdata/d2ir/TestCompile/filters/label-filter/3.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/filters/label-filter/3.d2,6:0:53-6:1:54", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -128,7 +136,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/filters/label-filter/3.d2,6:5:58-6:6:59", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -283,11 +299,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/3.d2,3:2:31-3:7:36", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/3.d2,3:8:37-3:15:44", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/3.d2,3:17:46-3:20:49", diff --git a/testdata/d2ir/TestCompile/filters/lazy-filter.exp.json b/testdata/d2ir/TestCompile/filters/lazy-filter.exp.json index d61c21bc4..c7031c8ae 100644 --- a/testdata/d2ir/TestCompile/filters/lazy-filter.exp.json +++ b/testdata/d2ir/TestCompile/filters/lazy-filter.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/filters/lazy-filter.d2,6:0:42-6:1:43", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/lazy-filter.d2,3:2:20-3:7:25", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/filters/lazy-filter.d2,3:8:26-3:12:30", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/lazy-filter.d2,3:14:32-3:20:38", @@ -260,11 +284,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/filters/lazy-filter.d2,7:0:44-7:1:45", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "label", + "name": { + "range": "TestCompile/filters/lazy-filter.d2,8:2:48-8:7:53", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/lazy-filter.d2,8:9:55-8:10:56", @@ -557,11 +597,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/filters/lazy-filter.d2,3:2:20-3:7:25", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/filters/lazy-filter.d2,3:8:26-3:12:30", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/lazy-filter.d2,3:14:32-3:20:38", diff --git a/testdata/d2ir/TestCompile/filters/not-basic.exp.json b/testdata/d2ir/TestCompile/filters/not-basic.exp.json index 661fcd6b5..8038ce65b 100644 --- a/testdata/d2ir/TestCompile/filters/not-basic.exp.json +++ b/testdata/d2ir/TestCompile/filters/not-basic.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "jacob", + "name": { + "range": "TestCompile/filters/not-basic.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/not-basic.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/not-basic.d2,1:8:17-1:14:23", @@ -212,7 +228,15 @@ ] }, { - "name": "label", + "name": { + "range": "TestCompile/filters/not-basic.d2,8:1:82-8:6:87", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/not-basic.d2,8:8:89-8:27:108", @@ -389,11 +413,27 @@ ] }, { - "name": "jeremy", + "name": { + "range": "TestCompile/filters/not-basic.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/not-basic.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/not-basic.d2,4:8:44-4:17:53", diff --git a/testdata/d2ir/TestCompile/filters/order.exp.json b/testdata/d2ir/TestCompile/filters/order.exp.json index aaaa8b71e..db2197ee6 100644 --- a/testdata/d2ir/TestCompile/filters/order.exp.json +++ b/testdata/d2ir/TestCompile/filters/order.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "jacob", + "name": { + "range": "TestCompile/filters/order.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/order.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/order.d2,1:8:17-1:14:23", @@ -246,11 +262,27 @@ ] }, { - "name": "jeremy", + "name": { + "range": "TestCompile/filters/order.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/order.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/order.d2,4:8:44-4:17:53", @@ -457,7 +489,15 @@ ] }, { - "name": "label", + "name": { + "range": "TestCompile/filters/order.d2,7:1:62-7:6:67", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/order.d2,7:8:69-7:23:84", diff --git a/testdata/d2ir/TestCompile/filters/primary-filter.exp.json b/testdata/d2ir/TestCompile/filters/primary-filter.exp.json index d17adef3f..d8543a7d8 100644 --- a/testdata/d2ir/TestCompile/filters/primary-filter.exp.json +++ b/testdata/d2ir/TestCompile/filters/primary-filter.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "parent", + "name": { + "range": "TestCompile/filters/primary-filter.d2,1:0:1-1:6:7", + "value": [ + { + "string": "parent", + "raw_string": "parent" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/filters/primary-filter.d2,2:2:13-2:3:14", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": null, "edges": null @@ -350,7 +366,15 @@ ] }, { - "name": "b1", + "name": { + "range": "TestCompile/filters/primary-filter.d2,2:7:18-2:9:20", + "value": [ + { + "string": "b1", + "raw_string": "b1" + } + ] + }, "composite": { "fields": null, "edges": null @@ -695,7 +719,15 @@ ] }, { - "name": "b3", + "name": { + "range": "TestCompile/filters/primary-filter.d2,4:7:38-4:9:40", + "value": [ + { + "string": "b3", + "raw_string": "b3" + } + ] + }, "composite": { "fields": null, "edges": null @@ -816,7 +848,15 @@ ] }, { - "name": "c1", + "name": { + "range": "TestCompile/filters/primary-filter.d2,6:8:50-6:10:52", + "value": [ + { + "string": "c1", + "raw_string": "c1" + } + ] + }, "composite": { "fields": [], "edges": null @@ -1879,19 +1919,51 @@ ] }, { - "name": "classes", + "name": { + "range": "TestCompile/filters/primary-filter.d2,20:0:185-20:7:192", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "hidden", + "name": { + "range": "TestCompile/filters/primary-filter.d2,21:2:198-21:8:204", + "value": [ + { + "string": "hidden", + "raw_string": "hidden" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/primary-filter.d2,22:4:212-22:9:217", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/filters/primary-filter.d2,23:6:227-23:10:231", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/primary-filter.d2,23:12:233-23:15:236", diff --git a/testdata/d2ir/TestCompile/imports/boards-deep.exp.json b/testdata/d2ir/TestCompile/imports/boards-deep.exp.json index 3925c7050..892926586 100644 --- a/testdata/d2ir/TestCompile/imports/boards-deep.exp.json +++ b/testdata/d2ir/TestCompile/imports/boards-deep.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "a", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "link", + "name": { + "range": "index.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + }, "primary": { "value": { "range": ",0:0:0-0:0:0", @@ -196,19 +212,51 @@ ] }, { - "name": "layers", + "name": { + "range": "index.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "b", + "name": { + "range": "index.d2,0:28:28-0:29:29", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "b", + "name": { + "range": "b.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "link", + "name": { + "range": "b.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + }, "primary": { "value": { "range": ",0:0:0-0:0:0", @@ -399,19 +447,51 @@ ] }, { - "name": "layers", + "name": { + "range": "b.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "c", + "name": { + "range": "b.d2,0:28:28-0:29:29", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "c", + "name": { + "range": "c.d2,0:0:0-0:1:1", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "link", + "name": { + "range": "c.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + }, "primary": { "value": { "range": ",0:0:0-0:0:0", @@ -602,15 +682,39 @@ ] }, { - "name": "layers", + "name": { + "range": "c.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "d", + "name": { + "range": "c.d2,0:28:28-0:29:29", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "d", + "name": { + "range": "d.d2,0:0:0-0:1:1", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/imports/boards.exp.json b/testdata/d2ir/TestCompile/imports/boards.exp.json index a9de84ecf..c2e7e9a19 100644 --- a/testdata/d2ir/TestCompile/imports/boards.exp.json +++ b/testdata/d2ir/TestCompile/imports/boards.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "link", + "name": { + "range": "index.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + }, "primary": { "value": { "range": ",0:0:0-0:0:0", @@ -196,19 +212,51 @@ ] }, { - "name": "layers", + "name": { + "range": "index.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:28:28-0:29:29", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "y", + "name": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "link", + "name": { + "range": "x.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + }, "primary": { "value": { "range": ",0:0:0-0:0:0", @@ -399,15 +447,39 @@ ] }, { - "name": "layers", + "name": { + "range": "x.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "y", + "name": { + "range": "x.d2,0:28:28-0:29:29", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "meow", + "name": { + "range": "y.d2,0:0:0-0:4:4", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/imports/merge-arrays.exp.json b/testdata/d2ir/TestCompile/imports/merge-arrays.exp.json index a0da3f4da..c897ec4af 100644 --- a/testdata/d2ir/TestCompile/imports/merge-arrays.exp.json +++ b/testdata/d2ir/TestCompile/imports/merge-arrays.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "class", + "name": { + "range": "index.d2,0:2:2-0:7:7", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, "composite": { "values": [ { diff --git a/testdata/d2ir/TestCompile/imports/nested-scope.exp.json b/testdata/d2ir/TestCompile/imports/nested-scope.exp.json index 8ed85fd1f..b3ea88c1b 100644 --- a/testdata/d2ir/TestCompile/imports/nested-scope.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested-scope.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "elem", + "name": { + "range": "second.d2,0:0:0-0:4:4", + "value": [ + { + "string": "elem", + "raw_string": "elem" + } + ] + }, "composite": { "fields": [ { - "name": "third", + "name": { + "range": "third.d2,0:0:0-0:5:5", + "value": [ + { + "string": "third", + "raw_string": "third" + } + ] + }, "composite": { "fields": [ { - "name": "elem", + "name": { + "range": "third.d2,1:2:11-1:6:15", + "value": [ + { + "string": "elem", + "raw_string": "elem" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/imports/nested/array.exp.json b/testdata/d2ir/TestCompile/imports/nested/array.exp.json index c35c86882..7081d05e0 100644 --- a/testdata/d2ir/TestCompile/imports/nested/array.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/array.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "values": [ { diff --git a/testdata/d2ir/TestCompile/imports/nested/map.exp.json b/testdata/d2ir/TestCompile/imports/nested/map.exp.json index 2377f1914..39559df56 100644 --- a/testdata/d2ir/TestCompile/imports/nested/map.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/map.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "x.d2,1:1:6-1:6:11", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "x.d2,1:8:13-1:14:19", @@ -84,7 +100,15 @@ ] }, { - "name": "label", + "name": { + "range": "x.d2,2:1:21-2:6:26", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "x.d2,2:8:28-2:12:32", diff --git a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json index 7fb4ed533..76558fb51 100644 --- a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "primary": { "value": { "range": "x.d2,0:3:3-0:7:7", diff --git a/testdata/d2ir/TestCompile/imports/nested/spread.exp.json b/testdata/d2ir/TestCompile/imports/nested/spread.exp.json index 6250a7662..fb9eaa89c 100644 --- a/testdata/d2ir/TestCompile/imports/nested/spread.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/spread.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "jon", + "name": { + "range": "x.d2,0:5:5-0:8:8", + "value": [ + { + "string": "jon", + "raw_string": "jon" + } + ] + }, "references": [ { "string": { @@ -59,7 +67,15 @@ ] }, { - "name": "jan", + "name": { + "range": "x.d2,0:10:10-0:13:13", + "value": [ + { + "string": "jan", + "raw_string": "jan" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json b/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json index d712911fe..f8c0489a4 100644 --- a/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "q", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "primary": { "value": { "range": "x.d2,0:3:3-0:7:7", @@ -16,7 +24,15 @@ "composite": { "fields": [ { - "name": "jon", + "name": { + "range": "x.d2,0:10:10-0:13:13", + "value": [ + { + "string": "jon", + "raw_string": "jon" + } + ] + }, "references": [ { "string": { @@ -74,7 +90,15 @@ ] }, { - "name": "jan", + "name": { + "range": "x.d2,0:15:15-0:18:18", + "value": [ + { + "string": "jan", + "raw_string": "jan" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/imports/spread.exp.json b/testdata/d2ir/TestCompile/imports/spread.exp.json index db398ce59..d1901521b 100644 --- a/testdata/d2ir/TestCompile/imports/spread.exp.json +++ b/testdata/d2ir/TestCompile/imports/spread.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "primary": { "value": { "range": "x.d2,0:3:3-0:7:7", diff --git a/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json b/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json index 0218343fa..12e600fb8 100644 --- a/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json +++ b/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "z", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -59,15 +67,39 @@ ] }, { - "name": "scenarios", + "name": { + "range": "index.d2,0:28:28-0:37:37", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:41:41-0:42:42", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -125,7 +157,15 @@ ] }, { - "name": "a", + "name": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -261,11 +301,27 @@ ] }, { - "name": "y", + "name": { + "range": "index.d2,0:48:48-0:49:49", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -323,7 +379,15 @@ ] }, { - "name": "b", + "name": { + "range": "y.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -608,15 +672,39 @@ ] }, { - "name": "steps", + "name": { + "range": "index.d2,0:3:3-0:8:8", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + }, "composite": { "fields": [ { - "name": "1", + "name": { + "range": "index.d2,0:12:12-0:13:13", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -674,7 +762,15 @@ ] }, { - "name": "a", + "name": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -810,11 +906,27 @@ ] }, { - "name": "2", + "name": { + "range": "index.d2,0:19:19-0:20:20", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -872,7 +984,15 @@ ] }, { - "name": "a", + "name": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -930,7 +1050,15 @@ ] }, { - "name": "b", + "name": { + "range": "y.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/imports/vars/1.exp.json b/testdata/d2ir/TestCompile/imports/vars/1.exp.json index b3f70120c..70fc1b29a 100644 --- a/testdata/d2ir/TestCompile/imports/vars/1.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/1.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "vars", + "name": { + "range": "index.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, "composite": { "fields": [ { - "name": "meow", + "name": { + "range": "x.d2,0:0:0-0:4:4", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + }, "primary": { "value": { "range": "x.d2,0:6:6-0:18:18", @@ -169,7 +185,15 @@ ] }, { - "name": "q", + "name": { + "range": "index.d2,0:17:17-0:18:18", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "primary": { "value": { "range": "x.d2,0:6:6-0:18:18", diff --git a/testdata/d2ir/TestCompile/imports/vars/2.exp.json b/testdata/d2ir/TestCompile/imports/vars/2.exp.json index c1368afb1..e87de9f66 100644 --- a/testdata/d2ir/TestCompile/imports/vars/2.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/2.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "vars", + "name": { + "range": "index.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "primary": { "value": { "range": "a.d2,0:11:11-0:12:12", @@ -317,7 +333,15 @@ ] }, { - "name": "hi", + "name": { + "range": "a.d2,0:16:16-0:18:18", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + }, "primary": { "value": { "range": "a.d2,0:11:11-0:12:12", diff --git a/testdata/d2ir/TestCompile/imports/vars/3.exp.json b/testdata/d2ir/TestCompile/imports/vars/3.exp.json index 68e6c6c4e..b2fec7be2 100644 --- a/testdata/d2ir/TestCompile/imports/vars/3.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/3.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "vars", + "name": { + "range": "a.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "a.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "primary": { "value": { "range": "index.d2,0:18:18-0:19:19", @@ -317,7 +333,15 @@ ] }, { - "name": "hi", + "name": { + "range": "index.d2,0:23:23-0:25:25", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + }, "primary": { "value": { "range": "index.d2,0:18:18-0:19:19", diff --git a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json index 668820d84..02d9d1eed 100644 --- a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json +++ b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "layers", + "name": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "y", + "name": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/layers/root.exp.json b/testdata/d2ir/TestCompile/layers/root.exp.json index eda3c52a7..7596f3e4a 100644 --- a/testdata/d2ir/TestCompile/layers/root.exp.json +++ b/testdata/d2ir/TestCompile/layers/root.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -235,23 +251,63 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/layers/root.d2,1:0:7-1:6:13", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "bingo", + "name": { + "range": "TestCompile/layers/root.d2,2:1:18-2:6:23", + "value": [ + { + "string": "bingo", + "raw_string": "bingo" + } + ] + }, "composite": { "fields": [ { - "name": "p", + "name": { + "range": "TestCompile/layers/root.d2,2:10:27-2:11:28", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "q", + "name": { + "range": "TestCompile/layers/root.d2,2:12:29-2:13:30", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/layers/root.d2,2:14:31-2:15:32", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/1.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/1.exp.json index b6516bba8..b506ac4bf 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/1.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,5:0:65-5:1:66", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", @@ -146,7 +170,15 @@ ] }, { - "name": "multiple", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,3:8:49-3:16:57", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/1.d2,3:18:59-3:22:63", @@ -3723,7 +3755,15 @@ ] }, { - "name": "shape", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,2:3:27-2:8:32", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/1.d2,2:10:34-2:16:40", @@ -4689,15 +4729,39 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,6:2:72-6:3:73", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", @@ -5687,7 +5751,15 @@ ] }, { - "name": "shape", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,2:3:27-2:8:32", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/1.d2,2:10:34-2:16:40", @@ -6610,23 +6682,63 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,9:0:77-9:6:83", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "next", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,10:2:89-10:6:93", + "value": [ + { + "string": "next", + "raw_string": "next" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,11:4:101-11:5:102", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/2.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/2.exp.json index d88480af2..f8ffd52a6 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/2.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/alixander-review/2.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -59,7 +67,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/alixander-review/2.d2,3:5:9-3:6:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -654,7 +670,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/alixander-review/2.d2,5:0:12-5:1:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -712,7 +736,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/alixander-review/2.d2,6:0:14-6:1:15", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json index 1defbbfb0..42b241363 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "b", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,3:4:8-3:5:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -899,7 +915,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,3:9:13-3:10:14", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -1644,19 +1668,51 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,5:0:16-5:6:22", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,6:2:28-6:3:29", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "composite": { "fields": [ { - "name": "d", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,7:4:37-7:5:38", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "b", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,3:4:8-3:5:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -2434,7 +2490,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,3:9:13-3:10:14", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/4.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/4.exp.json index 3b9a8519e..7014f5396 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/4.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/4.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/alixander-review/4.d2,3:0:11-3:1:12", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "child", + "name": { + "range": "TestCompile/patterns/alixander-review/4.d2,1:3:4-1:8:9", + "value": [ + { + "string": "child", + "raw_string": "child" + } + ] + }, "references": [ { "string": { @@ -579,11 +595,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/alixander-review/4.d2,4:0:13-4:1:14", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "child", + "name": { + "range": "TestCompile/patterns/alixander-review/4.d2,1:3:4-1:8:9", + "value": [ + { + "string": "child", + "raw_string": "child" + } + ] + }, "references": [ { "string": { @@ -987,11 +1019,27 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/alixander-review/4.d2,5:0:15-5:1:16", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "child", + "name": { + "range": "TestCompile/patterns/alixander-review/4.d2,1:3:4-1:8:9", + "value": [ + { + "string": "child", + "raw_string": "child" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/5.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/5.exp.json index d7c15fa34..141698860 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/5.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/5.exp.json @@ -1,23 +1,63 @@ { "fields": [ { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,3:0:21-3:9:30", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "b", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,4:2:36-4:3:37", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,5:4:45-5:5:46", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", @@ -1176,15 +1216,39 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,5:9:50-5:10:51", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/6.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/6.exp.json index de8c8b7c4..c5fe6579c 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/6.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/6.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/alixander-review/6.d2,3:0:33-3:1:34", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -240,7 +248,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/alixander-review/6.d2,3:5:38-3:6:39", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -507,11 +523,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/6.d2,1:12:13-1:17:18", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/alixander-review/6.d2,1:18:19-1:25:26", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/6.d2,1:27:28-1:30:31", @@ -1130,11 +1162,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/6.d2,1:12:13-1:17:18", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/alixander-review/6.d2,1:18:19-1:25:26", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/6.d2,1:27:28-1:30:31", diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/7.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/7.exp.json index f10e20827..33c4e7195 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/7.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/7.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "table", + "name": { + "range": "TestCompile/patterns/alixander-review/7.d2,8:0:53-8:5:58", + "value": [ + { + "string": "table", + "raw_string": "table" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:2:8-2:7:13", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:8:14-2:12:18", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/7.d2,9:14:76-9:18:80", @@ -541,7 +565,15 @@ ] }, { - "name": "shape", + "name": { + "range": "TestCompile/patterns/alixander-review/7.d2,10:2:83-10:7:88", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/7.d2,10:9:90-10:18:99", @@ -620,7 +652,15 @@ ] }, { - "name": "a", + "name": { + "range": "TestCompile/patterns/alixander-review/7.d2,11:2:102-11:3:103", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/7.d2,11:5:105-11:6:106", @@ -635,11 +675,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:7:39", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:8:40-5:12:44", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/7.d2,5:14:46-5:17:49", diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/8.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/8.exp.json index 8beb437d0..d1770ba79 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/8.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/8.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "b", + "name": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -252,11 +268,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:12:43-2:17:48", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "stroke", + "name": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:18:49-2:24:55", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/8.d2,2:26:57-2:29:60", diff --git a/testdata/d2ir/TestCompile/patterns/case/1.exp.json b/testdata/d2ir/TestCompile/patterns/case/1.exp.json index 5d27f6319..bf15513f5 100644 --- a/testdata/d2ir/TestCompile/patterns/case/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/case/1.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "animal", + "name": { + "range": "TestCompile/patterns/case/1.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/case/1.d2,2:4:29-2:11:36", @@ -80,7 +88,15 @@ ] }, { - "name": "action", + "name": { + "range": "TestCompile/patterns/case/1.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/case/1.d2,2:4:29-2:11:36", diff --git a/testdata/d2ir/TestCompile/patterns/case/2.exp.json b/testdata/d2ir/TestCompile/patterns/case/2.exp.json index c0331792b..7ba09d8c0 100644 --- a/testdata/d2ir/TestCompile/patterns/case/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/case/2.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "diddy kong", + "name": { + "range": "TestCompile/patterns/case/2.d2,0:0:0-0:10:10", + "value": [ + { + "string": "diddy kong", + "raw_string": "diddy kong" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/case/2.d2,2:7:30-2:10:33", @@ -70,7 +78,15 @@ ] }, { - "name": "Donkey Kong", + "name": { + "range": "TestCompile/patterns/case/2.d2,1:0:11-1:11:22", + "value": [ + { + "string": "Donkey Kong", + "raw_string": "Donkey Kong" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/case/2.d2,2:7:30-2:10:33", diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json index 5c880b983..da8744885 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json @@ -1,19 +1,51 @@ { "fields": [ { - "name": "shared", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + }, "composite": { "fields": [ { - "name": "animate", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", @@ -350,15 +382,39 @@ ] }, { - "name": "animal", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", @@ -695,11 +751,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/defaults.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/defaults.exp.json index 1abe7f643..c633a8199 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/defaults.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,4:0:22-4:1:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -143,11 +159,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,5:0:24-5:1:25", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -285,11 +317,27 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,6:0:26-6:1:27", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -427,11 +475,27 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,7:0:28-7:1:29", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -569,19 +633,51 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,9:0:31-9:9:40", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,9:10:41-9:11:42", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,4:0:22-4:1:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -782,11 +878,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,5:0:24-5:1:25", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -987,11 +1099,27 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,6:0:26-6:1:27", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -1192,11 +1320,27 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,7:0:28-7:1:29", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -1397,11 +1541,27 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,9:15:46-9:16:47", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -2323,15 +2483,39 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,10:0:50-10:6:56", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,10:7:57-10:8:58", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "p", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,10:12:62-10:13:63", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/edge-no-container.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/edge-no-container.exp.json index 280e2698a..e51884ec3 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/edge-no-container.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/edge-no-container.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "zone A", + "name": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,0:0:0-0:6:6", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + }, "composite": { "fields": [ { - "name": "machine A", + "name": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,1:1:11-1:10:20", + "value": [ + { + "string": "machine A", + "raw_string": "machine A" + } + ] + }, "references": [ { "string": { @@ -63,11 +79,27 @@ ] }, { - "name": "machine B", + "name": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:1:22-2:10:31", + "value": [ + { + "string": "machine B", + "raw_string": "machine B" + } + ] + }, "composite": { "fields": [ { - "name": "submachine A", + "name": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "value": [ + { + "string": "submachine A", + "raw_string": "submachine A" + } + ] + }, "references": [ { "string": { @@ -125,7 +157,15 @@ ] }, { - "name": "submachine B", + "name": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "value": [ + { + "string": "submachine B", + "raw_string": "submachine B" + } + ] + }, "references": [ { "string": { @@ -617,7 +657,15 @@ ] }, { - "name": "load balancer", + "name": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json index 1aec90b3b..ac6f162e9 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "fast", + "name": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,0:0:0-0:4:4", + "value": [ + { + "string": "fast", + "raw_string": "fast" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,1:2:10-1:3:11", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -63,7 +79,15 @@ ] }, { - "name": "far", + "name": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,2:2:14-2:5:17", + "value": [ + { + "string": "far", + "raw_string": "far" + } + ] + }, "references": [ { "string": { @@ -376,11 +400,27 @@ ] }, { - "name": "task", + "name": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,5:0:21-5:4:25", + "value": [ + { + "string": "task", + "raw_string": "task" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,6:2:31-6:3:32", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json index 694a4faf2..f38e7e726 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "b", + "name": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:3:6-2:4:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -229,7 +245,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json b/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json index c35f511d5..625cbddbc 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -804,7 +812,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -1624,11 +1640,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", @@ -2217,11 +2249,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", @@ -2810,11 +2858,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", diff --git a/testdata/d2ir/TestCompile/patterns/edge-glob-null.exp.json b/testdata/d2ir/TestCompile/patterns/edge-glob-null.exp.json index a61325deb..7a8ed01c5 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-glob-null.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-glob-null.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/edge-glob-null.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/edge-glob-null.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -235,7 +251,15 @@ ] }, { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge-glob-null.d2,2:0:25-2:1:26", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -352,7 +376,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge-glob-null.d2,2:5:30-2:6:31", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/1.exp.json b/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/1.exp.json index b78377170..241cca559 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/1.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,1:0:29-1:1:30", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -164,7 +172,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,1:5:34-1:6:35", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -327,15 +343,39 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,5:0:61-5:9:70", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "1", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,6:2:76-6:3:77", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,1:0:29-1:1:30", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -551,7 +591,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,1:5:34-1:6:35", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -714,11 +762,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "composite": { "fields": null, "edges": null @@ -1542,11 +1606,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,2:17:56-2:18:57", @@ -3357,11 +3437,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,2:17:56-2:18:57", diff --git a/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/2.exp.json b/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/2.exp.json index bfd84a1da..2c010d9ef 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/2.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:0:48-2:1:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", @@ -1671,15 +1695,39 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:5:53-2:6:54", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", @@ -3232,23 +3280,63 @@ ] }, { - "name": "steps", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,4:0:56-4:5:61", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + }, "composite": { "fields": [ { - "name": "1", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,5:2:67-5:3:68", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:0:48-2:1:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,6:21:93-6:22:94", @@ -5012,15 +5100,39 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:5:53-2:6:54", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", @@ -6366,11 +6478,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "composite": { "fields": null, "edges": null @@ -7194,11 +7322,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", @@ -8745,19 +8889,51 @@ ] }, { - "name": "2", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,8:2:101-8:3:102", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:0:48-2:1:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,6:21:93-6:22:94", @@ -10820,15 +10996,39 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:5:53-2:6:54", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", @@ -12473,11 +12673,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "composite": { "fields": [], "edges": null @@ -13697,11 +13913,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,9:31:137-9:32:138", @@ -15235,19 +15467,51 @@ ] }, { - "name": "3", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,11:2:145-11:3:146", + "value": [ + { + "string": "3", + "raw_string": "3" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:0:48-2:1:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,6:21:93-6:22:94", @@ -17459,15 +17723,39 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:5:53-2:6:54", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,12:21:171-12:22:172", @@ -19570,11 +19858,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "composite": { "fields": [], "edges": null @@ -21190,11 +21494,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,9:31:137-9:32:138", @@ -24578,11 +24898,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", diff --git a/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json b/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json index 687051252..42fb7fc68 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/edge-nexus.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -59,7 +67,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/edge-nexus.d2,1:0:2-1:1:3", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -117,7 +133,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/edge-nexus.d2,2:0:4-2:1:5", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -175,7 +199,15 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/edge-nexus.d2,3:0:6-3:1:7", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "references": [ { "string": { @@ -233,7 +265,15 @@ ] }, { - "name": "nexus", + "name": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json index e961e1ac3..d550db9c1 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "animate", + "name": { + "range": "TestCompile/patterns/edge/1.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, "references": [ { "string": { @@ -59,7 +67,15 @@ ] }, { - "name": "animal", + "name": { + "range": "TestCompile/patterns/edge/1.d2,1:0:8-1:6:14", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json index 02950f5d0..0679c9e6f 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "shared", + "name": { + "range": "TestCompile/patterns/edge/2.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + }, "composite": { "fields": [ { - "name": "animate", + "name": { + "range": "TestCompile/patterns/edge/2.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, "references": [ { "string": { @@ -85,7 +101,15 @@ ] }, { - "name": "animal", + "name": { + "range": "TestCompile/patterns/edge/2.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json index 8d19eaaa5..563e08697 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "shared", + "name": { + "range": "TestCompile/patterns/edge/3.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + }, "composite": { "fields": [ { - "name": "animate", + "name": { + "range": "TestCompile/patterns/edge/3.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, "references": [ { "string": { @@ -85,7 +101,15 @@ ] }, { - "name": "animal", + "name": { + "range": "TestCompile/patterns/edge/3.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/edge/4.exp.json b/testdata/d2ir/TestCompile/patterns/edge/4.exp.json index b3fa57457..8024698a6 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/4.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/4.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "app_a", + "name": { + "range": "TestCompile/patterns/edge/4.d2,0:0:0-0:5:5", + "value": [ + { + "string": "app_a", + "raw_string": "app_a" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge/4.d2,1:3:12-1:4:13", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -250,7 +266,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge/4.d2,8:18:55-8:19:56", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -694,11 +718,27 @@ ] }, { - "name": "app_b", + "name": { + "range": "TestCompile/patterns/edge/4.d2,4:1:19-4:6:24", + "value": [ + { + "string": "app_b", + "raw_string": "app_b" + } + ] + }, "composite": { "fields": [ { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge/4.d2,5:3:31-5:4:32", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -943,7 +983,15 @@ ] }, { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge/4.d2,8:7:44-8:8:45", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/escaped.exp.json b/testdata/d2ir/TestCompile/patterns/escaped.exp.json index 8048e9a5a..868e2dcec 100644 --- a/testdata/d2ir/TestCompile/patterns/escaped.exp.json +++ b/testdata/d2ir/TestCompile/patterns/escaped.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "animal", + "name": { + "range": "TestCompile/patterns/escaped.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/escaped.d2,0:8:8-0:12:12", @@ -80,7 +88,15 @@ ] }, { - "name": "action", + "name": { + "range": "TestCompile/patterns/escaped.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/escaped.d2,1:8:21-1:11:24", @@ -159,7 +175,15 @@ ] }, { - "name": "a*", + "name": { + "range": "TestCompile/patterns/escaped.d2,2:0:25-2:2:27", + "value": [ + { + "string": "a*", + "raw_string": "a\\*" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/escaped.d2,2:5:30-2:12:37", diff --git a/testdata/d2ir/TestCompile/patterns/field-glob-style-inherit.exp.json b/testdata/d2ir/TestCompile/patterns/field-glob-style-inherit.exp.json index 554e30926..b5c8274b6 100644 --- a/testdata/d2ir/TestCompile/patterns/field-glob-style-inherit.exp.json +++ b/testdata/d2ir/TestCompile/patterns/field-glob-style-inherit.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,1:0:19-1:1:20", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/field-glob-style-inherit.d2,2:17:41-2:18:42", @@ -1166,23 +1190,63 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,5:0:46-5:9:55", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "1", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,6:2:61-6:3:62", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,1:0:19-1:1:20", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/field-glob-style-inherit.d2,2:17:41-2:18:42", diff --git a/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json b/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json index 10b67da74..30745c840 100644 --- a/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json +++ b/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -342,7 +350,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -1435,7 +1451,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -1569,11 +1593,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", @@ -2180,11 +2220,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", @@ -2791,11 +2847,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", @@ -3402,11 +3474,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", diff --git a/testdata/d2ir/TestCompile/patterns/import-glob/1.exp.json b/testdata/d2ir/TestCompile/patterns/import-glob/1.exp.json index 7c0aa92b0..11a4d9bb5 100644 --- a/testdata/d2ir/TestCompile/patterns/import-glob/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/import-glob/1.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "before", + "name": { + "range": "index.d2,0:0:0-0:6:6", + "value": [ + { + "string": "before", + "raw_string": "before" + } + ] + }, "primary": { "value": { "range": "globs.d2,2:5:24-2:9:28", @@ -70,7 +78,15 @@ ] }, { - "name": "after", + "name": { + "range": "index.d2,0:22:22-0:27:27", + "value": [ + { + "string": "after", + "raw_string": "after" + } + ] + }, "primary": { "value": { "range": "globs.d2,2:5:24-2:9:28", diff --git a/testdata/d2ir/TestCompile/patterns/import-glob/2.exp.json b/testdata/d2ir/TestCompile/patterns/import-glob/2.exp.json index a55fa2287..2d7375ac9 100644 --- a/testdata/d2ir/TestCompile/patterns/import-glob/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/import-glob/2.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "rules.d2,2:0:30-2:1:31", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "primary": { "value": { "range": "rules.d2,1:5:25-1:9:29", @@ -16,11 +24,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "rules.d2,0:4:4-0:9:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "rules.d2,0:10:10-0:14:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "rules.d2,0:16:16-0:19:19", @@ -948,7 +972,15 @@ ] }, { - "name": "hi", + "name": { + "range": "index.d2,1:0:13-1:2:15", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + }, "primary": { "value": { "range": "rules.d2,1:5:25-1:9:29", @@ -963,11 +995,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "rules.d2,0:4:4-0:9:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "rules.d2,0:10:10-0:14:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "rules.d2,0:16:16-0:19:19", diff --git a/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json b/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json index c25616563..5bc579641 100644 --- a/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "animate", + "name": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, "composite": { "fields": [ { - "name": "constant", + "name": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:8:8-0:16:16", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + }, "composite": { "fields": [ { - "name": "tinkertinker", + "name": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:17:17-0:29:29", + "value": [ + { + "string": "tinkertinker", + "raw_string": "tinkertinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:33:108-2:40:115", @@ -505,15 +529,39 @@ ] }, { - "name": "astronaut", + "name": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:9:45", + "value": [ + { + "string": "astronaut", + "raw_string": "astronaut" + } + ] + }, "composite": { "fields": [ { - "name": "constant", + "name": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:10:46-1:18:54", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + }, "composite": { "fields": [ { - "name": "thinkerthinker", + "name": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:19:55-1:33:69", + "value": [ + { + "string": "thinkerthinker", + "raw_string": "thinkerthinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:33:108-2:40:115", diff --git a/testdata/d2ir/TestCompile/patterns/override/1.exp.json b/testdata/d2ir/TestCompile/patterns/override/1.exp.json index 8efff4de9..2829984b4 100644 --- a/testdata/d2ir/TestCompile/patterns/override/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/1.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/1.d2,4:0:43-4:1:44", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/override/1.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/override/1.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/override/1.d2,2:15:38-2:18:41", diff --git a/testdata/d2ir/TestCompile/patterns/override/2.exp.json b/testdata/d2ir/TestCompile/patterns/override/2.exp.json index 54f0423bd..c976d62ad 100644 --- a/testdata/d2ir/TestCompile/patterns/override/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/2.exp.json @@ -1,23 +1,63 @@ { "fields": [ { - "name": "layers", + "name": { + "range": "TestCompile/patterns/override/2.d2,3:0:25-3:6:31", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "hi", + "name": { + "range": "TestCompile/patterns/override/2.d2,4:2:37-4:4:39", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/2.d2,7:4:117-7:5:118", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/override/2.d2,1:4:5-1:9:10", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/override/2.d2,5:19:62-5:22:65", diff --git a/testdata/d2ir/TestCompile/patterns/override/3.exp.json b/testdata/d2ir/TestCompile/patterns/override/3.exp.json index 604061dc0..c8fce0556 100644 --- a/testdata/d2ir/TestCompile/patterns/override/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/3.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/3.d2,3:0:28-3:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/override/3.d2,3:5:33-3:6:34", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -235,23 +251,63 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/patterns/override/3.d2,5:0:36-5:6:42", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "hi", + "name": { + "range": "TestCompile/patterns/override/3.d2,6:2:48-6:4:50", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + }, "composite": { "fields": [ { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/override/3.d2,9:4:90-9:13:99", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "b", + "name": { + "range": "TestCompile/patterns/override/3.d2,10:6:109-10:7:110", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/3.d2,12:8:175-12:9:176", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -368,7 +424,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/override/3.d2,12:13:180-12:14:181", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -502,7 +566,15 @@ "map": { "fields": [ { - "name": "label", + "name": { + "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/override/3.d2,7:27:81-7:30:84", @@ -8101,7 +8173,15 @@ "map": { "fields": [ { - "name": "label", + "name": { + "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", diff --git a/testdata/d2ir/TestCompile/patterns/override/4.exp.json b/testdata/d2ir/TestCompile/patterns/override/4.exp.json index 40b076ead..6d3d73bb5 100644 --- a/testdata/d2ir/TestCompile/patterns/override/4.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/4.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -157,7 +165,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -330,7 +346,15 @@ "map": { "fields": [ { - "name": "label", + "name": { + "range": "TestCompile/patterns/override/4.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/override/4.d2,4:9:47-4:12:50", diff --git a/testdata/d2ir/TestCompile/patterns/override/5.exp.json b/testdata/d2ir/TestCompile/patterns/override/5.exp.json index e73c6eed9..08d282a70 100644 --- a/testdata/d2ir/TestCompile/patterns/override/5.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/5.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -252,7 +268,15 @@ "map": { "fields": [ { - "name": "label", + "name": { + "range": "TestCompile/patterns/override/5.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/override/5.d2,6:23:105-6:26:108", diff --git a/testdata/d2ir/TestCompile/patterns/override/6.exp.json b/testdata/d2ir/TestCompile/patterns/override/6.exp.json index f52183c3e..2c9d0debd 100644 --- a/testdata/d2ir/TestCompile/patterns/override/6.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/6.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/6.d2,2:0:29-2:1:30", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [], "edges": null @@ -221,7 +229,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/override/6.d2,7:0:138-7:1:139", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [], "edges": null diff --git a/testdata/d2ir/TestCompile/patterns/override/7.exp.json b/testdata/d2ir/TestCompile/patterns/override/7.exp.json index 6658f0928..8f4638294 100644 --- a/testdata/d2ir/TestCompile/patterns/override/7.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/7.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/7.d2,3:0:93-3:1:94", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [], "edges": null @@ -168,7 +176,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/override/7.d2,6:0:136-6:1:137", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [], "edges": null diff --git a/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json b/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json index db2c68dc4..38d6844b5 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "tinker", + "name": { + "range": "TestCompile/patterns/prefix-suffix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "tinker", + "raw_string": "tinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix-suffix.d2,2:5:31-2:12:38", @@ -80,7 +88,15 @@ ] }, { - "name": "thinker", + "name": { + "range": "TestCompile/patterns/prefix-suffix.d2,1:0:13-1:7:20", + "value": [ + { + "string": "thinker", + "raw_string": "thinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix-suffix.d2,2:5:31-2:12:38", diff --git a/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json b/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json index 32d2fc713..3113b66d4 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "tinker", + "name": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,0:0:0-0:6:6", + "value": [ + { + "string": "tinker", + "raw_string": "tinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix-suffix/2.d2,2:9:35-2:16:42", @@ -80,7 +88,15 @@ ] }, { - "name": "thinker", + "name": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,1:0:13-1:7:20", + "value": [ + { + "string": "thinker", + "raw_string": "thinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix-suffix/2.d2,2:9:35-2:16:42", diff --git a/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json b/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json index dfb1a9f64..d525b4b23 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "tinkertinker", + "name": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,0:0:0-0:12:12", + "value": [ + { + "string": "tinkertinker", + "raw_string": "tinkertinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix-suffix/3.d2,2:17:56-2:24:63", @@ -80,7 +88,15 @@ ] }, { - "name": "thinkerthinker", + "name": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,1:0:19-1:14:33", + "value": [ + { + "string": "thinkerthinker", + "raw_string": "thinkerthinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix-suffix/3.d2,2:17:56-2:24:63", diff --git a/testdata/d2ir/TestCompile/patterns/prefix.exp.json b/testdata/d2ir/TestCompile/patterns/prefix.exp.json index 920eddc82..532640cc5 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "animal", + "name": { + "range": "TestCompile/patterns/prefix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix.d2,2:4:29-2:11:36", @@ -80,7 +88,15 @@ ] }, { - "name": "action", + "name": { + "range": "TestCompile/patterns/prefix.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix.d2,2:4:29-2:11:36", diff --git a/testdata/d2ir/TestCompile/patterns/prevent-chain-recursion.exp.json b/testdata/d2ir/TestCompile/patterns/prevent-chain-recursion.exp.json index d75403066..ebd7e7e73 100644 --- a/testdata/d2ir/TestCompile/patterns/prevent-chain-recursion.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prevent-chain-recursion.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "one", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,9:0:46-9:3:49", + "value": [ + { + "string": "one", + "raw_string": "one" + } + ] + }, "composite": { "fields": [ { - "name": "c", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:3:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:5:13-2:6:14", @@ -20,11 +36,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", @@ -285,11 +317,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", @@ -540,11 +588,27 @@ ] }, { - "name": "two", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,10:0:50-10:3:53", + "value": [ + { + "string": "two", + "raw_string": "two" + } + ] + }, "composite": { "fields": [ { - "name": "c", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:3:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:5:13-2:6:14", @@ -559,11 +623,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", @@ -824,11 +904,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", diff --git a/testdata/d2ir/TestCompile/patterns/reserved.exp.json b/testdata/d2ir/TestCompile/patterns/reserved.exp.json index 196237058..4528cc15b 100644 --- a/testdata/d2ir/TestCompile/patterns/reserved.exp.json +++ b/testdata/d2ir/TestCompile/patterns/reserved.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "vars", + "name": { + "range": "TestCompile/patterns/reserved.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, "composite": { "fields": [ { - "name": "d2-config", + "name": { + "range": "TestCompile/patterns/reserved.d2,1:2:10-1:11:19", + "value": [ + { + "string": "d2-config", + "raw_string": "d2-config" + } + ] + }, "composite": { "fields": [ { - "name": "layout-engine", + "name": { + "range": "TestCompile/patterns/reserved.d2,2:4:27-2:17:40", + "value": [ + { + "string": "layout-engine", + "raw_string": "layout-engine" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/reserved.d2,2:19:42-2:22:45", @@ -313,7 +337,15 @@ ] }, { - "name": "Spiderman 1", + "name": { + "range": "TestCompile/patterns/reserved.d2,6:0:53-6:11:64", + "value": [ + { + "string": "Spiderman 1", + "raw_string": "Spiderman 1" + } + ] + }, "references": [ { "string": { @@ -371,7 +403,15 @@ ] }, { - "name": "Spiderman 2", + "name": { + "range": "TestCompile/patterns/reserved.d2,7:0:65-7:11:76", + "value": [ + { + "string": "Spiderman 2", + "raw_string": "Spiderman 2" + } + ] + }, "references": [ { "string": { @@ -429,7 +469,15 @@ ] }, { - "name": "Spiderman 3", + "name": { + "range": "TestCompile/patterns/reserved.d2,8:0:77-8:11:88", + "value": [ + { + "string": "Spiderman 3", + "raw_string": "Spiderman 3" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/scenarios.exp.json b/testdata/d2ir/TestCompile/patterns/scenarios.exp.json index 587b6d6c3..e7882c90c 100644 --- a/testdata/d2ir/TestCompile/patterns/scenarios.exp.json +++ b/testdata/d2ir/TestCompile/patterns/scenarios.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/scenarios.d2,2:0:2-2:9:11", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "meow", + "name": { + "range": "TestCompile/patterns/scenarios.d2,3:2:17-3:6:21", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + }, "composite": { "fields": [ { - "name": "e", + "name": { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -78,7 +102,15 @@ ] }, { - "name": "f", + "name": { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -147,7 +179,15 @@ ] }, { - "name": "g", + "name": { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -216,7 +256,15 @@ ] }, { - "name": "h", + "name": { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "value": [ + { + "string": "h", + "raw_string": "h" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -2105,7 +2153,15 @@ ] }, { - "name": "a", + "name": { + "range": "TestCompile/patterns/scenarios.d2,11:0:44-11:1:45", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -2174,7 +2230,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/scenarios.d2,12:0:46-12:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -2243,7 +2307,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/scenarios.d2,13:0:48-13:1:49", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -2312,7 +2384,15 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/scenarios.d2,14:0:50-14:1:51", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", diff --git a/testdata/d2ir/TestCompile/patterns/single-glob/defaults.exp.json b/testdata/d2ir/TestCompile/patterns/single-glob/defaults.exp.json index ab8e85c96..9fa0ea237 100644 --- a/testdata/d2ir/TestCompile/patterns/single-glob/defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/single-glob/defaults.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "wrapper", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", + "value": [ + { + "string": "wrapper", + "raw_string": "wrapper" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,4:8:37-4:9:38", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -169,11 +193,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,5:8:47-5:9:48", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -333,11 +373,27 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,6:8:57-6:9:58", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -497,11 +553,27 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,7:8:67-7:9:68", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -2527,23 +2599,63 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,9:0:70-9:9:79", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,9:10:80-9:11:81", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "wrapper", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", + "value": [ + { + "string": "wrapper", + "raw_string": "wrapper" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,4:8:37-4:9:38", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -2703,11 +2815,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,5:8:47-5:9:48", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -2867,11 +2995,27 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,6:8:57-6:9:58", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -3031,11 +3175,27 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,7:8:67-7:9:68", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -3195,11 +3355,27 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,9:23:93-9:24:94", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -6138,19 +6314,51 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,10:0:97-10:6:103", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,10:7:104-10:8:105", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "wrapper", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,10:12:109-10:19:116", + "value": [ + { + "string": "wrapper", + "raw_string": "wrapper" + } + ] + }, "composite": { "fields": [ { - "name": "p", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,10:20:117-10:21:118", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/suffix.exp.json b/testdata/d2ir/TestCompile/patterns/suffix.exp.json index b0cb6cbeb..39d2dcfb7 100644 --- a/testdata/d2ir/TestCompile/patterns/suffix.exp.json +++ b/testdata/d2ir/TestCompile/patterns/suffix.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "animal", + "name": { + "range": "TestCompile/patterns/suffix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/suffix.d2,2:4:30-2:11:37", @@ -80,7 +88,15 @@ ] }, { - "name": "jingle", + "name": { + "range": "TestCompile/patterns/suffix.d2,1:0:13-1:6:19", + "value": [ + { + "string": "jingle", + "raw_string": "jingle" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/suffix.d2,2:4:30-2:11:37", diff --git a/testdata/d2ir/TestCompile/patterns/table-class-exception.exp.json b/testdata/d2ir/TestCompile/patterns/table-class-exception.exp.json index 8b4fedc2d..850fc7695 100644 --- a/testdata/d2ir/TestCompile/patterns/table-class-exception.exp.json +++ b/testdata/d2ir/TestCompile/patterns/table-class-exception.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "table", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,9:0:46-9:5:51", + "value": [ + { + "string": "table", + "raw_string": "table" + } + ] + }, "composite": { "fields": [ { - "name": "c", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,2:2:10-2:3:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,2:5:13-2:6:14", @@ -20,11 +36,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,6:14:39-6:17:42", @@ -285,11 +317,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,6:14:39-6:17:42", @@ -481,7 +529,15 @@ ] }, { - "name": "shape", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,10:2:57-10:7:62", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,10:9:64-10:18:73", @@ -560,7 +616,15 @@ ] }, { - "name": "a", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,11:2:76-11:3:77", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,11:5:79-11:6:80", @@ -575,11 +639,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,6:14:39-6:17:42", @@ -971,11 +1051,27 @@ ] }, { - "name": "class", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,14:0:84-14:5:89", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,15:2:95-15:7:100", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,15:9:102-15:14:107", @@ -1054,7 +1150,15 @@ ] }, { - "name": "a", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,16:2:110-16:3:111", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,16:5:113-16:6:114", diff --git a/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json b/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json index 0607e99f9..2373213b4 100644 --- a/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,4:0:23-4:1:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -143,11 +159,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,5:0:25-5:1:26", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -285,11 +317,27 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,6:0:27-6:1:28", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -427,11 +475,27 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,7:0:29-7:1:30", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -569,19 +633,51 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,9:0:32-9:9:41", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,9:10:42-9:11:43", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,4:0:23-4:1:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -782,11 +878,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,5:0:25-5:1:26", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -987,11 +1099,27 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,6:0:27-6:1:28", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -1192,11 +1320,27 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,7:0:29-7:1:30", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -1397,11 +1541,27 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,9:15:47-9:16:48", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -2339,19 +2499,51 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,10:0:51-10:6:57", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,10:7:58-10:8:59", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "p", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,10:12:63-10:13:64", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", diff --git a/testdata/d2ir/TestCompile/patterns/triple-glob/edge-defaults.exp.json b/testdata/d2ir/TestCompile/patterns/triple-glob/edge-defaults.exp.json index 9b2766ddb..c5c892e94 100644 --- a/testdata/d2ir/TestCompile/patterns/triple-glob/edge-defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/triple-glob/edge-defaults.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,4:0:55-4:1:56", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,4:5:60-4:6:61", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -235,7 +251,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,5:0:62-5:1:63", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -352,7 +376,15 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,5:5:67-5:6:68", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "references": [ { "string": { @@ -469,15 +501,39 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,7:0:70-7:9:79", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,7:10:80-7:11:81", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,4:0:55-4:1:56", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -594,7 +650,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,4:5:60-4:6:61", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -711,7 +775,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,5:0:62-5:1:63", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -828,7 +900,15 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,5:5:67-5:6:68", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "references": [ { "string": { @@ -945,7 +1025,15 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,7:15:85-7:16:86", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "references": [ { "string": { @@ -1062,7 +1150,15 @@ ] }, { - "name": "q", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,7:20:90-7:21:91", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "references": [ { "string": { @@ -1196,11 +1292,27 @@ "map": { "fields": [ { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", @@ -2035,11 +2147,27 @@ "map": { "fields": [ { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", @@ -2874,11 +3002,27 @@ "map": { "fields": [ { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", @@ -5047,15 +5191,39 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,8:0:94-8:6:100", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,8:7:101-8:8:102", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "j", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,8:12:106-8:13:107", + "value": [ + { + "string": "j", + "raw_string": "j" + } + ] + }, "references": [ { "string": { @@ -5172,7 +5340,15 @@ ] }, { - "name": "f", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,8:17:111-8:18:112", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + }, "references": [ { "string": { @@ -5306,11 +5482,27 @@ "map": { "fields": [ { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", @@ -7496,11 +7688,27 @@ "map": { "fields": [ { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", @@ -7970,11 +8178,27 @@ "map": { "fields": [ { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", diff --git a/testdata/d2ir/TestCompile/scenarios/edge.exp.json b/testdata/d2ir/TestCompile/scenarios/edge.exp.json index 86c00ee6e..9e6e0e618 100644 --- a/testdata/d2ir/TestCompile/scenarios/edge.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/edge.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -235,15 +251,39 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/scenarios/edge.d2,1:0:7-1:9:16", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "1", + "name": { + "range": "TestCompile/scenarios/edge.d2,2:2:22-2:3:23", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -510,7 +550,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -794,11 +842,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/scenarios/edge.d2,3:16:43-3:21:48", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/scenarios/edge.d2,3:22:49-3:29:56", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/scenarios/edge.d2,3:31:58-3:34:61", diff --git a/testdata/d2ir/TestCompile/scenarios/multiple-scenario-map.exp.json b/testdata/d2ir/TestCompile/scenarios/multiple-scenario-map.exp.json index 603b8a13f..6c2986ff7 100644 --- a/testdata/d2ir/TestCompile/scenarios/multiple-scenario-map.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/multiple-scenario-map.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -164,7 +172,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -327,15 +343,39 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,1:0:31-1:9:40", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "1", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,2:2:46-2:3:47", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -648,7 +688,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -961,7 +1009,15 @@ ] }, { - "name": "z", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,6:1:98-6:2:99", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -1036,11 +1092,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:10:10-0:15:15", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:16:16-0:23:23", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/scenarios/multiple-scenario-map.d2,3:31:82-3:34:85", @@ -2283,11 +2355,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:10:10-0:15:15", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:16:16-0:23:23", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:25:25-0:28:28", diff --git a/testdata/d2ir/TestCompile/scenarios/root.exp.json b/testdata/d2ir/TestCompile/scenarios/root.exp.json index 93e644f22..189ae71f1 100644 --- a/testdata/d2ir/TestCompile/scenarios/root.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/root.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -235,15 +251,39 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/scenarios/root.d2,1:0:7-1:9:16", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "bingo", + "name": { + "range": "TestCompile/scenarios/root.d2,2:1:21-2:6:26", + "value": [ + { + "string": "bingo", + "raw_string": "bingo" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -360,7 +400,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -477,15 +525,39 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/scenarios/root.d2,2:10:30-2:11:31", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "q", + "name": { + "range": "TestCompile/scenarios/root.d2,2:12:32-2:13:33", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/scenarios/root.d2,2:14:34-2:15:35", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -1007,11 +1079,27 @@ ] }, { - "name": "nuclear", + "name": { + "range": "TestCompile/scenarios/root.d2,3:1:39-3:8:46", + "value": [ + { + "string": "nuclear", + "raw_string": "nuclear" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -1128,7 +1216,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -1245,7 +1341,15 @@ ] }, { - "name": "quiche", + "name": { + "range": "TestCompile/scenarios/root.d2,3:12:50-3:18:56", + "value": [ + { + "string": "quiche", + "raw_string": "quiche" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/steps/recursive.exp.json b/testdata/d2ir/TestCompile/steps/recursive.exp.json index 595f96cc7..0afdd842b 100644 --- a/testdata/d2ir/TestCompile/steps/recursive.exp.json +++ b/testdata/d2ir/TestCompile/steps/recursive.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -235,15 +251,39 @@ ] }, { - "name": "steps", + "name": { + "range": "TestCompile/steps/recursive.d2,1:0:7-1:5:12", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + }, "composite": { "fields": [ { - "name": "bingo", + "name": { + "range": "TestCompile/steps/recursive.d2,2:1:17-2:6:22", + "value": [ + { + "string": "bingo", + "raw_string": "bingo" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -360,7 +400,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -477,15 +525,39 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/steps/recursive.d2,2:10:26-2:11:27", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "q", + "name": { + "range": "TestCompile/steps/recursive.d2,2:12:28-2:13:29", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/steps/recursive.d2,2:14:30-2:15:31", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -1007,11 +1079,27 @@ ] }, { - "name": "nuclear", + "name": { + "range": "TestCompile/steps/recursive.d2,3:1:35-3:8:42", + "value": [ + { + "string": "nuclear", + "raw_string": "nuclear" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -1128,7 +1216,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -1245,15 +1341,39 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/steps/recursive.d2,2:10:26-2:11:27", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "q", + "name": { + "range": "TestCompile/steps/recursive.d2,2:12:28-2:13:29", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/steps/recursive.d2,2:14:30-2:15:31", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -1561,7 +1681,15 @@ ] }, { - "name": "quiche", + "name": { + "range": "TestCompile/steps/recursive.d2,4:2:48-4:8:54", + "value": [ + { + "string": "quiche", + "raw_string": "quiche" + } + ] + }, "references": [ { "string": { @@ -1619,15 +1747,39 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/steps/recursive.d2,5:2:57-5:11:66", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "bavarian", + "name": { + "range": "TestCompile/steps/recursive.d2,6:3:73-6:11:81", + "value": [ + { + "string": "bavarian", + "raw_string": "bavarian" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -1744,7 +1896,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -1861,15 +2021,39 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/steps/recursive.d2,2:10:26-2:11:27", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "q", + "name": { + "range": "TestCompile/steps/recursive.d2,2:12:28-2:13:29", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/steps/recursive.d2,2:14:30-2:15:31", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -2177,7 +2361,15 @@ ] }, { - "name": "quiche", + "name": { + "range": "TestCompile/steps/recursive.d2,4:2:48-4:8:54", + "value": [ + { + "string": "quiche", + "raw_string": "quiche" + } + ] + }, "references": [ { "string": { @@ -2235,7 +2427,15 @@ ] }, { - "name": "perseverance", + "name": { + "range": "TestCompile/steps/recursive.d2,7:4:89-7:16:101", + "value": [ + { + "string": "perseverance", + "raw_string": "perseverance" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/steps/root.exp.json b/testdata/d2ir/TestCompile/steps/root.exp.json index 62376b02f..4cc496405 100644 --- a/testdata/d2ir/TestCompile/steps/root.exp.json +++ b/testdata/d2ir/TestCompile/steps/root.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -235,15 +251,39 @@ ] }, { - "name": "steps", + "name": { + "range": "TestCompile/steps/root.d2,1:0:7-1:5:12", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + }, "composite": { "fields": [ { - "name": "bingo", + "name": { + "range": "TestCompile/steps/root.d2,2:1:17-2:6:22", + "value": [ + { + "string": "bingo", + "raw_string": "bingo" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -360,7 +400,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -477,15 +525,39 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/steps/root.d2,2:10:26-2:11:27", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "q", + "name": { + "range": "TestCompile/steps/root.d2,2:12:28-2:13:29", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/steps/root.d2,2:14:30-2:15:31", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -1007,11 +1079,27 @@ ] }, { - "name": "nuclear", + "name": { + "range": "TestCompile/steps/root.d2,3:1:35-3:8:42", + "value": [ + { + "string": "nuclear", + "raw_string": "nuclear" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -1128,7 +1216,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -1245,15 +1341,39 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/steps/root.d2,2:10:26-2:11:27", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "q", + "name": { + "range": "TestCompile/steps/root.d2,2:12:28-2:13:29", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/steps/root.d2,2:14:30-2:15:31", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -1561,7 +1681,15 @@ ] }, { - "name": "quiche", + "name": { + "range": "TestCompile/steps/root.d2,3:12:46-3:18:52", + "value": [ + { + "string": "quiche", + "raw_string": "quiche" + } + ] + }, "references": [ { "string": {