From eed3f7eb21c5ee7a67409a2b7093b57b15977d74 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Sat, 19 Aug 2023 21:20:32 -0700 Subject: [PATCH] d2ir: Many more glob fixes --- d2ast/d2ast.go | 149 +- d2compiler/compile_test.go | 24 + d2ir/compile.go | 9 +- d2ir/compile_test.go | 2 +- d2ir/d2ir.go | 140 +- d2ir/pattern_test.go | 85 +- d2ir/query.go | 23 +- d2oracle/edit.go | 8 +- .../alixander-lazy-globs-review/3.exp.json | 458 ++ .../d2ir/TestCompile/classes/basic.exp.json | 15 +- .../TestCompile/classes/inherited.exp.json | 240 +- .../TestCompile/classes/layer-modify.exp.json | 39 +- .../d2ir/TestCompile/classes/merge.exp.json | 42 +- .../d2ir/TestCompile/classes/nested.exp.json | 51 +- .../d2ir/TestCompile/edges/chain.exp.json | 27 +- .../d2ir/TestCompile/edges/nested.exp.json | 15 +- testdata/d2ir/TestCompile/edges/root.exp.json | 9 +- .../TestCompile/edges/underscore.exp.json | 12 +- .../d2ir/TestCompile/fields/array.exp.json | 3 +- .../d2ir/TestCompile/fields/label.exp.json | 3 +- .../d2ir/TestCompile/fields/nested.exp.json | 6 +- .../fields/primary/nested.exp.json | 9 +- .../TestCompile/fields/primary/root.exp.json | 6 +- .../d2ir/TestCompile/fields/root.exp.json | 3 +- .../d2ir/TestCompile/filters/array.exp.json | 39 +- .../d2ir/TestCompile/filters/base.exp.json | 21 +- .../d2ir/TestCompile/filters/edge.exp.json | 84 +- .../TestCompile/filters/label-filter.exp.json | 4654 ----------------- .../filters/label-filter/1.exp.json | 1179 +---- .../filters/label-filter/2.exp.json | 66 +- .../d2ir/TestCompile/filters/order.exp.json | 21 +- .../d2ir/TestCompile/imports/boards.exp.json | 27 +- .../TestCompile/imports/nested/array.exp.json | 3 +- .../TestCompile/imports/nested/map.exp.json | 9 +- .../imports/nested/scalar.exp.json | 3 +- .../imports/nested/spread.exp.json | 6 +- .../imports/nested/spread_primary.exp.json | 9 +- .../d2ir/TestCompile/imports/spread.exp.json | 3 +- .../imports/steps-inheritence.exp.json | 48 +- .../d2ir/TestCompile/imports/value.exp.json | 9 +- .../d2ir/TestCompile/imports/vars/1.exp.json | 9 +- .../d2ir/TestCompile/imports/vars/2.exp.json | 15 +- .../d2ir/TestCompile/imports/vars/3.exp.json | 15 +- .../layers/errs/4/good_edge.exp.json | 21 +- .../d2ir/TestCompile/layers/root.exp.json | 24 +- .../patterns/alixander-review/1.exp.json | 1089 +--- .../patterns/alixander-review/2.exp.json | 27 +- .../patterns/alixander-review/3.exp.json | 54 +- .../patterns/alixander-review/4.exp.json | 27 +- .../patterns/alixander-review/5.exp.json | 509 +- .../patterns/alixander-review/6.exp.json | 45 +- .../patterns/alixander-review/7.exp.json | 1079 ++++ .../patterns/alixander-review/8.exp.json | 869 +++ .../d2ir/TestCompile/patterns/case/1.exp.json | 6 +- .../d2ir/TestCompile/patterns/case/2.exp.json | 6 +- .../patterns/double-glob/1.exp.json | 30 +- .../patterns/double-glob/defaults.exp.json | 75 +- .../double-glob/edge-no-container.exp.json | 30 +- .../patterns/double-glob/edge/1.exp.json | 24 +- .../patterns/double-glob/edge/2.exp.json | 12 +- .../patterns/edge-glob-index.exp.json | 162 +- .../TestCompile/patterns/edge-nexus.exp.json | 27 +- .../d2ir/TestCompile/patterns/edge/1.exp.json | 12 +- .../d2ir/TestCompile/patterns/edge/2.exp.json | 18 +- .../d2ir/TestCompile/patterns/edge/3.exp.json | 18 +- .../TestCompile/patterns/escaped.exp.json | 9 +- .../patterns/glob-edge-glob-index.exp.json | 156 +- .../patterns/nested/prefix-suffix/3.exp.json | 24 +- .../TestCompile/patterns/override/1.exp.json | 21 +- .../TestCompile/patterns/override/2.exp.json | 279 +- .../TestCompile/patterns/override/3.exp.json | 84 +- .../TestCompile/patterns/override/4.exp.json | 18 +- .../TestCompile/patterns/override/5.exp.json | 21 +- .../patterns/prefix-suffix.exp.json | 6 +- .../patterns/prefix-suffix/2.exp.json | 6 +- .../patterns/prefix-suffix/3.exp.json | 6 +- .../d2ir/TestCompile/patterns/prefix.exp.json | 6 +- .../patterns/prevent-chain-recursion.exp.json | 1083 ++++ .../TestCompile/patterns/reserved.exp.json | 36 +- .../TestCompile/patterns/scenarios.exp.json | 102 +- .../patterns/single-glob/defaults.exp.json | 144 +- .../d2ir/TestCompile/patterns/suffix.exp.json | 6 +- .../patterns/table-class-exception.exp.json | 988 ++++ .../patterns/triple-glob/defaults.exp.json | 96 +- .../triple-glob/edge-defaults.exp.json | 150 +- .../d2ir/TestCompile/scenarios/edge.exp.json | 39 +- .../d2ir/TestCompile/scenarios/root.exp.json | 48 +- .../d2ir/TestCompile/steps/recursive.exp.json | 87 +- testdata/d2ir/TestCompile/steps/root.exp.json | 57 +- 89 files changed, 6774 insertions(+), 8460 deletions(-) create mode 100644 testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.exp.json delete mode 100644 testdata/d2ir/TestCompile/filters/label-filter.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/alixander-review/7.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/alixander-review/8.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/prevent-chain-recursion.exp.json create mode 100644 testdata/d2ir/TestCompile/patterns/table-class-exception.exp.json diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index 63daf011e..a210a49f3 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -641,8 +641,7 @@ type Key struct { Value ValueBox `json:"value"` } -// TODO maybe need to compare Primary -func (mk1 *Key) Equals(mk2 *Key) bool { +func (mk1 *Key) D2OracleEquals(mk2 *Key) bool { if mk1.Ampersand != mk2.Ampersand { return false } @@ -715,6 +714,98 @@ func (mk1 *Key) Equals(mk2 *Key) bool { return true } +func (mk1 *Key) Equals(mk2 *Key) bool { + if mk1.Ampersand != mk2.Ampersand { + return false + } + if (mk1.Key == nil) != (mk2.Key == nil) { + return false + } + if (mk1.EdgeIndex == nil) != (mk2.EdgeIndex == nil) { + return false + } + if mk1.EdgeIndex != nil { + if !mk1.EdgeIndex.Equals(mk2.EdgeIndex) { + return false + } + } + if (mk1.EdgeKey == nil) != (mk2.EdgeKey == nil) { + return false + } + if len(mk1.Edges) != len(mk2.Edges) { + return false + } + for i := range mk1.Edges { + if !mk1.Edges[i].Equals(mk2.Edges[i]) { + return false + } + } + if (mk1.Value.Map == nil) != (mk2.Value.Map == nil) { + if mk1.Value.Map != nil && len(mk1.Value.Map.Nodes) > 0 { + return false + } + if mk2.Value.Map != nil && len(mk2.Value.Map.Nodes) > 0 { + return false + } + } else if (mk1.Value.Unbox() == nil) != (mk2.Value.Unbox() == nil) { + return false + } + + if mk1.Key != nil { + if len(mk1.Key.Path) != len(mk2.Key.Path) { + return false + } + for i, id := range mk1.Key.Path { + if id.Unbox().ScalarString() != mk2.Key.Path[i].Unbox().ScalarString() { + return false + } + } + } + if mk1.EdgeKey != nil { + if len(mk1.EdgeKey.Path) != len(mk2.EdgeKey.Path) { + return false + } + for i, id := range mk1.EdgeKey.Path { + if id.Unbox().ScalarString() != mk2.EdgeKey.Path[i].Unbox().ScalarString() { + return false + } + } + } + + if mk1.Value.Map != nil && len(mk1.Value.Map.Nodes) > 0 { + if len(mk1.Value.Map.Nodes) != len(mk2.Value.Map.Nodes) { + return false + } + for i := range mk1.Value.Map.Nodes { + if !mk1.Value.Map.Nodes[i].MapKey.Equals(mk2.Value.Map.Nodes[i].MapKey) { + return false + } + } + } + + if mk1.Value.Unbox() != nil { + if (mk1.Value.ScalarBox().Unbox() == nil) != (mk2.Value.ScalarBox().Unbox() == nil) { + return false + } + if mk1.Value.ScalarBox().Unbox() != nil { + if mk1.Value.ScalarBox().Unbox().ScalarString() != mk2.Value.ScalarBox().Unbox().ScalarString() { + return false + } + } + } + + if mk1.Primary.Unbox() != nil { + if (mk1.Primary.Unbox() == nil) != (mk2.Primary.Unbox() == nil) { + return false + } + if mk1.Primary.ScalarString() != mk2.Primary.ScalarString() { + return false + } + } + + return true +} + func (mk *Key) SetScalar(scalar ScalarBox) { if mk.Value.Unbox() != nil && mk.Value.ScalarBox().Unbox() == nil { mk.Primary = scalar @@ -828,6 +919,18 @@ func (kp *KeyPath) HasGlob() bool { return false } +func (kp *KeyPath) FirstGlob() int { + if kp == nil { + return -1 + } + for i, el := range kp.Path { + if el.UnquotedString != nil && len(el.UnquotedString.Pattern) > 0 { + return i + } + } + return -1 +} + func (kp *KeyPath) HasTripleGlob() bool { if kp == nil { return false @@ -852,6 +955,18 @@ func (kp *KeyPath) HasMultiGlob() bool { return false } +func (kp1 *KeyPath) Equals(kp2 *KeyPath) bool { + if len(kp1.Path) != len(kp2.Path) { + return false + } + for i, id := range kp1.Path { + if id.Unbox().ScalarString() != kp2.Path[i].Unbox().ScalarString() { + return false + } + } + return true +} + type Edge struct { Range Range `json:"range"` @@ -864,6 +979,22 @@ type Edge struct { DstArrow string `json:"dst_arrow"` } +func (e1 *Edge) Equals(e2 *Edge) bool { + if !e1.Src.Equals(e2.Src) { + return false + } + if e1.SrcArrow != e2.SrcArrow { + return false + } + if !e1.Dst.Equals(e2.Dst) { + return false + } + if e1.DstArrow != e2.DstArrow { + return false + } + return true +} + type EdgeIndex struct { Range Range `json:"range"` @@ -872,6 +1003,16 @@ type EdgeIndex struct { Glob bool `json:"glob"` } +func (ei1 *EdgeIndex) Equals(ei2 *EdgeIndex) bool { + if ei1.Int != ei2.Int { + return false + } + if ei1.Glob != ei2.Glob { + return false + } + return true +} + type Substitution struct { Range Range `json:"range"` @@ -1147,6 +1288,10 @@ func (sb ScalarBox) Unbox() Scalar { } } +func (sb ScalarBox) ScalarString() string { + return sb.Unbox().ScalarString() +} + // StringBox is used to box String for JSON persistence. type StringBox struct { UnquotedString *UnquotedString `json:"unquoted_string,omitempty"` diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 169145af2..15c966eab 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -4072,6 +4072,30 @@ scenarios: { a -> b } } +`, "") + }, + }, + { + name: "alixander-lazy-globs-review/3", + run: func(t *testing.T) { + assertCompile(t, ` +***: { + c: d +} + +***: { + style.fill: red +} + +table: { + shape: sql_table + a: b +} + +class: { + shape: class + a: b +} `, "") }, }, diff --git a/d2ir/compile.go b/d2ir/compile.go index 54ff45e75..752473abf 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -514,9 +514,10 @@ func (c *compiler) compileKey(refctx *RefContext) { if oldFields != refctx.ScopeMap.FieldCountRecursive() || oldEdges != refctx.ScopeMap.EdgeCountRecursive() { for _, gctx2 := range c.globContexts() { // println(d2format.Format(gctx2.refctx.Key), d2format.Format(refctx.Key)) + old := c.lazyGlobBeingApplied c.lazyGlobBeingApplied = true c.compileKey(gctx2.refctx) - c.lazyGlobBeingApplied = false + c.lazyGlobBeingApplied = old } } } @@ -748,7 +749,7 @@ func (c *compiler) _compileField(f *Field, refctx *RefContext) { // if already set by a non glob key. func (c *compiler) ignoreLazyGlob(n Node) bool { if c.lazyGlobBeingApplied && n.Primary() != nil { - if ref := n.SecondLastPrimaryRef(); ref != nil && !ref.DueToGlob() { + if n.LastPrimaryRef() != nil { return true } } @@ -899,7 +900,9 @@ func (c *compiler) _compileEdges(refctx *RefContext) { } for _, e := range ea { e.References = append(e.References, &EdgeReference{ - Context_: refctx, + Context_: refctx, + DueToGlob_: len(c.globRefContextStack) > 0, + DueToLazyGlob_: c.lazyGlobBeingApplied, }) refctx.ScopeMap.appendFieldReferences(0, refctx.Edge.Src, refctx, c) refctx.ScopeMap.appendFieldReferences(0, refctx.Edge.Dst, refctx, c) diff --git a/d2ir/compile_test.go b/d2ir/compile_test.go index 9fc96b228..bf03b14d1 100644 --- a/d2ir/compile_test.go +++ b/d2ir/compile_test.go @@ -107,7 +107,7 @@ func assertQuery(t testing.TB, n d2ir.Node, nfields, nedges int, primary interfa } if len(na) == 0 { - return nil + t.Fatalf("query didn't match anything") } return na[0] diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 366b32b11..d7c65ac7f 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -13,6 +13,7 @@ import ( "oss.terrastruct.com/d2/d2format" "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2parser" + "oss.terrastruct.com/d2/d2target" ) // Most errors returned by a node should be created with d2parser.Errorf @@ -30,7 +31,6 @@ type Node interface { LastRef() Reference LastPrimaryRef() Reference - SecondLastPrimaryRef() Reference LastPrimaryKey() *d2ast.Key } @@ -116,10 +116,6 @@ func (n *Scalar) LastPrimaryRef() Reference { return parentPrimaryRef(n) } func (n *Map) LastPrimaryRef() Reference { return parentPrimaryRef(n) } func (n *Array) LastPrimaryRef() Reference { return parentPrimaryRef(n) } -func (n *Scalar) SecondLastPrimaryRef() Reference { return parentSecondPrimaryRef(n) } -func (n *Map) SecondLastPrimaryRef() Reference { return parentSecondPrimaryRef(n) } -func (n *Array) SecondLastPrimaryRef() Reference { return parentSecondPrimaryRef(n) } - func (n *Scalar) LastPrimaryKey() *d2ast.Key { return parentPrimaryKey(n) } func (n *Map) LastPrimaryKey() *d2ast.Key { return parentPrimaryKey(n) } func (n *Array) LastPrimaryKey() *d2ast.Key { return parentPrimaryKey(n) } @@ -132,6 +128,7 @@ type Reference interface { Context() *RefContext // Result of a glob in Context or from above. DueToGlob() bool + DueToLazyGlob() bool } var _ Reference = &FieldReference{} @@ -143,6 +140,8 @@ func (r *FieldReference) Context() *RefContext { return r.Context_ } func (r *EdgeReference) Context() *RefContext { return r.Context_ } func (r *FieldReference) DueToGlob() bool { return r.DueToGlob_ } func (r *EdgeReference) DueToGlob() bool { return r.DueToGlob_ } +func (r *FieldReference) DueToLazyGlob() bool { return r.DueToLazyGlob_ } +func (r *EdgeReference) DueToLazyGlob() bool { return r.DueToLazyGlob_ } type Scalar struct { parent Node @@ -318,21 +317,7 @@ func (f *Field) Copy(newParent Node) Node { func (f *Field) LastPrimaryRef() Reference { for i := len(f.References) - 1; i >= 0; i-- { - if f.References[i].Primary() { - return f.References[i] - } - } - return nil -} - -func (f *Field) SecondLastPrimaryRef() Reference { - second := false - for i := len(f.References) - 1; i >= 0; i-- { - if f.References[i].Primary() { - if !second { - second = true - continue - } + if f.References[i].Primary() && !f.References[i].DueToLazyGlob() { return f.References[i] } } @@ -489,22 +474,7 @@ func (e *Edge) Copy(newParent Node) Node { func (e *Edge) LastPrimaryRef() Reference { for i := len(e.References) - 1; i >= 0; i-- { fr := e.References[i] - if fr.Context_.Key.EdgeKey == nil { - return fr - } - } - return nil -} - -func (e *Edge) SecondLastPrimaryRef() Reference { - second := false - for i := len(e.References) - 1; i >= 0; i-- { - fr := e.References[i] - if fr.Context_.Key.EdgeKey == nil { - if !second { - second = true - continue - } + if fr.Context_.Key.EdgeKey == nil && !fr.DueToLazyGlob() { return fr } } @@ -544,8 +514,9 @@ type FieldReference struct { String d2ast.String `json:"string"` KeyPath *d2ast.KeyPath `json:"key_path"` - Context_ *RefContext `json:"context"` - DueToGlob_ bool `json:"from_glob"` + Context_ *RefContext `json:"context"` + DueToGlob_ bool `json:"due_to_glob"` + DueToLazyGlob_ bool `json:"due_to_lazy_glob"` } // Primary returns true if the Value in Context.Key.Value corresponds to the Field @@ -585,8 +556,9 @@ func (fr *FieldReference) AST() d2ast.Node { } type EdgeReference struct { - Context_ *RefContext `json:"context"` - DueToGlob_ bool `json:"from_glob"` + Context_ *RefContext `json:"context"` + DueToGlob_ bool `json:"due_to_glob"` + DueToLazyGlob_ bool `json:"due_to_lazy_glob"` } func (er *EdgeReference) AST() d2ast.Node { @@ -757,13 +729,13 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, create b } else { ks = d2format.Format(d2ast.MakeKeyPath(BoardIDA(f))) } - // For globs with edges, we only ignore duplicate fields if the glob is not at the terminal of the keypath, the glob is on the common key or the glob is on the edge key. if !kp.HasGlob() { if !passthrough { gctx.appliedFields[ks] = struct{}{} } return true } + // For globs with edges, we only ignore duplicate fields if the glob is not at the terminal of the keypath, the glob is on the common key or the glob is on the edge key. And only for globs with edge indexes. lastEl := kp.Path[len(kp.Path)-1] if len(refctx.Key.Edges) == 0 || lastEl.UnquotedString == nil || len(lastEl.UnquotedString.Pattern) == 0 || kp == refctx.Key.Key || kp == refctx.Key.EdgeKey { if _, ok := gctx.appliedFields[ks]; ok { @@ -860,10 +832,11 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, create b // Don't add references for fake common KeyPath from trimCommon in CreateEdge. if refctx != nil { f.References = append(f.References, &FieldReference{ - String: kp.Path[i].Unbox(), - KeyPath: kp, - Context_: refctx, - DueToGlob_: len(c.globRefContextStack) > 0, + String: kp.Path[i].Unbox(), + KeyPath: kp, + Context_: refctx, + DueToGlob_: len(c.globRefContextStack) > 0, + DueToLazyGlob_: c.lazyGlobBeingApplied, }) } @@ -888,17 +861,39 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, create b if !create { return nil } + shape := ParentShape(m) + if _, ok := d2graph.ReservedKeywords[strings.ToLower(head)]; !ok && len(c.globRefContextStack) > 0 { + if shape == d2target.ShapeClass || shape == d2target.ShapeSQLTable { + return nil + } + } f := &Field{ parent: m, Name: head, } + defer func() { + if i < kp.FirstGlob() { + return + } + for _, grefctx := range c.globRefContextStack { + var ks string + if grefctx.Key.HasTripleGlob() { + ks = d2format.Format(d2ast.MakeKeyPath(IDA(f))) + } else { + ks = d2format.Format(d2ast.MakeKeyPath(BoardIDA(f))) + } + gctx2 := c.getGlobContext(grefctx) + gctx2.appliedFields[ks] = struct{}{} + } + }() // Don't add references for fake common KeyPath from trimCommon in CreateEdge. if refctx != nil { f.References = append(f.References, &FieldReference{ - String: kp.Path[i].Unbox(), - KeyPath: kp, - Context_: refctx, - DueToGlob_: len(c.globRefContextStack) > 0, + String: kp.Path[i].Unbox(), + KeyPath: kp, + Context_: refctx, + DueToGlob_: len(c.globRefContextStack) > 0, + DueToLazyGlob_: c.lazyGlobBeingApplied, }) } m.Fields = append(m.Fields, f) @@ -1198,7 +1193,7 @@ func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, gctx *globContext, c * eid2.SrcPath = RelIDA(m, src) eid2.DstPath = RelIDA(m, dst) - e, err := m.createEdge2(eid2, refctx, gctx, src, dst) + e, err := m.createEdge2(eid2, refctx, gctx, c, src, dst) if err != nil { return err } @@ -1210,7 +1205,7 @@ func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, gctx *globContext, c * return nil } -func (m *Map) createEdge2(eid *EdgeID, refctx *RefContext, gctx *globContext, src, dst *Field) (*Edge, error) { +func (m *Map) createEdge2(eid *EdgeID, refctx *RefContext, gctx *globContext, c *compiler, src, dst *Field) (*Edge, error) { if NodeBoardKind(src) != "" { return nil, d2parser.Errorf(refctx.Edge.Src, "cannot create edges between boards") } @@ -1231,7 +1226,9 @@ func (m *Map) createEdge2(eid *EdgeID, refctx *RefContext, gctx *globContext, sr parent: m, ID: eid, References: []*EdgeReference{{ - Context_: refctx, + Context_: refctx, + DueToGlob_: len(c.globRefContextStack) > 0, + DueToLazyGlob_: c.lazyGlobBeingApplied, }}, } @@ -1356,10 +1353,11 @@ func (m *Map) appendFieldReferences(i int, kp *d2ast.KeyPath, refctx *RefContext } f.References = append(f.References, &FieldReference{ - String: sb.Unbox(), - KeyPath: kp, - Context_: refctx, - DueToGlob_: len(c.globRefContextStack) > 0, + String: sb.Unbox(), + KeyPath: kp, + Context_: refctx, + DueToGlob_: len(c.globRefContextStack) > 0, + DueToLazyGlob_: c.lazyGlobBeingApplied, }) if i+1 == len(kp.Path) { return @@ -1439,6 +1437,24 @@ func ParentEdge(n Node) *Edge { } } +func ParentShape(n Node) string { + for { + f, ok := n.(*Field) + if ok { + if f.Map() != nil { + shapef := f.Map().GetField("shape") + if shapef != nil && shapef.Primary() != nil { + return shapef.Primary().Value.ScalarString() + } + } + } + n = n.Parent() + if n == nil { + return "" + } + } +} + func countUnderscores(p []string) int { for i, el := range p { if el != "_" { @@ -1493,18 +1509,6 @@ func parentPrimaryRef(n Node) Reference { return nil } -func parentSecondPrimaryRef(n Node) Reference { - f := ParentField(n) - if f != nil { - return f.SecondLastPrimaryRef() - } - e := ParentEdge(n) - if e != nil { - return e.SecondLastPrimaryRef() - } - return nil -} - func parentPrimaryKey(n Node) *d2ast.Key { f := ParentField(n) if f != nil { diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go index 6fd1dc9b2..b2fbb4bab 100644 --- a/d2ir/pattern_test.go +++ b/d2ir/pattern_test.go @@ -128,7 +128,7 @@ an* -> an*`) assert.Success(t, err) assertQuery(t, m, 2, 2, nil, "") assertQuery(t, m, 0, 0, nil, "(animate -> animal)[0]") - assertQuery(t, m, 0, 0, nil, "(animal -> animal)[0]") + assertQuery(t, m, 0, 0, nil, "(animal -> animate)[0]") }, }, { @@ -154,7 +154,7 @@ sh*.an* -> sh*.an*`) assertQuery(t, m, 3, 2, nil, "") assertQuery(t, m, 2, 2, nil, "shared") assertQuery(t, m, 0, 0, nil, "shared.(animate -> animal)[0]") - assertQuery(t, m, 0, 0, nil, "shared.(animal -> animal)[0]") + assertQuery(t, m, 0, 0, nil, "shared.(animal -> animate)[0]") }, }, { @@ -515,6 +515,42 @@ x -> y assertQuery(t, m, 0, 0, 0.1, "(x -> y)[1].style.opacity") }, }, + { + name: "alixander-review/7", + run: func(t testing.TB) { + m, err := compile(t, ` +*: { + style.fill: red +} +**: { + style.fill: red +} + +table: { + style.fill: blue + shape: sql_table + a: b +} +`) + assert.Success(t, err) + assertQuery(t, m, 7, 0, nil, "") + assertQuery(t, m, 0, 0, "blue", "table.style.fill") + }, + }, + { + name: "alixander-review/8", + run: func(t testing.TB) { + m, err := compile(t, ` +(a -> *)[*].style.stroke: red +(* -> *)[*].style.stroke: red + +b -> c +`) + assert.Success(t, err) + assertQuery(t, m, 4, 1, nil, "") + assertQuery(t, m, 0, 0, "red", "(b -> c)[0].style.stroke") + }, + }, { name: "override/1", run: func(t testing.TB) { @@ -606,6 +642,51 @@ a -> b assertQuery(t, m, 0, 0, "hey", "(a -> b)[0].label") }, }, + { + name: "table-class-exception", + run: func(t testing.TB) { + m, err := compile(t, ` +***: { + c: d +} + +***: { + style.fill: red +} + +table: { + shape: sql_table + a: b +} + +class: { + shape: class + a: b +} +`) + assert.Success(t, err) + assertQuery(t, m, 10, 0, nil, "") + }, + }, + { + name: "prevent-chain-recursion", + run: func(t testing.TB) { + m, err := compile(t, ` +***: { + c: d +} + +***: { + style.fill: red +} + +one +two +`) + assert.Success(t, err) + assertQuery(t, m, 12, 0, nil, "") + }, + }, } runa(t, tca) diff --git a/d2ir/query.go b/d2ir/query.go index 92031a5f6..49a4ae2e8 100644 --- a/d2ir/query.go +++ b/d2ir/query.go @@ -14,17 +14,22 @@ func (m *Map) QueryAll(idStr string) (na []Node, _ error) { } if k.Key != nil { - f := m.GetField(k.Key.IDA()...) - if f == nil { + fa, err := m.EnsureField(k.Key, nil, false, nil) + if err != nil { + return nil, err + } + if len(fa) == 0 { return nil, nil } - if len(k.Edges) == 0 { - na = append(na, f) - return na, nil - } - m = f.Map() - if m == nil { - return nil, nil + for _, f := range fa { + if len(k.Edges) == 0 { + na = append(na, f) + return na, nil + } + m = f.Map() + if m == nil { + return nil, nil + } } } diff --git a/d2oracle/edit.go b/d2oracle/edit.go index 4a8d4813d..e953a731d 100644 --- a/d2oracle/edit.go +++ b/d2oracle/edit.go @@ -493,7 +493,7 @@ func _set(g *d2graph.Graph, baseAST *d2ast.Map, key string, tag, value *string) noVal2 := &tmp2 noVal1.Value = d2ast.ValueBox{} noVal2.Value = d2ast.ValueBox{} - if noVal1.Equals(noVal2) { + if noVal1.D2OracleEquals(noVal2) { ref.MapKey.Value = mk.Value return nil } @@ -776,7 +776,7 @@ func _set(g *d2graph.Graph, baseAST *d2ast.Map, key string, tag, value *string) func appendUniqueMapKey(m *d2ast.Map, mk *d2ast.Key) { for _, n := range m.Nodes { - if n.MapKey != nil && n.MapKey.Equals(mk) { + if n.MapKey != nil && n.MapKey.D2OracleEquals(mk) { return } } @@ -1471,7 +1471,7 @@ func ensureNode(g *d2graph.Graph, excludedEdges []*d2ast.Edge, scopeObj *d2graph } for _, n := range scope.Nodes { - if n.MapKey != nil && n.MapKey.Equals(mk) { + if n.MapKey != nil && n.MapKey.D2OracleEquals(mk) { return } } @@ -1922,7 +1922,7 @@ func move(g *d2graph.Graph, boardPath []string, key, newKey string, includeDesce ref.Key.Path = ref.Key.Path[ref.KeyPathIndex:] exists := false for _, n := range toScope.Nodes { - if n.MapKey != nil && n.MapKey != ref.MapKey && n.MapKey.Equals(ref.MapKey) { + if n.MapKey != nil && n.MapKey != ref.MapKey && n.MapKey.D2OracleEquals(ref.MapKey) { exists = true } } diff --git a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.exp.json b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.exp.json new file mode 100644 index 000000000..2052eed4c --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.exp.json @@ -0,0 +1,458 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,0:0:0-18:0:117", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,1:0:1-3:1:16", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,1:0:1-1:3:4", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,1:0:1-1:3:4", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,1:5:6-3:1:16", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,2:2:10-2:6:14", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,2:2:10-2:3:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,2:2:10-2:3:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,2:5:13-2:6:14", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,5:0:18-7:1:44", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,5:0:18-5:3:21", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,5:0:18-5:3:21", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,5:5:23-7:1:44", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,6:2:27-6:17:42", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,9:0:46-12:1:82", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,9:0:46-9:5:51", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,9:0:46-9:5:51", + "value": [ + { + "string": "table", + "raw_string": "table" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,9:7:53-12:1:82", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,10:2:57-10:18:73", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,10:2:57-10:7:62", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,10:2:57-10:7:62", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,10:9:64-10:18:73", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,11:2:76-11:6:80", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,11:2:76-11:3:77", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,11:2:76-11:3:77", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,11:5:79-11:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,14:0:84-17:1:116", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,14:0:84-14:5:89", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,14:0:84-14:5:89", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,14:7:91-17:1:116", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,15:2:95-15:14:107", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,15:2:95-15:7:100", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,15:2:95-15:7:100", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,15:9:102-15:14:107", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,16:2:110-16:6:114", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,16:2:110-16:3:111", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,16:2:110-16:3:111", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,16:5:113-16:6:114", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "table", + "id_val": "table", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,9:0:46-9:5:51", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.d2,9:0:46-9:5:51", + "value": [ + { + "string": "table", + "raw_string": "table" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "sql_table": { + "columns": [ + { + "name": { + "label": "a", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "type": { + "label": "b", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + } + ] + }, + "attributes": { + "label": { + "value": "table" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "near_key": null, + "shape": { + "value": "sql_table" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2ir/TestCompile/classes/basic.exp.json b/testdata/d2ir/TestCompile/classes/basic.exp.json index ee64de956..86e555a27 100644 --- a/testdata/d2ir/TestCompile/classes/basic.exp.json +++ b/testdata/d2ir/TestCompile/classes/basic.exp.json @@ -53,7 +53,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -165,7 +166,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -255,7 +257,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -363,7 +366,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -500,7 +504,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/classes/inherited.exp.json b/testdata/d2ir/TestCompile/classes/inherited.exp.json index 2d6741f30..1cce8f672 100644 --- a/testdata/d2ir/TestCompile/classes/inherited.exp.json +++ b/testdata/d2ir/TestCompile/classes/inherited.exp.json @@ -108,7 +108,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -198,7 +199,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -306,7 +308,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -443,7 +446,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -563,7 +567,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -653,7 +658,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -761,7 +767,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -898,7 +905,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1018,7 +1026,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1108,7 +1117,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1216,7 +1226,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1324,7 +1335,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1414,7 +1426,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1522,7 +1535,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1659,7 +1673,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1790,7 +1805,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1847,7 +1863,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2036,7 +2053,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -2152,7 +2170,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2242,7 +2261,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2350,7 +2370,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -2458,7 +2479,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2548,7 +2570,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2656,7 +2679,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2793,7 +2817,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2924,7 +2949,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -2981,7 +3007,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -3038,7 +3065,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -3125,7 +3153,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -3241,7 +3270,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -3331,7 +3361,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -3439,7 +3470,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -3547,7 +3579,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -3631,7 +3664,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -3721,7 +3755,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -3805,7 +3840,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -3913,7 +3949,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -4015,7 +4052,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -4152,7 +4190,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -4283,7 +4322,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -4414,7 +4454,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -4471,7 +4512,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -4528,7 +4570,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -4580,7 +4623,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -4769,7 +4813,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -4885,7 +4930,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -4975,7 +5021,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -5083,7 +5130,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -5191,7 +5239,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -5275,7 +5324,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -5365,7 +5415,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -5449,7 +5500,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -5557,7 +5609,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -5659,7 +5712,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -5796,7 +5850,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -5927,7 +5982,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -6058,7 +6114,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -6115,7 +6172,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -6167,7 +6225,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -6224,7 +6283,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -6276,7 +6336,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -6341,7 +6402,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -6453,7 +6515,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -6543,7 +6606,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -6651,7 +6715,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -6759,7 +6824,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -6843,7 +6909,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -6933,7 +7000,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -7017,7 +7085,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -7125,7 +7194,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -7227,7 +7297,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -7364,7 +7435,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -7495,7 +7567,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -7626,7 +7699,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -7713,7 +7787,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -7829,7 +7904,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -7997,7 +8073,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -8554,7 +8631,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -9140,7 +9218,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -9755,7 +9834,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json index 0cc411490..a3cb58791 100644 --- a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json +++ b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json @@ -108,7 +108,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -198,7 +199,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -306,7 +308,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -443,7 +446,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -563,7 +567,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -707,7 +712,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -797,7 +803,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -925,7 +932,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1033,7 +1041,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1161,7 +1170,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1298,7 +1308,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1428,7 +1439,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1587,7 +1599,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/classes/merge.exp.json b/testdata/d2ir/TestCompile/classes/merge.exp.json index af3cf33f5..b192ca8a3 100644 --- a/testdata/d2ir/TestCompile/classes/merge.exp.json +++ b/testdata/d2ir/TestCompile/classes/merge.exp.json @@ -108,7 +108,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -198,7 +199,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -268,7 +270,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -405,7 +408,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -571,7 +575,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -691,7 +696,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -781,7 +787,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -851,7 +858,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -909,7 +917,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1046,7 +1055,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1133,7 +1143,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1299,7 +1310,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1450,7 +1462,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1630,7 +1643,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/classes/nested.exp.json b/testdata/d2ir/TestCompile/classes/nested.exp.json index dde7b34e0..007eecf1b 100644 --- a/testdata/d2ir/TestCompile/classes/nested.exp.json +++ b/testdata/d2ir/TestCompile/classes/nested.exp.json @@ -108,7 +108,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -198,7 +199,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -306,7 +308,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -443,7 +446,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -516,7 +520,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -628,7 +633,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -718,7 +724,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -826,7 +833,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -963,7 +971,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1050,7 +1059,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1166,7 +1176,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1278,7 +1289,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1368,7 +1380,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1476,7 +1489,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1613,7 +1627,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1758,7 +1773,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1932,7 +1948,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/edges/chain.exp.json b/testdata/d2ir/TestCompile/edges/chain.exp.json index b3aec64de..0500f467b 100644 --- a/testdata/d2ir/TestCompile/edges/chain.exp.json +++ b/testdata/d2ir/TestCompile/edges/chain.exp.json @@ -186,7 +186,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -376,7 +377,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -561,7 +563,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -751,7 +754,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -936,7 +940,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1126,7 +1131,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1304,7 +1310,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1480,7 +1487,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1656,7 +1664,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/edges/nested.exp.json b/testdata/d2ir/TestCompile/edges/nested.exp.json index dd69ea403..5be013c80 100644 --- a/testdata/d2ir/TestCompile/edges/nested.exp.json +++ b/testdata/d2ir/TestCompile/edges/nested.exp.json @@ -171,7 +171,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -343,7 +344,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -518,7 +520,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -690,7 +693,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -840,7 +844,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/edges/root.exp.json b/testdata/d2ir/TestCompile/edges/root.exp.json index 0b20726a8..2c986a481 100644 --- a/testdata/d2ir/TestCompile/edges/root.exp.json +++ b/testdata/d2ir/TestCompile/edges/root.exp.json @@ -112,7 +112,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -228,7 +229,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -332,7 +334,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/edges/underscore.exp.json b/testdata/d2ir/TestCompile/edges/underscore.exp.json index 5f506aea1..bdb82ef60 100644 --- a/testdata/d2ir/TestCompile/edges/underscore.exp.json +++ b/testdata/d2ir/TestCompile/edges/underscore.exp.json @@ -138,7 +138,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -259,7 +260,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -408,7 +410,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -535,7 +538,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/fields/array.exp.json b/testdata/d2ir/TestCompile/fields/array.exp.json index 4587fa35e..d648144d6 100644 --- a/testdata/d2ir/TestCompile/fields/array.exp.json +++ b/testdata/d2ir/TestCompile/fields/array.exp.json @@ -119,7 +119,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/fields/label.exp.json b/testdata/d2ir/TestCompile/fields/label.exp.json index a4503c572..5c7aa801d 100644 --- a/testdata/d2ir/TestCompile/fields/label.exp.json +++ b/testdata/d2ir/TestCompile/fields/label.exp.json @@ -74,7 +74,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/fields/nested.exp.json b/testdata/d2ir/TestCompile/fields/nested.exp.json index 44377bd15..3dfc1f981 100644 --- a/testdata/d2ir/TestCompile/fields/nested.exp.json +++ b/testdata/d2ir/TestCompile/fields/nested.exp.json @@ -100,7 +100,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -190,7 +191,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/fields/primary/nested.exp.json b/testdata/d2ir/TestCompile/fields/primary/nested.exp.json index 2397dbeac..9388dc418 100644 --- a/testdata/d2ir/TestCompile/fields/primary/nested.exp.json +++ b/testdata/d2ir/TestCompile/fields/primary/nested.exp.json @@ -72,7 +72,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -191,7 +192,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -310,7 +312,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/fields/primary/root.exp.json b/testdata/d2ir/TestCompile/fields/primary/root.exp.json index 5f418d72b..13a6aa1ab 100644 --- a/testdata/d2ir/TestCompile/fields/primary/root.exp.json +++ b/testdata/d2ir/TestCompile/fields/primary/root.exp.json @@ -68,7 +68,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -165,7 +166,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/fields/root.exp.json b/testdata/d2ir/TestCompile/fields/root.exp.json index 94688803b..619b7fcc4 100644 --- a/testdata/d2ir/TestCompile/fields/root.exp.json +++ b/testdata/d2ir/TestCompile/fields/root.exp.json @@ -53,7 +53,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/filters/array.exp.json b/testdata/d2ir/TestCompile/filters/array.exp.json index 68be20b30..1e379fa23 100644 --- a/testdata/d2ir/TestCompile/filters/array.exp.json +++ b/testdata/d2ir/TestCompile/filters/array.exp.json @@ -111,7 +111,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -174,7 +175,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -268,7 +270,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -353,7 +356,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -468,7 +472,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -583,7 +588,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -646,7 +652,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -761,7 +768,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -876,7 +884,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -939,7 +948,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1033,7 +1043,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -1118,7 +1129,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -1233,7 +1245,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/filters/base.exp.json b/testdata/d2ir/TestCompile/filters/base.exp.json index 3179710ed..a8e519a36 100644 --- a/testdata/d2ir/TestCompile/filters/base.exp.json +++ b/testdata/d2ir/TestCompile/filters/base.exp.json @@ -78,7 +78,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -141,7 +142,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -238,7 +240,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -320,7 +323,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -383,7 +387,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -461,7 +466,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -558,7 +564,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/filters/edge.exp.json b/testdata/d2ir/TestCompile/filters/edge.exp.json index 2fd9f86f2..836b33ce8 100644 --- a/testdata/d2ir/TestCompile/filters/edge.exp.json +++ b/testdata/d2ir/TestCompile/filters/edge.exp.json @@ -206,7 +206,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -317,7 +318,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -568,7 +570,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -819,7 +822,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1070,7 +1074,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1321,7 +1326,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1531,7 +1537,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1642,7 +1649,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1763,7 +1771,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1848,7 +1857,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1933,7 +1943,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -2023,7 +2034,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2108,7 +2120,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2193,7 +2206,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -2297,7 +2311,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2382,7 +2397,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2467,7 +2483,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -2557,7 +2574,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2642,7 +2660,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2727,7 +2746,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -2805,7 +2825,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2867,7 +2888,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -3053,7 +3075,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -3279,7 +3302,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false }, { "context": { @@ -3505,7 +3529,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -3611,7 +3636,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -3837,7 +3863,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false }, { "context": { @@ -4063,7 +4090,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/filters/label-filter.exp.json b/testdata/d2ir/TestCompile/filters/label-filter.exp.json deleted file mode 100644 index 5c21b7858..000000000 --- a/testdata/d2ir/TestCompile/filters/label-filter.exp.json +++ /dev/null @@ -1,4654 +0,0 @@ -{ - "fields": [ - { - "name": "x", - "composite": { - "fields": [ - { - "name": "style", - "composite": { - "fields": [ - { - "name": "opacity", - "primary": { - "value": { - "range": "TestCompile/filters/label-filter.d2,9:17:80-9:18:81", - "raw": "1", - "value": "1" - } - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,9:8:71-9:15:78", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,9:2:65-9:15:78", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,9:2:65-9:7:70", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,9:8:71-9:15:78", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,9:2:65-9:18:81", - "key": { - "range": "TestCompile/filters/label-filter.d2,9:2:65-9:15:78", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,9:2:65-9:7:70", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,9:8:71-9:15:78", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,9:17:80-9:18:81", - "raw": "1", - "value": "1" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,9:2:65-9:7:70", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,9:2:65-9:15:78", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,9:2:65-9:7:70", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,9:8:71-9:15:78", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,9:2:65-9:18:81", - "key": { - "range": "TestCompile/filters/label-filter.d2,9:2:65-9:15:78", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,9:2:65-9:7:70", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,9:8:71-9:15:78", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,9:17:80-9:18:81", - "raw": "1", - "value": "1" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,1:0:1-1:1:2", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,1:0:1-1:1:2", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,1:0:1-1:1:2", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,1:0:1-1:1:2", - "key": { - "range": "TestCompile/filters/label-filter.d2,1:0:1-1:1:2", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,1:0:1-1:1:2", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - "from_glob": false - } - ] - }, - { - "name": "y", - "composite": { - "fields": [ - { - "name": "style", - "composite": { - "fields": [ - { - "name": "opacity", - "primary": { - "value": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,2:0:3-2:1:4", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,2:0:3-2:1:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,2:0:3-2:1:4", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,2:0:3-2:1:4", - "key": { - "range": "TestCompile/filters/label-filter.d2,2:0:3-2:1:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,2:0:3-2:1:4", - "value": [ - { - "string": "y", - "raw_string": "y" - } - ] - } - } - ] - }, - "primary": {}, - "value": {} - } - }, - "from_glob": false - } - ] - }, - { - "name": "p", - "primary": { - "value": { - "range": "TestCompile/filters/label-filter.d2,3:3:8-3:4:9", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - }, - "composite": { - "fields": [ - { - "name": "style", - "composite": { - "fields": [ - { - "name": "opacity", - "primary": { - "value": { - "range": "TestCompile/filters/label-filter.d2,13:17:118-13:20:121", - "raw": "0.5", - "value": "1/2" - } - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,13:8:109-13:15:116", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,13:2:103-13:15:116", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,13:2:103-13:7:108", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,13:8:109-13:15:116", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,13:2:103-13:20:121", - "key": { - "range": "TestCompile/filters/label-filter.d2,13:2:103-13:15:116", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,13:2:103-13:7:108", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,13:8:109-13:15:116", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,13:17:118-13:20:121", - "raw": "0.5", - "value": "1/2" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,13:2:103-13:7:108", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,13:2:103-13:15:116", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,13:2:103-13:7:108", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,13:8:109-13:15:116", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,13:2:103-13:20:121", - "key": { - "range": "TestCompile/filters/label-filter.d2,13:2:103-13:15:116", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,13:2:103-13:7:108", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,13:8:109-13:15:116", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,13:17:118-13:20:121", - "raw": "0.5", - "value": "1/2" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,3:0:5-3:1:6", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,3:0:5-3:1:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,3:0:5-3:1:6", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,3:0:5-3:4:9", - "key": { - "range": "TestCompile/filters/label-filter.d2,3:0:5-3:1:6", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,3:0:5-3:1:6", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,3:3:8-3:4:9", - "value": [ - { - "string": "p", - "raw_string": "p" - } - ] - } - } - } - }, - "from_glob": false - } - ] - }, - { - "name": "a", - "composite": { - "fields": [ - { - "name": "style", - "composite": { - "fields": [ - { - "name": "opacity", - "primary": { - "value": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:6:16", - "src": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:13:23", - "edges": [ - { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:6:16", - "src": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:8:18-4:13:23", - "value": [ - { - "string": "delta", - "raw_string": "delta" - } - ] - } - } - } - }, - "from_glob": false - } - ] - }, - { - "name": "z", - "composite": { - "fields": [ - { - "name": "style", - "composite": { - "fields": [ - { - "name": "opacity", - "primary": { - "value": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:6:16", - "src": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:13:23", - "edges": [ - { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:6:16", - "src": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:8:18-4:13:23", - "value": [ - { - "string": "delta", - "raw_string": "delta" - } - ] - } - } - } - }, - "from_glob": false - } - ] - } - ], - "edges": [ - { - "edge_id": { - "src_path": [ - "a" - ], - "src_arrow": false, - "dst_path": [ - "z" - ], - "dst_arrow": true, - "index": 0, - "glob": false - }, - "primary": { - "value": { - "range": "TestCompile/filters/label-filter.d2,4:8:18-4:13:23", - "value": [ - { - "string": "delta", - "raw_string": "delta" - } - ] - } - }, - "map": { - "fields": [ - { - "name": "target-arrowhead", - "composite": { - "fields": [ - { - "name": "shape", - "primary": { - "value": { - "range": "TestCompile/filters/label-filter.d2,17:25:179-17:32:186", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,17:18:172-17:23:177", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,17:1:155-17:23:177", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,17:1:155-17:17:171", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,17:18:172-17:23:177", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,17:1:155-17:32:186", - "key": { - "range": "TestCompile/filters/label-filter.d2,17:1:155-17:23:177", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,17:1:155-17:17:171", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,17:18:172-17:23:177", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,17:25:179-17:32:186", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - }, - "from_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/filters/label-filter.d2,17:1:155-17:17:171", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter.d2,17:1:155-17:23:177", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,17:1:155-17:17:171", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,17:18:172-17:23:177", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter.d2,17:1:155-17:32:186", - "key": { - "range": "TestCompile/filters/label-filter.d2,17:1:155-17:23:177", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,17:1:155-17:17:171", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,17:18:172-17:23:177", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,17:25:179-17:32:186", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - }, - "from_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "context": { - "edge": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:6:16", - "src": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:13:23", - "edges": [ - { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:6:16", - "src": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:0:10-4:1:11", - "value": [ - { - "string": "a", - "raw_string": "a" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:5:15-4:6:16", - "value": [ - { - "string": "z", - "raw_string": "z" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,4:8:18-4:13:23", - "value": [ - { - "string": "delta", - "raw_string": "delta" - } - ] - } - } - } - }, - "from_glob": false - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/label-filter.d2,15:1:125-15:7:131", - "src": { - "range": "TestCompile/filters/label-filter.d2,15:1:125-15:2:126", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,15:1:125-15:2:126", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter.d2,15:6:130-15:7:131", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,15:6:130-15:7:131", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter.d2,15:0:124-18:1:188", - "edges": [ - { - "range": "TestCompile/filters/label-filter.d2,15:1:125-15:7:131", - "src": { - "range": "TestCompile/filters/label-filter.d2,15:1:125-15:2:126", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,15:1:125-15:2:126", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter.d2,15:6:130-15:7:131", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,15:6:130-15:7:131", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/label-filter.d2,15:8:132-15:11:135", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/label-filter.d2,15:13:137-18:1:188", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/label-filter.d2,16:1:140-16:14:153", - "ampersand": true, - "key": { - "range": "TestCompile/filters/label-filter.d2,16:2:141-16:7:146", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,16:2:141-16:7:146", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,16:9:148-16:14:153", - "value": [ - { - "string": "delta", - "raw_string": "delta" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/label-filter.d2,17:1:155-17:32:186", - "key": { - "range": "TestCompile/filters/label-filter.d2,17:1:155-17:23:177", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,17:1:155-17:17:171", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,17:18:172-17:23:177", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter.d2,17:25:179-17:32:186", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "from_glob": false - } - ] - } - ] -} diff --git a/testdata/d2ir/TestCompile/filters/label-filter/1.exp.json b/testdata/d2ir/TestCompile/filters/label-filter/1.exp.json index 3004224a1..a6cb88ffd 100644 --- a/testdata/d2ir/TestCompile/filters/label-filter/1.exp.json +++ b/testdata/d2ir/TestCompile/filters/label-filter/1.exp.json @@ -124,7 +124,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -204,223 +205,8 @@ } } }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -534,7 +320,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -614,7 +401,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -722,7 +510,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -830,7 +619,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -888,7 +678,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1016,223 +807,8 @@ } } }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -1346,7 +922,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1454,7 +1031,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1562,7 +1140,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1620,7 +1199,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1759,7 +1339,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1839,223 +1420,8 @@ } } }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -2169,7 +1535,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2249,7 +1616,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2357,7 +1725,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -2465,7 +1834,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2533,7 +1903,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -2661,223 +2032,8 @@ } } }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -2991,7 +2147,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -3099,7 +2256,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -3207,7 +2365,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -3334,7 +2493,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -3462,223 +2622,8 @@ } } }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:20:45", - "key": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:15:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:0:25-6:1:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", - "raw": "0.1", - "value": "1/10" - } - } - } - }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -3792,7 +2737,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -3900,7 +2846,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -4008,7 +2955,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -4135,7 +3083,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -4267,7 +3216,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -4357,7 +3307,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -4459,7 +3410,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -4646,7 +3598,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json b/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json index facfd1f1f..6f7b9c956 100644 --- a/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json +++ b/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json @@ -122,7 +122,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -233,7 +234,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -359,7 +361,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -470,7 +473,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -686,7 +690,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -766,7 +771,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -938,7 +944,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1018,7 +1025,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1196,7 +1204,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1276,7 +1285,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1448,7 +1458,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1528,7 +1539,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1630,7 +1642,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -1766,7 +1779,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true }, { "context": { @@ -1949,7 +1963,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true }, { "context": { @@ -2085,7 +2100,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true }, { "context": { @@ -2268,7 +2284,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -2471,7 +2488,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2649,7 +2667,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2741,7 +2760,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -2877,7 +2897,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true }, { "context": { @@ -3060,7 +3081,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/filters/order.exp.json b/testdata/d2ir/TestCompile/filters/order.exp.json index 78ee0cbd7..79950f25e 100644 --- a/testdata/d2ir/TestCompile/filters/order.exp.json +++ b/testdata/d2ir/TestCompile/filters/order.exp.json @@ -78,7 +78,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -141,7 +142,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -238,7 +240,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -320,7 +323,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -383,7 +387,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -461,7 +466,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -558,7 +564,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/boards.exp.json b/testdata/d2ir/TestCompile/imports/boards.exp.json index ea018af8a..a9de84ecf 100644 --- a/testdata/d2ir/TestCompile/imports/boards.exp.json +++ b/testdata/d2ir/TestCompile/imports/boards.exp.json @@ -99,7 +99,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -189,7 +190,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -300,7 +302,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -390,7 +393,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -455,7 +459,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -532,7 +537,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -638,7 +644,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -715,7 +722,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -821,7 +829,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/nested/array.exp.json b/testdata/d2ir/TestCompile/imports/nested/array.exp.json index 343595700..c35c86882 100644 --- a/testdata/d2ir/TestCompile/imports/nested/array.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/array.exp.json @@ -98,7 +98,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/nested/map.exp.json b/testdata/d2ir/TestCompile/imports/nested/map.exp.json index 6834aea20..2377f1914 100644 --- a/testdata/d2ir/TestCompile/imports/nested/map.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/map.exp.json @@ -78,7 +78,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -156,7 +157,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -244,7 +246,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json index 7f245892d..7fb4ed533 100644 --- a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json @@ -94,7 +94,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/nested/spread.exp.json b/testdata/d2ir/TestCompile/imports/nested/spread.exp.json index 63803460c..6250a7662 100644 --- a/testdata/d2ir/TestCompile/imports/nested/spread.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/spread.exp.json @@ -53,7 +53,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -110,7 +111,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json b/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json index 6ec12f9df..d712911fe 100644 --- a/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json @@ -68,7 +68,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -125,7 +126,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -220,7 +222,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/spread.exp.json b/testdata/d2ir/TestCompile/imports/spread.exp.json index e8d2264bb..db398ce59 100644 --- a/testdata/d2ir/TestCompile/imports/spread.exp.json +++ b/testdata/d2ir/TestCompile/imports/spread.exp.json @@ -74,7 +74,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json b/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json index f0770efbc..0218343fa 100644 --- a/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json +++ b/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json @@ -53,7 +53,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -118,7 +119,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -175,7 +177,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -252,7 +255,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -313,7 +317,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -370,7 +375,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -447,7 +453,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -595,7 +602,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -660,7 +668,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -717,7 +726,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -794,7 +804,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -855,7 +866,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -912,7 +924,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -969,7 +982,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1046,7 +1060,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1194,7 +1209,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/value.exp.json b/testdata/d2ir/TestCompile/imports/value.exp.json index 3ea82ca07..703c3422a 100644 --- a/testdata/d2ir/TestCompile/imports/value.exp.json +++ b/testdata/d2ir/TestCompile/imports/value.exp.json @@ -78,7 +78,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -156,7 +157,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -233,7 +235,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/vars/1.exp.json b/testdata/d2ir/TestCompile/imports/vars/1.exp.json index c7a748bd9..b3f70120c 100644 --- a/testdata/d2ir/TestCompile/imports/vars/1.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/1.exp.json @@ -78,7 +78,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -162,7 +163,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -255,7 +257,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/vars/2.exp.json b/testdata/d2ir/TestCompile/imports/vars/2.exp.json index 31f57b470..c1368afb1 100644 --- a/testdata/d2ir/TestCompile/imports/vars/2.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/2.exp.json @@ -70,7 +70,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -128,7 +129,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -221,7 +223,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -308,7 +311,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -397,7 +401,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/vars/3.exp.json b/testdata/d2ir/TestCompile/imports/vars/3.exp.json index deaa81819..68e6c6c4e 100644 --- a/testdata/d2ir/TestCompile/imports/vars/3.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/3.exp.json @@ -70,7 +70,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -128,7 +129,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -221,7 +223,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -308,7 +311,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -397,7 +401,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } 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 13ff5bce7..668820d84 100644 --- a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json +++ b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json @@ -230,7 +230,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -451,7 +452,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -643,7 +645,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -869,7 +872,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1090,7 +1094,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1317,7 +1322,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1538,7 +1544,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/layers/root.exp.json b/testdata/d2ir/TestCompile/layers/root.exp.json index 9370da3f7..eda3c52a7 100644 --- a/testdata/d2ir/TestCompile/layers/root.exp.json +++ b/testdata/d2ir/TestCompile/layers/root.exp.json @@ -112,7 +112,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -228,7 +229,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -345,7 +347,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -447,7 +450,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -549,7 +553,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -658,7 +663,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -796,7 +802,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -900,7 +907,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/1.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/1.exp.json index 42a332ada..0ee3a9385 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/1.exp.json @@ -144,367 +144,8 @@ } } }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -630,7 +271,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -750,7 +392,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -870,7 +513,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -990,7 +634,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -1100,7 +745,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1194,7 +840,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1288,7 +935,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1382,7 +1030,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1476,7 +1125,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1534,7 +1184,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1674,367 +1325,8 @@ } } }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -2152,7 +1444,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -2259,7 +1552,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -2366,7 +1660,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -2473,7 +1768,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -2580,7 +1876,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -2687,7 +1984,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2813,7 +2111,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -2920,7 +2219,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -3027,7 +2327,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -3134,7 +2435,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -3254,7 +2556,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -3361,7 +2664,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -3481,7 +2785,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -3588,7 +2893,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -3708,7 +3014,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -3815,7 +3122,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -3925,7 +3233,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -4019,7 +3328,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -4113,7 +3423,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -4207,7 +3518,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -4301,7 +3613,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -4388,7 +3701,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -4580,247 +3894,8 @@ } } }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -4986,7 +4061,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -5106,7 +4182,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -5226,7 +4303,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -5284,7 +4362,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -5371,7 +4450,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -5530,7 +4610,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -5646,7 +4727,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -5805,7 +4887,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/2.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/2.exp.json index 5fe90243b..2d6bb3a91 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/2.exp.json @@ -53,7 +53,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -175,7 +176,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -292,7 +294,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -409,7 +412,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -466,7 +470,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -523,7 +528,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -633,7 +639,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -741,7 +748,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -849,7 +857,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json index 1dfd83ec0..dc3fcc423 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json @@ -170,7 +170,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -335,7 +336,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -500,7 +502,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -558,7 +561,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -710,7 +714,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -857,7 +862,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1004,7 +1010,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -1211,7 +1218,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1376,7 +1384,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1541,7 +1550,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1599,7 +1609,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1776,7 +1787,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1942,7 +1954,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2028,7 +2041,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2154,7 +2168,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2270,7 +2285,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2396,7 +2412,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2537,7 +2554,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/4.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/4.exp.json index 8627b7a66..37464f81d 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/4.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/4.exp.json @@ -89,7 +89,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -173,7 +174,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -257,7 +259,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -315,7 +318,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -408,7 +412,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -492,7 +497,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -550,7 +556,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -643,7 +650,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -701,7 +709,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/5.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/5.exp.json index 5c9fd8757..3b8756907 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/5.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/5.exp.json @@ -184,239 +184,8 @@ } } }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -578,7 +347,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -694,7 +464,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -810,7 +581,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -927,7 +699,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1107,239 +880,8 @@ } } }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1501,7 +1043,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1617,7 +1160,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1733,7 +1277,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1850,7 +1395,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1954,7 +1500,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2063,7 +1610,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2218,7 +1766,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2357,7 +1906,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2512,7 +2062,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/6.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/6.exp.json index ae0c32c69..e30ee4789 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/6.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/6.exp.json @@ -122,7 +122,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -233,7 +234,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -359,7 +361,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -470,7 +473,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -686,7 +690,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -858,7 +863,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1036,7 +1042,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1208,7 +1215,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1310,7 +1318,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -1446,7 +1455,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true }, { "context": { @@ -1582,7 +1592,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -1785,7 +1796,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1963,7 +1975,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2055,7 +2068,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -2191,7 +2205,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/7.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/7.exp.json new file mode 100644 index 000000000..5d603a1ad --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/7.exp.json @@ -0,0 +1,1079 @@ +{ + "fields": [ + { + "name": "table", + "composite": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:14:76-9:18:80", + "value": [ + { + "string": "blue", + "raw_string": "blue" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:8:70-9:12:74", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:2:64-9:12:74", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:2:64-9:7:69", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:8:70-9:12:74", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:2:64-9:18:80", + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:2:64-9:12:74", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:2:64-9:7:69", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:8:70-9:12:74", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:14:76-9:18:80", + "value": [ + { + "string": "blue", + "raw_string": "blue" + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, + { + "string": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:8:14-2:12:18", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:2:8-2:12:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:2:8-2:7:13", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:8:14-2:12:18", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:2:8-2:17:23", + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:2:8-2:12:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:2:8-2:7:13", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:8:14-2:12:18", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:14:20-2:17:23", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, + { + "string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:8:40-5:12:44", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:12:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:7:39", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:8:40-5:12:44", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:17:49", + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:12:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:7:39", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:8:40-5:12:44", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:14:46-5:17:49", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:2:64-9:7:69", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:2:64-9:12:74", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:2:64-9:7:69", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:8:70-9:12:74", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:2:64-9:18:80", + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:2:64-9:12:74", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:2:64-9:7:69", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:8:70-9:12:74", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:14:76-9:18:80", + "value": [ + { + "string": "blue", + "raw_string": "blue" + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, + { + "string": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:2:8-2:7:13", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:2:8-2:12:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:2:8-2:7:13", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:8:14-2:12:18", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:2:8-2:17:23", + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:2:8-2:12:18", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:2:8-2:7:13", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:8:14-2:12:18", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:14:20-2:17:23", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, + { + "string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:7:39", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:12:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:7:39", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:8:40-5:12:44", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:17:49", + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:12:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:7:39", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:8:40-5:12:44", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:14:46-5:17:49", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + }, + { + "name": "shape", + "primary": { + "value": { + "range": "TestCompile/patterns/alixander-review/7.d2,10:9:90-10:18:99", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/alixander-review/7.d2,10:2:83-10:7:88", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/7.d2,10:2:83-10:7:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,10:2:83-10:7:88", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,10:2:83-10:18:99", + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,10:2:83-10:7:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,10:2:83-10:7:88", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,10:9:90-10:18:99", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + }, + { + "name": "a", + "primary": { + "value": { + "range": "TestCompile/patterns/alixander-review/7.d2,11:5:105-11:6:106", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + "composite": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:14:46-5:17:49", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:8:40-5:12:44", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:12:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:7:39", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:8:40-5:12:44", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:17:49", + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:12:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:7:39", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:8:40-5:12:44", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:14:46-5:17:49", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:7:39", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:12:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:7:39", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:8:40-5:12:44", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:17:49", + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:12:44", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:7:39", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:8:40-5:12:44", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:14:46-5:17:49", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/alixander-review/7.d2,11:2:102-11:3:103", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/7.d2,11:2:102-11:3:103", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,11:2:102-11:3:103", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,11:2:102-11:6:106", + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,11:2:102-11:3:103", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,11:2:102-11:3:103", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,11:5:105-11:6:106", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/alixander-review/7.d2,8:0:53-8:5:58", + "value": [ + { + "string": "table", + "raw_string": "table" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/7.d2,8:0:53-8:5:58", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,8:0:53-8:5:58", + "value": [ + { + "string": "table", + "raw_string": "table" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,8:0:53-12:1:108", + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,8:0:53-8:5:58", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,8:0:53-8:5:58", + "value": [ + { + "string": "table", + "raw_string": "table" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/alixander-review/7.d2,8:7:60-12:1:108", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:2:64-9:18:80", + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:2:64-9:12:74", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:2:64-9:7:69", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:8:70-9:12:74", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,9:14:76-9:18:80", + "value": [ + { + "string": "blue", + "raw_string": "blue" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/patterns/alixander-review/7.d2,10:2:83-10:18:99", + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,10:2:83-10:7:88", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,10:2:83-10:7:88", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,10:9:90-10:18:99", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/patterns/alixander-review/7.d2,11:2:102-11:6:106", + "key": { + "range": "TestCompile/patterns/alixander-review/7.d2,11:2:102-11:3:103", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,11:2:102-11:3:103", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/7.d2,11:5:105-11:6:106", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/8.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/8.exp.json new file mode 100644 index 000000000..8beb437d0 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/8.exp.json @@ -0,0 +1,869 @@ +{ + "fields": [ + { + "name": "b", + "references": [ + { + "string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:6:68", + "src": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:6:68", + "edges": [ + { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:6:68", + "src": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + }, + { + "name": "c", + "references": [ + { + "string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:6:68", + "src": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:6:68", + "edges": [ + { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:6:68", + "src": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "b" + ], + "src_arrow": false, + "dst_path": [ + "c" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "map": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "stroke", + "primary": { + "value": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:26:57-2:29:60", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:18:49-2:24:55", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:12:43-2:24:55", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:12:43-2:17:48", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:18:49-2:24:55", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:7:38", + "src": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:2:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:2:33", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:6:37-2:7:38", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:6:37-2:7:38", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:0:31-2:29:60", + "edges": [ + { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:7:38", + "src": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:2:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:2:33", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:6:37-2:7:38", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:6:37-2:7:38", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:8:39-2:11:42", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:12:43-2:24:55", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:12:43-2:17:48", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:18:49-2:24:55", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:26:57-2:29:60", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:12:43-2:17:48", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:12:43-2:24:55", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:12:43-2:17:48", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:18:49-2:24:55", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:7:38", + "src": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:2:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:2:33", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:6:37-2:7:38", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:6:37-2:7:38", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:0:31-2:29:60", + "edges": [ + { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:7:38", + "src": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:2:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:2:33", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:6:37-2:7:38", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:6:37-2:7:38", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:8:39-2:11:42", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:12:43-2:24:55", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:12:43-2:17:48", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:18:49-2:24:55", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:26:57-2:29:60", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:6:68", + "src": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:6:68", + "edges": [ + { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:6:68", + "src": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, + { + "context": { + "edge": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:7:38", + "src": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:2:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:2:33", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:6:37-2:7:38", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:6:37-2:7:38", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:0:31-2:29:60", + "edges": [ + { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:7:38", + "src": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:2:33", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:1:32-2:2:33", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:6:37-2:7:38", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:6:37-2:7:38", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:8:39-2:11:42", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:12:43-2:24:55", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:12:43-2:17:48", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:18:49-2:24:55", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:26:57-2:29:60", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ] +} diff --git a/testdata/d2ir/TestCompile/patterns/case/1.exp.json b/testdata/d2ir/TestCompile/patterns/case/1.exp.json index 45339a73c..5d27f6319 100644 --- a/testdata/d2ir/TestCompile/patterns/case/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/case/1.exp.json @@ -74,7 +74,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -152,7 +153,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/case/2.exp.json b/testdata/d2ir/TestCompile/patterns/case/2.exp.json index 345e90886..c0331792b 100644 --- a/testdata/d2ir/TestCompile/patterns/case/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/case/2.exp.json @@ -64,7 +64,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -132,7 +133,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json index 33284cbbf..5c880b983 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json @@ -140,7 +140,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -262,7 +263,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -342,7 +344,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -482,7 +485,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -604,7 +608,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -684,7 +689,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -820,7 +826,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -942,7 +949,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -1022,7 +1030,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1096,7 +1105,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/defaults.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/defaults.exp.json index 8a133ee07..0f421bb14 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/defaults.exp.json @@ -78,7 +78,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -136,7 +137,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -218,7 +220,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -276,7 +279,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -358,7 +362,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -416,7 +421,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -498,7 +504,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -556,7 +563,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -646,7 +654,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -704,7 +713,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -786,7 +796,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -844,7 +855,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -926,7 +938,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -984,7 +997,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1066,7 +1080,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1124,7 +1139,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1206,7 +1222,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1264,7 +1281,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1373,7 +1391,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1513,7 +1532,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1622,7 +1642,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1762,7 +1783,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -1827,7 +1849,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1936,7 +1959,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2045,7 +2069,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } 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 537f1bd20..280e2698a 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 @@ -57,7 +57,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -118,7 +119,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -175,7 +177,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -285,7 +288,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -447,7 +451,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -606,7 +611,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -754,7 +760,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -891,7 +898,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1027,7 +1035,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1163,7 +1172,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } 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 fb629ad1a..1aec90b3b 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json @@ -57,7 +57,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -114,7 +115,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -224,7 +226,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -367,7 +370,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -428,7 +432,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -515,7 +520,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -674,7 +680,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -811,7 +818,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } 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 0e397a6c2..694a4faf2 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json @@ -164,7 +164,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -222,7 +223,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -370,7 +372,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -507,7 +510,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json b/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json index 40f8930af..03bd3132f 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json @@ -112,7 +112,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -223,7 +224,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -334,7 +336,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -487,7 +490,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -640,7 +644,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -793,7 +798,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -946,7 +952,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1099,7 +1106,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1252,7 +1260,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1405,7 +1414,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1558,7 +1568,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1711,7 +1722,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1827,7 +1839,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1938,7 +1951,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2049,7 +2063,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2202,7 +2217,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2355,7 +2371,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2508,7 +2525,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2661,7 +2679,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2814,7 +2833,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2967,7 +2987,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -3120,7 +3141,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -3273,7 +3295,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -3426,7 +3449,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -3627,7 +3651,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -3791,7 +3816,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -3955,7 +3981,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -4125,7 +4152,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -4289,7 +4317,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -4453,7 +4482,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -4545,7 +4575,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -4673,7 +4704,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false }, { "context": { @@ -4801,7 +4833,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false }, { "context": { @@ -4929,7 +4962,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -5128,7 +5162,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -5292,7 +5327,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -5456,7 +5492,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -5626,7 +5663,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -5790,7 +5828,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -5954,7 +5993,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -6046,7 +6086,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -6174,7 +6215,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false }, { "context": { @@ -6302,7 +6344,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false }, { "context": { @@ -6430,7 +6473,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -6629,7 +6673,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -6793,7 +6838,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -6957,7 +7003,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -7127,7 +7174,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -7291,7 +7339,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -7455,7 +7504,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -7547,7 +7597,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -7675,7 +7726,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false }, { "context": { @@ -7803,7 +7855,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false }, { "context": { @@ -7931,7 +7984,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json b/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json index 2710e14e0..687051252 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json @@ -53,7 +53,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -110,7 +111,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -167,7 +169,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -224,7 +227,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -346,7 +350,8 @@ "value": {} } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -456,7 +461,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -564,7 +570,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -672,7 +679,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -780,7 +788,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json index f8934f6a8..e961e1ac3 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json @@ -53,7 +53,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -110,7 +111,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -230,7 +232,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -348,7 +351,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json index 83eb78b88..02950f5d0 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json @@ -79,7 +79,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -158,7 +159,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -298,7 +300,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -436,7 +439,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -515,7 +519,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -589,7 +594,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json index 511b7ae9c..8d19eaaa5 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json @@ -79,7 +79,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -158,7 +159,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -338,7 +340,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -516,7 +519,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -595,7 +599,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -669,7 +674,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/escaped.exp.json b/testdata/d2ir/TestCompile/patterns/escaped.exp.json index a616540f4..8048e9a5a 100644 --- a/testdata/d2ir/TestCompile/patterns/escaped.exp.json +++ b/testdata/d2ir/TestCompile/patterns/escaped.exp.json @@ -74,7 +74,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -152,7 +153,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -230,7 +232,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } 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 2714b1b6b..1d9dceda1 100644 --- a/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json +++ b/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json @@ -112,7 +112,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -223,7 +224,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -334,7 +336,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -450,7 +453,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -561,7 +565,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -672,7 +677,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -783,7 +789,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -942,7 +949,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1101,7 +1109,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1260,7 +1269,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1419,7 +1429,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1578,7 +1589,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1737,7 +1749,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -1896,7 +1909,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2055,7 +2069,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2214,7 +2229,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2373,7 +2389,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -2489,7 +2506,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2696,7 +2714,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2866,7 +2885,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -3036,7 +3056,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -3212,7 +3233,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -3382,7 +3404,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -3552,7 +3575,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -3644,7 +3668,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -3778,7 +3803,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false }, { "context": { @@ -3912,7 +3938,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false }, { "context": { @@ -4046,7 +4073,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -4251,7 +4279,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -4421,7 +4450,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -4591,7 +4621,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -4767,7 +4798,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -4937,7 +4969,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -5107,7 +5140,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -5199,7 +5233,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -5333,7 +5368,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false }, { "context": { @@ -5467,7 +5503,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false }, { "context": { @@ -5601,7 +5638,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -5806,7 +5844,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -5976,7 +6015,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -6146,7 +6186,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -6322,7 +6363,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -6492,7 +6534,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -6662,7 +6705,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -6754,7 +6798,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -6888,7 +6933,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false }, { "context": { @@ -7022,7 +7068,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false }, { "context": { @@ -7156,7 +7203,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -7361,7 +7409,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -7537,7 +7586,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -7629,7 +7679,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -7763,7 +7814,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } 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 8547094f3..c25616563 100644 --- a/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json @@ -126,7 +126,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -238,7 +239,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -384,7 +386,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -496,7 +499,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -626,7 +630,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -738,7 +743,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -884,7 +890,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -996,7 +1003,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/override/1.exp.json b/testdata/d2ir/TestCompile/patterns/override/1.exp.json index 19da6353a..e0e6fb8fd 100644 --- a/testdata/d2ir/TestCompile/patterns/override/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/1.exp.json @@ -136,7 +136,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -252,7 +253,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -368,7 +370,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -490,7 +493,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -606,7 +610,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -722,7 +727,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -780,7 +786,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/override/2.exp.json b/testdata/d2ir/TestCompile/patterns/override/2.exp.json index ff58cb9b5..6f8405ef3 100644 --- a/testdata/d2ir/TestCompile/patterns/override/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/2.exp.json @@ -188,7 +188,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -304,7 +305,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -420,247 +422,8 @@ } } }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:22:23", - "key": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "from_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:22:23", - "key": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:14:15", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -826,7 +589,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -942,7 +706,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1058,7 +823,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1178,7 +944,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1298,7 +1065,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1356,7 +1124,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1509,7 +1278,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1668,7 +1438,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1850,7 +1621,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2009,7 +1781,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/patterns/override/3.exp.json b/testdata/d2ir/TestCompile/patterns/override/3.exp.json index b7bf800cc..9645435f8 100644 --- a/testdata/d2ir/TestCompile/patterns/override/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/3.exp.json @@ -112,7 +112,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -228,7 +229,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -360,7 +362,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -476,7 +479,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -724,7 +728,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -919,7 +924,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1011,7 +1017,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -1201,7 +1208,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true }, { "context": { @@ -1371,7 +1379,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1486,7 +1495,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1679,7 +1689,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1832,7 +1843,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1985,7 +1997,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2130,7 +2143,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2323,7 +2337,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -2476,7 +2491,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -2629,7 +2645,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2894,7 +2911,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -3087,7 +3105,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -3240,7 +3259,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -3393,7 +3413,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -3687,7 +3708,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -3880,7 +3902,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -4033,7 +4056,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -4186,7 +4210,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -4389,7 +4414,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -4481,7 +4507,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -4626,7 +4653,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/patterns/override/4.exp.json b/testdata/d2ir/TestCompile/patterns/override/4.exp.json index 90e7d0802..72372ff1a 100644 --- a/testdata/d2ir/TestCompile/patterns/override/4.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/4.exp.json @@ -151,7 +151,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -306,7 +307,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -401,7 +403,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -571,7 +574,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -702,7 +706,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -847,7 +852,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/patterns/override/5.exp.json b/testdata/d2ir/TestCompile/patterns/override/5.exp.json index 57c08fa6a..e73c6eed9 100644 --- a/testdata/d2ir/TestCompile/patterns/override/5.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/5.exp.json @@ -112,7 +112,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -228,7 +229,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -431,7 +433,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -601,7 +604,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false } ] } @@ -693,7 +697,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -838,7 +843,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true }, { "context": { @@ -983,7 +989,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json b/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json index 6e28bd0a3..db2c68dc4 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json @@ -74,7 +74,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -152,7 +153,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json b/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json index 9186b1f98..32d2fc713 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json @@ -74,7 +74,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -152,7 +153,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json b/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json index ab4acb574..dfb1a9f64 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json @@ -74,7 +74,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -152,7 +153,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/prefix.exp.json b/testdata/d2ir/TestCompile/patterns/prefix.exp.json index d9d0cb092..920eddc82 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix.exp.json @@ -74,7 +74,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -152,7 +153,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/prevent-chain-recursion.exp.json b/testdata/d2ir/TestCompile/patterns/prevent-chain-recursion.exp.json new file mode 100644 index 000000000..d75403066 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/prevent-chain-recursion.exp.json @@ -0,0 +1,1083 @@ +{ + "fields": [ + { + "name": "one", + "composite": { + "fields": [ + { + "name": "c", + "primary": { + "value": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:5:13-2:6:14", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + "composite": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:17:42", + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:17:42", + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:3:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:3:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:3:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:6:14", + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:3:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:3:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:5:13-2:6:14", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + }, + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:17:42", + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:17:42", + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,9:0:46-9:3:49", + "value": [ + { + "string": "one", + "raw_string": "one" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,9:0:46-9:3:49", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,9:0:46-9:3:49", + "value": [ + { + "string": "one", + "raw_string": "one" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,9:0:46-9:3:49", + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,9:0:46-9:3:49", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,9:0:46-9:3:49", + "value": [ + { + "string": "one", + "raw_string": "one" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + }, + { + "name": "two", + "composite": { + "fields": [ + { + "name": "c", + "primary": { + "value": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:5:13-2:6:14", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + "composite": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:17:42", + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:17:42", + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:3:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:3:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:3:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:6:14", + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:3:11", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:3:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:5:13-2:6:14", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + }, + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:17:42", + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:17:42", + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,10:0:50-10:3:53", + "value": [ + { + "string": "two", + "raw_string": "two" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,10:0:50-10:3:53", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,10:0:50-10:3:53", + "value": [ + { + "string": "two", + "raw_string": "two" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,10:0:50-10:3:53", + "key": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,10:0:50-10:3:53", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,10:0:50-10:3:53", + "value": [ + { + "string": "two", + "raw_string": "two" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/patterns/reserved.exp.json b/testdata/d2ir/TestCompile/patterns/reserved.exp.json index bbce28ec2..196237058 100644 --- a/testdata/d2ir/TestCompile/patterns/reserved.exp.json +++ b/testdata/d2ir/TestCompile/patterns/reserved.exp.json @@ -82,7 +82,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -179,7 +180,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -305,7 +307,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -362,7 +365,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -419,7 +423,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -476,7 +481,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -613,7 +619,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -748,7 +755,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -883,7 +891,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1018,7 +1027,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1153,7 +1163,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1288,7 +1299,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/scenarios.exp.json b/testdata/d2ir/TestCompile/patterns/scenarios.exp.json index addb06ac4..a352aa25a 100644 --- a/testdata/d2ir/TestCompile/patterns/scenarios.exp.json +++ b/testdata/d2ir/TestCompile/patterns/scenarios.exp.json @@ -72,7 +72,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -140,7 +141,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -208,7 +210,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -276,7 +279,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -432,7 +436,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -617,7 +622,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -685,7 +691,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -753,7 +760,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -821,7 +829,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -889,7 +898,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1017,7 +1027,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1143,7 +1154,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1269,7 +1281,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1395,7 +1408,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1521,7 +1535,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1647,7 +1662,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1773,7 +1789,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -1899,7 +1916,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -2025,7 +2043,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -2151,7 +2170,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -2277,7 +2297,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -2403,7 +2424,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -2525,7 +2547,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -2647,7 +2670,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -2769,7 +2793,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -2891,7 +2916,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -3013,7 +3039,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -3135,7 +3162,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -3257,7 +3285,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -3379,7 +3408,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -3501,7 +3531,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -3623,7 +3654,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -3745,7 +3777,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] }, @@ -3867,7 +3900,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/single-glob/defaults.exp.json b/testdata/d2ir/TestCompile/patterns/single-glob/defaults.exp.json index a9e6f9b64..652ec7ac1 100644 --- a/testdata/d2ir/TestCompile/patterns/single-glob/defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/single-glob/defaults.exp.json @@ -82,7 +82,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -162,7 +163,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -244,7 +246,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -324,7 +327,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -406,7 +410,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -486,7 +491,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -568,7 +574,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -648,7 +655,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -773,7 +781,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -847,7 +856,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -966,7 +976,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1040,7 +1051,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1159,7 +1171,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1233,7 +1246,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1352,7 +1366,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1426,7 +1441,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1545,7 +1561,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1664,7 +1681,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1783,7 +1801,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -1877,7 +1896,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1957,7 +1977,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -2039,7 +2060,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2119,7 +2141,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -2201,7 +2224,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2281,7 +2305,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -2363,7 +2388,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2443,7 +2469,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -2525,7 +2552,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2605,7 +2633,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2730,7 +2759,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": false }, { "string": { @@ -2804,7 +2834,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2923,7 +2954,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -2997,7 +3029,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -3116,7 +3149,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -3190,7 +3224,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -3309,7 +3344,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -3383,7 +3419,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -3502,7 +3539,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -3576,7 +3614,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -3735,7 +3774,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -3855,7 +3895,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -4013,7 +4054,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -4133,7 +4175,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -4291,7 +4334,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -4382,7 +4426,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -4462,7 +4507,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -4582,7 +4628,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -4702,7 +4749,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/suffix.exp.json b/testdata/d2ir/TestCompile/patterns/suffix.exp.json index 50d92a2f8..b0cb6cbeb 100644 --- a/testdata/d2ir/TestCompile/patterns/suffix.exp.json +++ b/testdata/d2ir/TestCompile/patterns/suffix.exp.json @@ -74,7 +74,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -152,7 +153,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/table-class-exception.exp.json b/testdata/d2ir/TestCompile/patterns/table-class-exception.exp.json new file mode 100644 index 000000000..6fb4df419 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/table-class-exception.exp.json @@ -0,0 +1,988 @@ +{ + "fields": [ + { + "name": "table", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "TestCompile/patterns/table-class-exception.d2,10:9:64-10:18:73", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/table-class-exception.d2,10:2:57-10:7:62", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/table-class-exception.d2,10:2:57-10:7:62", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,10:2:57-10:7:62", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,10:2:57-10:18:73", + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,10:2:57-10:7:62", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,10:2:57-10:7:62", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,10:9:64-10:18:73", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + }, + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/table-class-exception.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:17:42", + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:17:42", + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + }, + { + "name": "a", + "primary": { + "value": { + "range": "TestCompile/patterns/table-class-exception.d2,11:5:79-11:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + "composite": { + "fields": [ + { + "name": "style", + "composite": { + "fields": [ + { + "name": "fill", + "primary": { + "value": { + "range": "TestCompile/patterns/table-class-exception.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:17:42", + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:17:42", + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:12:37", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,6:14:39-6:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/table-class-exception.d2,11:2:76-11:3:77", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/table-class-exception.d2,11:2:76-11:3:77", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,11:2:76-11:3:77", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,11:2:76-11:6:80", + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,11:2:76-11:3:77", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,11:2:76-11:3:77", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,11:5:79-11:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/table-class-exception.d2,9:0:46-9:5:51", + "value": [ + { + "string": "table", + "raw_string": "table" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/table-class-exception.d2,9:0:46-9:5:51", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,9:0:46-9:5:51", + "value": [ + { + "string": "table", + "raw_string": "table" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,9:0:46-12:1:82", + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,9:0:46-9:5:51", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,9:0:46-9:5:51", + "value": [ + { + "string": "table", + "raw_string": "table" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/table-class-exception.d2,9:7:53-12:1:82", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/table-class-exception.d2,10:2:57-10:18:73", + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,10:2:57-10:7:62", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,10:2:57-10:7:62", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,10:9:64-10:18:73", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/patterns/table-class-exception.d2,11:2:76-11:6:80", + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,11:2:76-11:3:77", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,11:2:76-11:3:77", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,11:5:79-11:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + }, + { + "name": "class", + "composite": { + "fields": [ + { + "name": "shape", + "primary": { + "value": { + "range": "TestCompile/patterns/table-class-exception.d2,15:9:102-15:14:107", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/table-class-exception.d2,15:2:95-15:7:100", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/table-class-exception.d2,15:2:95-15:7:100", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,15:2:95-15:7:100", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,15:2:95-15:14:107", + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,15:2:95-15:7:100", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,15:2:95-15:7:100", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,15:9:102-15:14:107", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + }, + { + "name": "a", + "primary": { + "value": { + "range": "TestCompile/patterns/table-class-exception.d2,16:5:113-16:6:114", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/table-class-exception.d2,16:2:110-16:3:111", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/table-class-exception.d2,16:2:110-16:3:111", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,16:2:110-16:3:111", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,16:2:110-16:6:114", + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,16:2:110-16:3:111", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,16:2:110-16:3:111", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,16:5:113-16:6:114", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/table-class-exception.d2,14:0:84-14:5:89", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/table-class-exception.d2,14:0:84-14:5:89", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,14:0:84-14:5:89", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,14:0:84-17:1:116", + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,14:0:84-14:5:89", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,14:0:84-14:5:89", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/table-class-exception.d2,14:7:91-17:1:116", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/table-class-exception.d2,15:2:95-15:14:107", + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,15:2:95-15:7:100", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,15:2:95-15:7:100", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,15:9:102-15:14:107", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/patterns/table-class-exception.d2,16:2:110-16:6:114", + "key": { + "range": "TestCompile/patterns/table-class-exception.d2,16:2:110-16:3:111", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,16:2:110-16:3:111", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/table-class-exception.d2,16:5:113-16:6:114", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json b/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json index 9d27ec3e8..ca547e930 100644 --- a/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json @@ -78,7 +78,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -136,7 +137,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -218,7 +220,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -276,7 +279,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -358,7 +362,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -416,7 +421,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -498,7 +504,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -556,7 +563,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -646,7 +654,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -708,7 +717,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -766,7 +776,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -848,7 +859,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -910,7 +922,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -968,7 +981,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1050,7 +1064,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1112,7 +1127,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1170,7 +1186,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1252,7 +1269,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1314,7 +1332,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1372,7 +1391,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1454,7 +1474,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1512,7 +1533,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1621,7 +1643,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -1765,7 +1788,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1874,7 +1898,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2018,7 +2043,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -2108,7 +2134,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2166,7 +2193,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2275,7 +2303,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2419,7 +2448,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2528,7 +2558,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -2672,7 +2703,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } 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 d4020736a..905ff2ec6 100644 --- a/testdata/d2ir/TestCompile/patterns/triple-glob/edge-defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/triple-glob/edge-defaults.exp.json @@ -112,7 +112,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -228,7 +229,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -344,7 +346,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -460,7 +463,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -584,7 +588,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -700,7 +705,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -816,7 +822,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -932,7 +939,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1048,7 +1056,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1164,7 +1173,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1285,7 +1295,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1369,7 +1380,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1459,7 +1471,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -1543,7 +1556,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -1635,7 +1649,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -1804,7 +1819,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true }, { "context": { @@ -1998,7 +2014,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -2117,7 +2134,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -2201,7 +2219,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2291,7 +2310,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true }, { "string": { @@ -2375,7 +2395,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -2467,7 +2488,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -2636,7 +2658,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true }, { "context": { @@ -2830,7 +2853,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -2949,7 +2973,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -3039,7 +3064,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -3131,7 +3157,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -3325,7 +3352,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -3456,7 +3484,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -3633,7 +3662,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -3765,7 +3795,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -3942,7 +3973,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -4066,7 +4098,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -4182,7 +4215,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -4303,7 +4337,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -4393,7 +4428,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -4485,7 +4521,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -4679,7 +4716,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -4810,7 +4848,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -4987,7 +5026,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -5119,7 +5159,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -5296,7 +5337,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -5417,7 +5459,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -5507,7 +5550,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -5599,7 +5643,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -5768,7 +5813,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] }, @@ -5887,7 +5933,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -5977,7 +6024,8 @@ } } }, - "from_glob": true + "due_to_glob": true, + "due_to_lazy_glob": true } ] } @@ -6069,7 +6117,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -6238,7 +6287,8 @@ } } }, - "from_glob": false + "due_to_glob": true, + "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/scenarios/edge.exp.json b/testdata/d2ir/TestCompile/scenarios/edge.exp.json index d9cefa0df..86c00ee6e 100644 --- a/testdata/d2ir/TestCompile/scenarios/edge.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/edge.exp.json @@ -112,7 +112,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -228,7 +229,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -352,7 +354,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -501,7 +504,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -617,7 +621,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "string": { @@ -766,7 +771,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -959,7 +965,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1125,7 +1132,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1217,7 +1225,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false }, { "context": { @@ -1341,7 +1350,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1488,7 +1498,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1665,7 +1676,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1769,7 +1781,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/scenarios/root.exp.json b/testdata/d2ir/TestCompile/scenarios/root.exp.json index 058c75b24..93e644f22 100644 --- a/testdata/d2ir/TestCompile/scenarios/root.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/root.exp.json @@ -112,7 +112,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -228,7 +229,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -352,7 +354,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -468,7 +471,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -577,7 +581,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -679,7 +684,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -781,7 +787,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -885,7 +892,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -993,7 +1001,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1113,7 +1122,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1229,7 +1239,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1286,7 +1297,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1390,7 +1402,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1476,7 +1489,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1666,7 +1680,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1770,7 +1785,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/steps/recursive.exp.json b/testdata/d2ir/TestCompile/steps/recursive.exp.json index 41f2e2656..595f96cc7 100644 --- a/testdata/d2ir/TestCompile/steps/recursive.exp.json +++ b/testdata/d2ir/TestCompile/steps/recursive.exp.json @@ -112,7 +112,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -228,7 +229,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -352,7 +354,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -468,7 +471,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -577,7 +581,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -679,7 +684,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -781,7 +787,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -885,7 +892,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -993,7 +1001,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1113,7 +1122,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1229,7 +1239,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1338,7 +1349,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1440,7 +1452,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1542,7 +1555,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1599,7 +1613,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1723,7 +1738,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1839,7 +1855,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1948,7 +1965,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2050,7 +2068,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2152,7 +2171,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -2209,7 +2229,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -2266,7 +2287,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2370,7 +2392,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2456,7 +2479,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2572,7 +2596,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2676,7 +2701,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2843,7 +2869,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -3114,7 +3141,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -3218,7 +3246,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/steps/root.exp.json b/testdata/d2ir/TestCompile/steps/root.exp.json index f87f3cf67..62376b02f 100644 --- a/testdata/d2ir/TestCompile/steps/root.exp.json +++ b/testdata/d2ir/TestCompile/steps/root.exp.json @@ -112,7 +112,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -228,7 +229,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -352,7 +354,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -468,7 +471,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -577,7 +581,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -679,7 +684,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -781,7 +787,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -885,7 +892,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -993,7 +1001,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1113,7 +1122,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1229,7 +1239,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1338,7 +1349,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1440,7 +1452,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1542,7 +1555,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }, @@ -1599,7 +1613,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1703,7 +1718,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1789,7 +1805,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -1979,7 +1996,8 @@ } } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] } @@ -2083,7 +2101,8 @@ "value": {} } }, - "from_glob": false + "due_to_glob": false, + "due_to_lazy_glob": false } ] }