diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 841e381a0e..6b40777e4f 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -322,21 +322,21 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { } for _, fr := range f.References { if fr.Primary() { - if fr.Context.Key.Value.Map != nil { - obj.Map = fr.Context.Key.Value.Map + if fr.Context_.Key.Value.Map != nil { + obj.Map = fr.Context_.Key.Value.Map } } r := d2graph.Reference{ Key: fr.KeyPath, KeyPathIndex: fr.KeyPathIndex(), - MapKey: fr.Context.Key, - MapKeyEdgeIndex: fr.Context.EdgeIndex(), - Scope: fr.Context.Scope, - ScopeAST: fr.Context.ScopeAST, + MapKey: fr.Context_.Key, + MapKeyEdgeIndex: fr.Context_.EdgeIndex(), + Scope: fr.Context_.Scope, + ScopeAST: fr.Context_.ScopeAST, } - if fr.Context.ScopeMap != nil && !d2ir.IsVar(fr.Context.ScopeMap) { - scopeObjIDA := d2graphIDA(d2ir.BoardIDA(fr.Context.ScopeMap)) + if fr.Context_.ScopeMap != nil && !d2ir.IsVar(fr.Context_.ScopeMap) { + scopeObjIDA := d2graphIDA(d2ir.BoardIDA(fr.Context_.ScopeMap)) r.ScopeObj = obj.Graph.Root.EnsureChild(scopeObjIDA) } obj.References = append(obj.References, r) @@ -725,14 +725,14 @@ func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge) { edge.Label.MapKey = e.LastPrimaryKey() for _, er := range e.References { r := d2graph.EdgeReference{ - Edge: er.Context.Edge, - MapKey: er.Context.Key, - MapKeyEdgeIndex: er.Context.EdgeIndex(), - Scope: er.Context.Scope, - ScopeAST: er.Context.ScopeAST, - } - if er.Context.ScopeMap != nil && !d2ir.IsVar(er.Context.ScopeMap) { - scopeObjIDA := d2graphIDA(d2ir.BoardIDA(er.Context.ScopeMap)) + Edge: er.Context_.Edge, + MapKey: er.Context_.Key, + MapKeyEdgeIndex: er.Context_.EdgeIndex(), + Scope: er.Context_.Scope, + ScopeAST: er.Context_.ScopeAST, + } + if er.Context_.ScopeMap != nil && !d2ir.IsVar(er.Context_.ScopeMap) { + scopeObjIDA := d2graphIDA(d2ir.BoardIDA(er.Context_.ScopeMap)) r.ScopeObj = edge.Src.Graph.Root.EnsureChild(scopeObjIDA) } edge.References = append(edge.References, r) diff --git a/d2ir/compile.go b/d2ir/compile.go index 32fdfba45c..e9b76cbea6 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -39,7 +39,8 @@ type compiler struct { // Used to prevent field globs causing infinite loops. globRefContextStack []*RefContext // Used to check whether ampersands are allowed in the current map. - mapRefContextStack []*RefContext + mapRefContextStack []*RefContext + lazyGlobBeingApplied bool } type CompileOptions struct { @@ -65,8 +66,8 @@ func Compile(ast *d2ast.Map, opts *CompileOptions) (*Map, error) { } m := &Map{} m.initRoot() - m.parent.(*Field).References[0].Context.Scope = ast - m.parent.(*Field).References[0].Context.ScopeAST = ast + m.parent.(*Field).References[0].Context_.Scope = ast + m.parent.(*Field).References[0].Context_.ScopeAST = ast c.pushImportStack(&d2ast.Import{ Path: []*d2ast.StringBox{d2ast.RawStringBox(ast.GetRange().Path, true)}, @@ -99,7 +100,7 @@ func (c *compiler) overlayClasses(m *Map) { for _, lf := range layers.Fields { if lf.Map() == nil || lf.Primary() != nil { - c.errorf(lf.References[0].Context.Key, "invalid layer") + c.errorf(lf.References[0].Context_.Key, "invalid layer") continue } l := lf.Map() @@ -353,7 +354,7 @@ func (c *compiler) resolveSubstitution(vars *Map, substitution *d2ast.Substituti func (c *compiler) overlay(base *Map, f *Field) { if f.Map() == nil || f.Primary() != nil { - c.errorf(f.References[0].Context.Key, "invalid %s", NodeBoardKind(f)) + c.errorf(f.References[0].Context_.Key, "invalid %s", NodeBoardKind(f)) return } base = base.CopyBase(f) @@ -512,7 +513,9 @@ 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)) + c.lazyGlobBeingApplied = true c.compileKey(gctx2.refctx) + c.lazyGlobBeingApplied = false } } } @@ -600,6 +603,9 @@ func (c *compiler) _compileField(f *Field, refctx *RefContext) { } if refctx.Key.Primary.Unbox() != nil { + if c.ignoreLazyGlob(f) { + return + } f.Primary_ = &Scalar{ parent: f, Value: refctx.Key.Primary.Unbox(), @@ -686,6 +692,9 @@ func (c *compiler) _compileField(f *Field, refctx *RefContext) { } } } else if refctx.Key.Value.ScalarBox().Unbox() != nil { + if c.ignoreLazyGlob(f) { + return + } // If the link is a board, we need to transform it into an absolute path. if f.Name == "link" { c.compileLink(refctx) @@ -697,6 +706,17 @@ func (c *compiler) _compileField(f *Field, refctx *RefContext) { } } +// Whether the current lazy glob being applied should not override the field +// 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() { + return true + } + } + return false +} + func (c *compiler) updateLinks(m *Map) { for _, f := range m.Fields { if f.Name == "link" { @@ -841,10 +861,10 @@ func (c *compiler) _compileEdges(refctx *RefContext) { } for _, e := range ea { e.References = append(e.References, &EdgeReference{ - Context: refctx, + Context_: refctx, }) - refctx.ScopeMap.appendFieldReferences(0, refctx.Edge.Src, refctx) - refctx.ScopeMap.appendFieldReferences(0, refctx.Edge.Dst, refctx) + refctx.ScopeMap.appendFieldReferences(0, refctx.Edge.Src, refctx, c) + refctx.ScopeMap.appendFieldReferences(0, refctx.Edge.Dst, refctx, c) } } else { var err error @@ -865,6 +885,9 @@ func (c *compiler) _compileEdges(refctx *RefContext) { c.compileField(e.Map_, refctx.Key.EdgeKey, refctx) } else { if refctx.Key.Primary.Unbox() != nil { + if c.ignoreLazyGlob(e) { + return + } e.Primary_ = &Scalar{ parent: e, Value: refctx.Key.Primary.Unbox(), @@ -883,6 +906,9 @@ func (c *compiler) _compileEdges(refctx *RefContext) { c.compileMap(e.Map_, refctx.Key.Value.Map, refctx.ScopeAST) c.mapRefContextStack = c.mapRefContextStack[:len(c.mapRefContextStack)-1] } else if refctx.Key.Value.ScalarBox().Unbox() != nil { + if c.ignoreLazyGlob(e) { + return + } e.Primary_ = &Scalar{ parent: e, Value: refctx.Key.Value.ScalarBox().Unbox(), diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index b0a3b23458..78780d5013 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -29,6 +29,8 @@ type Node interface { fmt.Stringer LastRef() Reference + LastPrimaryRef() Reference + SecondLastPrimaryRef() Reference LastPrimaryKey() *d2ast.Key } @@ -110,6 +112,14 @@ func (n *Scalar) LastRef() Reference { return parentRef(n) } func (n *Map) LastRef() Reference { return parentRef(n) } func (n *Array) LastRef() Reference { return parentRef(n) } +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) } @@ -119,13 +129,20 @@ type Reference interface { // Most specific AST node for the reference. AST() d2ast.Node Primary() bool + Context() *RefContext + // Result of a glob in Context or from above. + DueToGlob() bool } var _ Reference = &FieldReference{} var _ Reference = &EdgeReference{} -func (r *FieldReference) reference() {} -func (r *EdgeReference) reference() {} +func (r *FieldReference) reference() {} +func (r *EdgeReference) reference() {} +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_ } type Scalar struct { parent Node @@ -160,7 +177,7 @@ func (m *Map) initRoot() { m.parent = &Field{ Name: "root", References: []*FieldReference{{ - Context: &RefContext{ + Context_: &RefContext{ ScopeMap: m, }, }}, @@ -299,9 +316,23 @@ func (f *Field) Copy(newParent Node) Node { return f } -func (f *Field) lastPrimaryRef() *FieldReference { +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 + } return f.References[i] } } @@ -309,11 +340,11 @@ func (f *Field) lastPrimaryRef() *FieldReference { } func (f *Field) LastPrimaryKey() *d2ast.Key { - fr := f.lastPrimaryRef() + fr := f.LastPrimaryRef() if fr == nil { return nil } - return fr.Context.Key + return fr.(*FieldReference).Context_.Key } func (f *Field) LastRef() Reference { @@ -455,10 +486,25 @@ func (e *Edge) Copy(newParent Node) Node { return e } -func (e *Edge) lastPrimaryRef() *EdgeReference { +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 fr.Context_.Key.EdgeKey == nil { + if !second { + second = true + continue + } return fr } } @@ -466,11 +512,11 @@ func (e *Edge) lastPrimaryRef() *EdgeReference { } func (e *Edge) LastPrimaryKey() *d2ast.Key { - er := e.lastPrimaryRef() + er := e.LastPrimaryRef() if er == nil { return nil } - return er.Context.Key + return er.(*EdgeReference).Context_.Key } func (e *Edge) LastRef() Reference { @@ -498,16 +544,17 @@ type FieldReference struct { String d2ast.String `json:"string"` KeyPath *d2ast.KeyPath `json:"key_path"` - Context *RefContext `json:"context"` + Context_ *RefContext `json:"context"` + DueToGlob_ bool `json:"from_glob"` } // Primary returns true if the Value in Context.Key.Value corresponds to the Field // represented by String. func (fr *FieldReference) Primary() bool { - if fr.KeyPath == fr.Context.Key.Key { - return len(fr.Context.Key.Edges) == 0 && fr.KeyPathIndex() == len(fr.KeyPath.Path)-1 - } else if fr.KeyPath == fr.Context.Key.EdgeKey { - return len(fr.Context.Key.Edges) == 1 && fr.KeyPathIndex() == len(fr.KeyPath.Path)-1 + if fr.KeyPath == fr.Context_.Key.Key { + return len(fr.Context_.Key.Edges) == 0 && fr.KeyPathIndex() == len(fr.KeyPath.Path)-1 + } else if fr.KeyPath == fr.Context_.Key.EdgeKey { + return len(fr.Context_.Key.Edges) == 1 && fr.KeyPathIndex() == len(fr.KeyPath.Path)-1 } return false } @@ -522,33 +569,34 @@ func (fr *FieldReference) KeyPathIndex() int { } func (fr *FieldReference) EdgeDest() bool { - return fr.KeyPath == fr.Context.Edge.Dst + return fr.KeyPath == fr.Context_.Edge.Dst } func (fr *FieldReference) InEdge() bool { - return fr.Context.Edge != nil + return fr.Context_.Edge != nil } func (fr *FieldReference) AST() d2ast.Node { if fr.String == nil { // Root map. - return fr.Context.Scope + return fr.Context_.Scope } return fr.String } type EdgeReference struct { - Context *RefContext `json:"context"` + Context_ *RefContext `json:"context"` + DueToGlob_ bool `json:"from_glob"` } func (er *EdgeReference) AST() d2ast.Node { - return er.Context.Edge + return er.Context_.Edge } // Primary returns true if the Value in Context.Key.Value corresponds to the *Edge // represented by Context.Edge func (er *EdgeReference) Primary() bool { - return len(er.Context.Key.Edges) == 1 && er.Context.Key.EdgeKey == nil + return len(er.Context_.Key.Edges) == 1 && er.Context_.Key.EdgeKey == nil } type RefContext struct { @@ -812,9 +860,10 @@ 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, + String: kp.Path[i].Unbox(), + KeyPath: kp, + Context_: refctx, + DueToGlob_: len(c.globRefContextStack) > 0, }) } @@ -846,9 +895,10 @@ 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, + String: kp.Path[i].Unbox(), + KeyPath: kp, + Context_: refctx, + DueToGlob_: len(c.globRefContextStack) > 0, }) } m.Fields = append(m.Fields, f) @@ -897,7 +947,7 @@ func (m *Map) DeleteField(ida ...string) *Field { for _, fr := range f.References { for _, e := range m.Edges { for _, er := range e.References { - if er.Context == fr.Context { + if er.Context_ == fr.Context_ { m.DeleteEdge(e.ID) break } @@ -1181,7 +1231,7 @@ func (m *Map) createEdge2(eid *EdgeID, refctx *RefContext, gctx *globContext, sr parent: m, ID: eid, References: []*EdgeReference{{ - Context: refctx, + Context_: refctx, }}, } @@ -1289,7 +1339,7 @@ func (m *Map) AST() d2ast.Node { return astMap } -func (m *Map) appendFieldReferences(i int, kp *d2ast.KeyPath, refctx *RefContext) { +func (m *Map) appendFieldReferences(i int, kp *d2ast.KeyPath, refctx *RefContext, c *compiler) { sb := kp.Path[i] f := m.GetField(sb.Unbox().ScalarString()) if f == nil { @@ -1297,15 +1347,16 @@ func (m *Map) appendFieldReferences(i int, kp *d2ast.KeyPath, refctx *RefContext } f.References = append(f.References, &FieldReference{ - String: sb.Unbox(), - KeyPath: kp, - Context: refctx, + String: sb.Unbox(), + KeyPath: kp, + Context_: refctx, + DueToGlob_: len(c.globRefContextStack) > 0, }) if i+1 == len(kp.Path) { return } if f.Map() != nil { - f.Map().appendFieldReferences(i+1, kp, refctx) + f.Map().appendFieldReferences(i+1, kp, refctx, c) } } @@ -1421,6 +1472,30 @@ func parentRef(n Node) Reference { return nil } +func parentPrimaryRef(n Node) Reference { + f := ParentField(n) + if f != nil { + return f.LastPrimaryRef() + } + e := ParentEdge(n) + if e != nil { + return e.LastPrimaryRef() + } + 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 { @@ -1592,7 +1667,7 @@ func (m *Map) InClass(key *d2ast.Key) bool { } for _, ref := range classF.References { - if ref.Context.Key == key { + if ref.Context_.Key == key { return true } } diff --git a/d2ir/import.go b/d2ir/import.go index 44cf509ff6..ef56871277 100644 --- a/d2ir/import.go +++ b/d2ir/import.go @@ -108,7 +108,7 @@ func (c *compiler) __import(imp *d2ast.Import) (*Map, bool) { ir = &Map{} ir.initRoot() - ir.parent.(*Field).References[0].Context.Scope = ast + ir.parent.(*Field).References[0].Context_.Scope = ast c.compileMap(ir, ast, ast) @@ -128,14 +128,14 @@ func nilScopeMap(n Node) { } case *Edge: for _, r := range n.References { - r.Context.ScopeMap = nil + r.Context_.ScopeMap = nil } if n.Map() != nil { nilScopeMap(n.Map()) } case *Field: for _, r := range n.References { - r.Context.ScopeMap = nil + r.Context_.ScopeMap = nil } if n.Map() != nil { nilScopeMap(n.Map()) diff --git a/d2ir/pattern_test.go b/d2ir/pattern_test.go index 653c8c1066..6889a29a11 100644 --- a/d2ir/pattern_test.go +++ b/d2ir/pattern_test.go @@ -560,6 +560,37 @@ layers: { assertQuery(t, m, 0, 0, "bye", "layers.hi.scenarios.b.(a -> b)[0].label") }, }, + { + name: "override/4", + run: func(t testing.TB) { + m, err := compile(t, ` +(*** -> ***)[*].label: hi + +a -> b: { + label: bye +} +`) + assert.Success(t, err) + assertQuery(t, m, 3, 1, nil, "") + assertQuery(t, m, 0, 0, "bye", "(a -> b)[0].label") + }, + }, + { + name: "override/5", + run: func(t testing.TB) { + m, err := compile(t, ` +(*** -> ***)[*].label: hi + +# This is "hey" right now but should be "hi"? +a -> b + +(*** -> ***)[*].label: hey +`) + assert.Success(t, err) + assertQuery(t, m, 3, 1, nil, "") + assertQuery(t, m, 0, 0, "hey", "(a -> b)[0].label") + }, + }, } runa(t, tca) diff --git a/testdata/d2ir/TestCompile/classes/basic.exp.json b/testdata/d2ir/TestCompile/classes/basic.exp.json index eed20a6c8d..ee64de956a 100644 --- a/testdata/d2ir/TestCompile/classes/basic.exp.json +++ b/testdata/d2ir/TestCompile/classes/basic.exp.json @@ -52,7 +52,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -163,7 +164,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -252,7 +254,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -359,7 +362,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -495,7 +499,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/classes/inherited.exp.json b/testdata/d2ir/TestCompile/classes/inherited.exp.json index f88697361e..2d6741f30b 100644 --- a/testdata/d2ir/TestCompile/classes/inherited.exp.json +++ b/testdata/d2ir/TestCompile/classes/inherited.exp.json @@ -107,7 +107,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -196,7 +197,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -303,7 +305,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -439,7 +442,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -558,7 +562,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -647,7 +652,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -754,7 +760,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -890,7 +897,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -1009,7 +1017,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1098,7 +1107,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1205,7 +1215,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -1312,7 +1323,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1401,7 +1413,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1508,7 +1521,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1644,7 +1658,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1774,7 +1789,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -1830,7 +1846,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -2018,7 +2035,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -2133,7 +2151,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -2222,7 +2241,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -2329,7 +2349,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -2436,7 +2457,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -2525,7 +2547,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -2632,7 +2655,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -2768,7 +2792,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -2898,7 +2923,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -2954,7 +2980,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -3010,7 +3037,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -3096,7 +3124,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -3211,7 +3240,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -3300,7 +3330,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -3407,7 +3438,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -3514,7 +3546,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -3597,7 +3630,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -3686,7 +3720,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -3769,7 +3804,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -3876,7 +3912,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -3977,7 +4014,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -4113,7 +4151,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -4243,7 +4282,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -4373,7 +4413,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -4429,7 +4470,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -4485,7 +4527,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -4536,7 +4579,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -4724,7 +4768,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -4839,7 +4884,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -4928,7 +4974,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -5035,7 +5082,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -5142,7 +5190,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -5225,7 +5274,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -5314,7 +5364,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -5397,7 +5448,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -5504,7 +5556,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -5605,7 +5658,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -5741,7 +5795,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -5871,7 +5926,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -6001,7 +6057,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -6057,7 +6114,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -6108,7 +6166,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -6164,7 +6223,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -6215,7 +6275,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -6279,7 +6340,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -6390,7 +6452,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -6479,7 +6542,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -6586,7 +6650,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -6693,7 +6758,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -6776,7 +6842,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -6865,7 +6932,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -6948,7 +7016,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -7055,7 +7124,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -7156,7 +7226,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -7292,7 +7363,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -7422,7 +7494,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -7552,7 +7625,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -7638,7 +7712,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -7753,7 +7828,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -7920,7 +7996,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -8476,7 +8553,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -9061,7 +9139,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -9675,7 +9754,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json index 087bc4de2d..0cc4114907 100644 --- a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json +++ b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json @@ -107,7 +107,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -196,7 +197,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -303,7 +305,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -439,7 +442,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -558,7 +562,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -701,7 +706,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -790,7 +796,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -917,7 +924,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1024,7 +1032,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1151,7 +1160,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1287,7 +1297,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1416,7 +1427,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1574,7 +1586,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/classes/merge.exp.json b/testdata/d2ir/TestCompile/classes/merge.exp.json index 1ad04233f4..af3cf33f5b 100644 --- a/testdata/d2ir/TestCompile/classes/merge.exp.json +++ b/testdata/d2ir/TestCompile/classes/merge.exp.json @@ -107,7 +107,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -196,7 +197,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -265,7 +267,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -401,7 +404,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -566,7 +570,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -685,7 +690,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -774,7 +780,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -843,7 +850,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -900,7 +908,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1036,7 +1045,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1122,7 +1132,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1287,7 +1298,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1437,7 +1449,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1616,7 +1629,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/classes/nested.exp.json b/testdata/d2ir/TestCompile/classes/nested.exp.json index 9fec0c6472..dde7b34e08 100644 --- a/testdata/d2ir/TestCompile/classes/nested.exp.json +++ b/testdata/d2ir/TestCompile/classes/nested.exp.json @@ -107,7 +107,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -196,7 +197,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -303,7 +305,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -439,7 +442,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -511,7 +515,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -622,7 +627,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -711,7 +717,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -818,7 +825,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -954,7 +962,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1040,7 +1049,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1155,7 +1165,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -1266,7 +1277,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1355,7 +1367,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1462,7 +1475,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1598,7 +1612,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1742,7 +1757,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1915,7 +1931,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/edges/chain.exp.json b/testdata/d2ir/TestCompile/edges/chain.exp.json index 8484dbbdb1..b3aec64dec 100644 --- a/testdata/d2ir/TestCompile/edges/chain.exp.json +++ b/testdata/d2ir/TestCompile/edges/chain.exp.json @@ -185,7 +185,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -374,7 +375,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -558,7 +560,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -747,7 +750,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -931,7 +935,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1120,7 +1125,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1297,7 +1303,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1472,7 +1479,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1647,7 +1655,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/edges/nested.exp.json b/testdata/d2ir/TestCompile/edges/nested.exp.json index 548780974b..dd69ea4037 100644 --- a/testdata/d2ir/TestCompile/edges/nested.exp.json +++ b/testdata/d2ir/TestCompile/edges/nested.exp.json @@ -170,7 +170,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -341,7 +342,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -515,7 +517,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -686,7 +689,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -835,7 +839,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/edges/root.exp.json b/testdata/d2ir/TestCompile/edges/root.exp.json index ec08bcf957..0b20726a88 100644 --- a/testdata/d2ir/TestCompile/edges/root.exp.json +++ b/testdata/d2ir/TestCompile/edges/root.exp.json @@ -111,7 +111,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -226,7 +227,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -329,7 +331,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/edges/underscore.exp.json b/testdata/d2ir/TestCompile/edges/underscore.exp.json index 0663230867..5f506aea19 100644 --- a/testdata/d2ir/TestCompile/edges/underscore.exp.json +++ b/testdata/d2ir/TestCompile/edges/underscore.exp.json @@ -137,7 +137,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -257,7 +258,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -405,7 +407,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -531,7 +534,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/fields/array.exp.json b/testdata/d2ir/TestCompile/fields/array.exp.json index 4530ab3bc0..4587fa35e6 100644 --- a/testdata/d2ir/TestCompile/fields/array.exp.json +++ b/testdata/d2ir/TestCompile/fields/array.exp.json @@ -118,7 +118,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/fields/label.exp.json b/testdata/d2ir/TestCompile/fields/label.exp.json index 278d708572..a4503c572c 100644 --- a/testdata/d2ir/TestCompile/fields/label.exp.json +++ b/testdata/d2ir/TestCompile/fields/label.exp.json @@ -73,7 +73,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/fields/nested.exp.json b/testdata/d2ir/TestCompile/fields/nested.exp.json index 042d9865ff..44377bd159 100644 --- a/testdata/d2ir/TestCompile/fields/nested.exp.json +++ b/testdata/d2ir/TestCompile/fields/nested.exp.json @@ -99,7 +99,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -188,7 +189,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/fields/primary/nested.exp.json b/testdata/d2ir/TestCompile/fields/primary/nested.exp.json index 815fc5fcc0..2397dbeacb 100644 --- a/testdata/d2ir/TestCompile/fields/primary/nested.exp.json +++ b/testdata/d2ir/TestCompile/fields/primary/nested.exp.json @@ -71,7 +71,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -189,7 +190,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -307,7 +309,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/fields/primary/root.exp.json b/testdata/d2ir/TestCompile/fields/primary/root.exp.json index 5b82d2d85d..5f418d72b9 100644 --- a/testdata/d2ir/TestCompile/fields/primary/root.exp.json +++ b/testdata/d2ir/TestCompile/fields/primary/root.exp.json @@ -67,7 +67,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -163,7 +164,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/fields/root.exp.json b/testdata/d2ir/TestCompile/fields/root.exp.json index daba81dbfd..94688803b4 100644 --- a/testdata/d2ir/TestCompile/fields/root.exp.json +++ b/testdata/d2ir/TestCompile/fields/root.exp.json @@ -52,7 +52,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/filters/array.exp.json b/testdata/d2ir/TestCompile/filters/array.exp.json index 1fc2712333..68be20b305 100644 --- a/testdata/d2ir/TestCompile/filters/array.exp.json +++ b/testdata/d2ir/TestCompile/filters/array.exp.json @@ -110,7 +110,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -172,7 +173,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -265,7 +267,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -349,7 +352,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -463,7 +467,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -577,7 +582,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -639,7 +645,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -753,7 +760,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -867,7 +875,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -929,7 +938,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -1022,7 +1032,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1106,7 +1117,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1220,7 +1232,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/filters/base.exp.json b/testdata/d2ir/TestCompile/filters/base.exp.json index c8a934bbc6..3179710edd 100644 --- a/testdata/d2ir/TestCompile/filters/base.exp.json +++ b/testdata/d2ir/TestCompile/filters/base.exp.json @@ -77,7 +77,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -139,7 +140,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -235,7 +237,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -316,7 +319,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -378,7 +382,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -455,7 +460,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -551,7 +557,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/filters/edge.exp.json b/testdata/d2ir/TestCompile/filters/edge.exp.json index 7e65c4f856..afbb299e82 100644 --- a/testdata/d2ir/TestCompile/filters/edge.exp.json +++ b/testdata/d2ir/TestCompile/filters/edge.exp.json @@ -205,7 +205,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -315,7 +316,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -565,7 +567,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -815,7 +818,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -1024,7 +1028,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1134,7 +1139,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1254,7 +1260,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1338,7 +1345,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1427,7 +1435,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1511,7 +1520,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -1614,7 +1624,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1698,7 +1709,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1787,7 +1799,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1871,7 +1884,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -1948,7 +1962,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2133,7 +2148,8 @@ } } } - } + }, + "from_glob": false }, { "context": { @@ -2358,7 +2374,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -2463,7 +2480,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -2688,7 +2706,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/filters/order.exp.json b/testdata/d2ir/TestCompile/filters/order.exp.json index d7a77a3745..78ee0cbd7d 100644 --- a/testdata/d2ir/TestCompile/filters/order.exp.json +++ b/testdata/d2ir/TestCompile/filters/order.exp.json @@ -77,7 +77,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -139,7 +140,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -235,7 +237,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -316,7 +319,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -378,7 +382,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -455,7 +460,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -551,7 +557,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/boards.exp.json b/testdata/d2ir/TestCompile/imports/boards.exp.json index 6b5e2d61c8..e9b4e029a8 100644 --- a/testdata/d2ir/TestCompile/imports/boards.exp.json +++ b/testdata/d2ir/TestCompile/imports/boards.exp.json @@ -97,7 +97,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -185,7 +186,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -294,7 +296,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -382,7 +385,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -446,7 +450,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -522,7 +527,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -627,7 +633,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -703,7 +710,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -808,7 +816,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/nested/array.exp.json b/testdata/d2ir/TestCompile/imports/nested/array.exp.json index 9e17371481..3435957004 100644 --- a/testdata/d2ir/TestCompile/imports/nested/array.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/array.exp.json @@ -97,7 +97,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/nested/map.exp.json b/testdata/d2ir/TestCompile/imports/nested/map.exp.json index b1dedaa355..6834aea206 100644 --- a/testdata/d2ir/TestCompile/imports/nested/map.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/map.exp.json @@ -77,7 +77,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -154,7 +155,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -241,7 +243,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json index ed273c2c07..7f245892d7 100644 --- a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json @@ -93,7 +93,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/nested/spread.exp.json b/testdata/d2ir/TestCompile/imports/nested/spread.exp.json index 6a7baa9612..63803460c3 100644 --- a/testdata/d2ir/TestCompile/imports/nested/spread.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/spread.exp.json @@ -52,7 +52,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -108,7 +109,8 @@ "primary": {}, "value": {} } - } + }, + "from_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 1dbc2241c7..6ec12f9df6 100644 --- a/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json @@ -67,7 +67,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -123,7 +124,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -217,7 +219,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/spread.exp.json b/testdata/d2ir/TestCompile/imports/spread.exp.json index cc2a0a3e57..e8d2264bb0 100644 --- a/testdata/d2ir/TestCompile/imports/spread.exp.json +++ b/testdata/d2ir/TestCompile/imports/spread.exp.json @@ -73,7 +73,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json b/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json index e80dff6360..f0770efbc6 100644 --- a/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json +++ b/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json @@ -52,7 +52,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -116,7 +117,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -172,7 +174,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -248,7 +251,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -308,7 +312,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -364,7 +369,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -440,7 +446,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -587,7 +594,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -651,7 +659,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -707,7 +716,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -783,7 +793,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -843,7 +854,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -899,7 +911,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -955,7 +968,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1031,7 +1045,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1178,7 +1193,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/value.exp.json b/testdata/d2ir/TestCompile/imports/value.exp.json index 8e5c0f0215..3ea82ca078 100644 --- a/testdata/d2ir/TestCompile/imports/value.exp.json +++ b/testdata/d2ir/TestCompile/imports/value.exp.json @@ -77,7 +77,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -154,7 +155,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -230,7 +232,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/vars/1.exp.json b/testdata/d2ir/TestCompile/imports/vars/1.exp.json index 9d278fd743..c7a748bd99 100644 --- a/testdata/d2ir/TestCompile/imports/vars/1.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/1.exp.json @@ -77,7 +77,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -160,7 +161,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -252,7 +254,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/vars/2.exp.json b/testdata/d2ir/TestCompile/imports/vars/2.exp.json index 3107e5c6e7..31f57b4706 100644 --- a/testdata/d2ir/TestCompile/imports/vars/2.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/2.exp.json @@ -69,7 +69,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -126,7 +127,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -218,7 +220,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -304,7 +307,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -392,7 +396,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/imports/vars/3.exp.json b/testdata/d2ir/TestCompile/imports/vars/3.exp.json index e2ddd2094c..deaa81819e 100644 --- a/testdata/d2ir/TestCompile/imports/vars/3.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/3.exp.json @@ -69,7 +69,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -126,7 +127,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -218,7 +220,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -304,7 +307,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -392,7 +396,8 @@ } } } - } + }, + "from_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 c18033088b..13ff5bce71 100644 --- a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json +++ b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json @@ -229,7 +229,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -449,7 +450,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -640,7 +642,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -865,7 +868,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -1085,7 +1089,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1311,7 +1316,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -1531,7 +1537,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/layers/root.exp.json b/testdata/d2ir/TestCompile/layers/root.exp.json index 82ca928ad7..9370da3f71 100644 --- a/testdata/d2ir/TestCompile/layers/root.exp.json +++ b/testdata/d2ir/TestCompile/layers/root.exp.json @@ -111,7 +111,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -226,7 +227,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -342,7 +344,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -443,7 +446,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -544,7 +548,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -652,7 +657,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -789,7 +795,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -892,7 +899,8 @@ "primary": {}, "value": {} } - } + }, + "from_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 2d16cfb4b7..42a332adaf 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/1.exp.json @@ -143,7 +143,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -262,7 +263,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -381,7 +383,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -500,7 +503,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -625,7 +629,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -744,7 +749,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -863,7 +869,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -982,7 +989,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -1091,7 +1099,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1184,7 +1193,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1277,7 +1287,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1370,7 +1381,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1463,7 +1475,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1520,7 +1533,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1659,7 +1673,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1778,7 +1793,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1897,7 +1913,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -2016,7 +2033,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -2133,7 +2151,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -2239,7 +2258,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -2345,7 +2365,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -2451,7 +2472,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -2557,7 +2579,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -2663,7 +2686,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2788,7 +2812,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -2894,7 +2919,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -3000,7 +3026,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -3106,7 +3133,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -3225,7 +3253,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -3331,7 +3360,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -3450,7 +3480,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -3556,7 +3587,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -3675,7 +3707,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -3781,7 +3814,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -3890,7 +3924,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -3983,7 +4018,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -4076,7 +4112,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -4169,7 +4206,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -4262,7 +4300,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -4348,7 +4387,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -4539,7 +4579,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -4658,7 +4699,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -4777,7 +4819,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -4942,7 +4985,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -5061,7 +5105,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -5180,7 +5225,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -5237,7 +5283,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -5323,7 +5370,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -5481,7 +5529,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -5596,7 +5645,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -5754,7 +5804,8 @@ } } } - } + }, + "from_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 0c0043b7f0..5fe90243bb 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/2.exp.json @@ -52,7 +52,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -173,7 +174,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true }, { "string": { @@ -289,7 +291,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true }, { "string": { @@ -405,7 +408,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] }, @@ -461,7 +465,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -517,7 +522,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -626,7 +632,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -733,7 +740,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -840,7 +848,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json index a9262751fb..1dfd83ec06 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json @@ -169,7 +169,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true }, { "string": { @@ -333,7 +334,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true }, { "string": { @@ -497,7 +499,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] } @@ -554,7 +557,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -705,7 +709,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true }, { "string": { @@ -851,7 +856,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true }, { "string": { @@ -997,7 +1003,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] }, @@ -1203,7 +1210,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true }, { "string": { @@ -1367,7 +1375,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true }, { "string": { @@ -1531,7 +1540,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] } @@ -1588,7 +1598,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1764,7 +1775,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] } @@ -1929,7 +1941,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -2014,7 +2027,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -2139,7 +2153,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] } @@ -2254,7 +2269,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -2379,7 +2395,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] } @@ -2519,7 +2536,8 @@ "primary": {}, "value": {} } - } + }, + "from_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 c605e295d8..8627b7a66d 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/4.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/4.exp.json @@ -88,7 +88,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true }, { "string": { @@ -171,7 +172,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true }, { "string": { @@ -254,7 +256,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] } @@ -311,7 +314,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -403,7 +407,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true }, { "string": { @@ -486,7 +491,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] } @@ -543,7 +549,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -635,7 +642,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] } @@ -692,7 +700,8 @@ "primary": {}, "value": {} } - } + }, + "from_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 7e9211e569..5c9fd87573 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/5.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/5.exp.json @@ -183,7 +183,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -298,7 +299,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -413,7 +415,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -574,7 +577,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -689,7 +693,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -804,7 +809,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -920,7 +926,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1099,7 +1106,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1214,7 +1222,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1329,7 +1338,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1490,7 +1500,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1605,7 +1616,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1720,7 +1732,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1836,7 +1849,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1939,7 +1953,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -2047,7 +2062,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -2201,7 +2217,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2339,7 +2356,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -2493,7 +2511,8 @@ } } } - } + }, + "from_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/patterns/case/1.exp.json b/testdata/d2ir/TestCompile/patterns/case/1.exp.json index 292d5d24e3..45339a73cd 100644 --- a/testdata/d2ir/TestCompile/patterns/case/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/case/1.exp.json @@ -73,7 +73,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -150,7 +151,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/case/2.exp.json b/testdata/d2ir/TestCompile/patterns/case/2.exp.json index 283008b8af..345e908865 100644 --- a/testdata/d2ir/TestCompile/patterns/case/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/case/2.exp.json @@ -63,7 +63,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -130,7 +131,8 @@ "primary": {}, "value": {} } - } + }, + "from_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 804f187d0a..33284cbbfa 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json @@ -139,7 +139,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -260,7 +261,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -339,7 +341,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -478,7 +481,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -599,7 +603,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -678,7 +683,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -813,7 +819,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -934,7 +941,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1013,7 +1021,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -1086,7 +1095,8 @@ "primary": {}, "value": {} } - } + }, + "from_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 2a48981fe1..8a133ee076 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/defaults.exp.json @@ -77,7 +77,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -134,7 +135,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -215,7 +217,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -272,7 +275,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -353,7 +357,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -410,7 +415,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -491,7 +497,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -548,7 +555,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -637,7 +645,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -694,7 +703,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -775,7 +785,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -832,7 +843,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -913,7 +925,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -970,7 +983,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1051,7 +1065,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1108,7 +1123,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1189,7 +1205,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1246,7 +1263,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1354,7 +1372,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1493,7 +1512,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1601,7 +1621,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1740,7 +1761,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -1804,7 +1826,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1912,7 +1935,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -2020,7 +2044,8 @@ } } } - } + }, + "from_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 9e115779c4..537f1bd20e 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 @@ -56,7 +56,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -116,7 +117,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -172,7 +174,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -281,7 +284,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -442,7 +446,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -600,7 +605,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] }, @@ -747,7 +753,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] } @@ -883,7 +890,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1018,7 +1026,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1153,7 +1162,8 @@ "primary": {}, "value": {} } - } + }, + "from_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 2095012688..fb629ad1a2 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json @@ -56,7 +56,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -112,7 +113,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -221,7 +223,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -363,7 +366,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] }, @@ -423,7 +427,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -509,7 +514,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -667,7 +673,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] } @@ -803,7 +810,8 @@ "primary": {}, "value": {} } - } + }, + "from_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 ec8c116c4d..0e397a6c2a 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json @@ -163,7 +163,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] } @@ -220,7 +221,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -367,7 +369,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] } @@ -503,7 +506,8 @@ "primary": {}, "value": {} } - } + }, + "from_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 8da87a6c9e..1602ba3c05 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json @@ -111,7 +111,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -221,7 +222,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -331,7 +333,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -483,7 +486,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -635,7 +639,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -787,7 +792,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -902,7 +908,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -1012,7 +1019,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -1122,7 +1130,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -1274,7 +1283,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1426,7 +1436,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1578,7 +1589,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1778,7 +1790,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1947,7 +1960,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2038,7 +2052,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -2165,7 +2180,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -2363,7 +2379,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2532,7 +2549,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2623,7 +2641,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -2750,7 +2769,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -2948,7 +2968,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -3117,7 +3138,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -3208,7 +3230,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -3335,7 +3358,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json b/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json index ee685d4948..2710e14e03 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json @@ -52,7 +52,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -108,7 +109,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -164,7 +166,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -220,7 +223,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -341,7 +345,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": true } ] } @@ -450,7 +455,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -557,7 +563,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -664,7 +671,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -771,7 +779,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json index 087072d2dc..f8934f6a85 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json @@ -52,7 +52,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -108,7 +109,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -227,7 +229,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -344,7 +347,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json index 016f524db5..83eb78b880 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json @@ -78,7 +78,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -156,7 +157,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -295,7 +297,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -432,7 +435,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -510,7 +514,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -583,7 +588,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json index a6a0200bc4..511b7ae9c9 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json @@ -78,7 +78,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -156,7 +157,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -335,7 +337,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -512,7 +515,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -590,7 +594,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -663,7 +668,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/escaped.exp.json b/testdata/d2ir/TestCompile/patterns/escaped.exp.json index 27262dd307..a616540f44 100644 --- a/testdata/d2ir/TestCompile/patterns/escaped.exp.json +++ b/testdata/d2ir/TestCompile/patterns/escaped.exp.json @@ -73,7 +73,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -150,7 +151,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -227,7 +229,8 @@ } } } - } + }, + "from_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 76ba3598ff..08612280b7 100644 --- a/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json +++ b/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json @@ -111,7 +111,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -221,7 +222,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -331,7 +333,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -446,7 +449,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -556,7 +560,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -666,7 +671,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -776,7 +782,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -934,7 +941,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1092,7 +1100,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1250,7 +1259,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1408,7 +1418,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -1523,7 +1534,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1729,7 +1741,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1904,7 +1917,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1995,7 +2009,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -2128,7 +2143,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -2332,7 +2348,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2507,7 +2524,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2598,7 +2616,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -2731,7 +2750,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -2935,7 +2955,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -3110,7 +3131,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -3201,7 +3223,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -3334,7 +3357,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -3538,7 +3562,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -3713,7 +3738,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -3804,7 +3830,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -3937,7 +3964,8 @@ } } } - } + }, + "from_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 9b5259d95f..8547094f32 100644 --- a/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json @@ -125,7 +125,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -236,7 +237,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -381,7 +383,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -492,7 +495,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -621,7 +625,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -732,7 +737,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -877,7 +883,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -988,7 +995,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/override/1.exp.json b/testdata/d2ir/TestCompile/patterns/override/1.exp.json index 41699da8d6..19da6353a6 100644 --- a/testdata/d2ir/TestCompile/patterns/override/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/1.exp.json @@ -135,7 +135,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -250,7 +251,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -365,7 +367,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -486,7 +489,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -601,7 +605,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -716,7 +721,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -773,7 +779,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/override/2.exp.json b/testdata/d2ir/TestCompile/patterns/override/2.exp.json index a360c2c0a9..ff58cb9b57 100644 --- a/testdata/d2ir/TestCompile/patterns/override/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/2.exp.json @@ -187,7 +187,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -302,7 +303,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -417,7 +419,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -536,7 +539,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -655,7 +659,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -820,7 +825,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -935,7 +941,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1050,7 +1057,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1169,7 +1177,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1288,7 +1297,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1345,7 +1355,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1497,7 +1508,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1655,7 +1667,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1836,7 +1849,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1994,7 +2008,8 @@ } } } - } + }, + "from_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/patterns/override/3.exp.json b/testdata/d2ir/TestCompile/patterns/override/3.exp.json index fc7ed84a53..b7bf800cc7 100644 --- a/testdata/d2ir/TestCompile/patterns/override/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/3.exp.json @@ -111,7 +111,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -226,7 +227,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -357,7 +359,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -472,7 +475,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -719,7 +723,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -913,7 +918,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1004,7 +1010,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -1193,7 +1200,8 @@ } } } - } + }, + "from_glob": false }, { "context": { @@ -1362,7 +1370,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1476,7 +1485,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1668,7 +1678,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1820,7 +1831,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1972,7 +1984,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2116,7 +2129,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -2308,7 +2322,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -2460,7 +2475,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -2612,7 +2628,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2876,7 +2893,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -3068,7 +3086,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -3220,7 +3239,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -3372,7 +3392,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -3665,7 +3686,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -3857,7 +3879,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -4009,7 +4032,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -4161,7 +4185,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -4363,7 +4388,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -4454,7 +4480,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -4598,7 +4625,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/override/4.exp.json b/testdata/d2ir/TestCompile/patterns/override/4.exp.json new file mode 100644 index 0000000000..90e7d08024 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/override/4.exp.json @@ -0,0 +1,855 @@ +{ + "fields": [ + { + "name": "a", + "references": [ + { + "string": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:6:34", + "src": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-5:1:52", + "edges": [ + { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:6:34", + "src": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/override/4.d2,3:8:36-5:1:52", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:12:50", + "key": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:7:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:7:45", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,4:9:47-4:12:50", + "value": [ + { + "string": "bye", + "raw_string": "bye" + } + ] + } + } + } + } + ] + } + } + } + }, + "from_glob": false + } + ] + }, + { + "name": "b", + "references": [ + { + "string": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:6:34", + "src": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-5:1:52", + "edges": [ + { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:6:34", + "src": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/override/4.d2,3:8:36-5:1:52", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:12:50", + "key": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:7:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:7:45", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,4:9:47-4:12:50", + "value": [ + { + "string": "bye", + "raw_string": "bye" + } + ] + } + } + } + } + ] + } + } + } + }, + "from_glob": false + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "a" + ], + "src_arrow": false, + "dst_path": [ + "b" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "map": { + "fields": [ + { + "name": "label", + "primary": { + "value": { + "range": "TestCompile/patterns/override/4.d2,4:9:47-4:12:50", + "value": [ + { + "string": "bye", + "raw_string": "bye" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:7:45", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:7:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:7:45", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:12:50", + "key": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:7:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:7:45", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,4:9:47-4:12:50", + "value": [ + { + "string": "bye", + "raw_string": "bye" + } + ] + } + } + } + }, + "from_glob": false + }, + { + "string": { + "range": "TestCompile/patterns/override/4.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/override/4.d2,1:16:17-1:21:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/override/4.d2,1:1:2-1:11:12", + "src": { + "range": "TestCompile/patterns/override/4.d2,1:1:2-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,1:1:2-1:4:5", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/4.d2,1:8:9-1:11:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,1:8:9-1:11:12", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/override/4.d2,1:0:1-1:25:26", + "edges": [ + { + "range": "TestCompile/patterns/override/4.d2,1:1:2-1:11:12", + "src": { + "range": "TestCompile/patterns/override/4.d2,1:1:2-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,1:1:2-1:4:5", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/4.d2,1:8:9-1:11:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,1:8:9-1:11:12", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/override/4.d2,1:12:13-1:15:16", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/override/4.d2,1:16:17-1:21:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,1:23:24-1:25:26", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + } + }, + "from_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:6:34", + "src": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-5:1:52", + "edges": [ + { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:6:34", + "src": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/override/4.d2,3:8:36-5:1:52", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:12:50", + "key": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:7:45", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,4:2:40-4:7:45", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,4:9:47-4:12:50", + "value": [ + { + "string": "bye", + "raw_string": "bye" + } + ] + } + } + } + } + ] + } + } + } + }, + "from_glob": false + }, + { + "context": { + "edge": { + "range": "TestCompile/patterns/override/4.d2,1:1:2-1:11:12", + "src": { + "range": "TestCompile/patterns/override/4.d2,1:1:2-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,1:1:2-1:4:5", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/4.d2,1:8:9-1:11:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,1:8:9-1:11:12", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/override/4.d2,1:0:1-1:25:26", + "edges": [ + { + "range": "TestCompile/patterns/override/4.d2,1:1:2-1:11:12", + "src": { + "range": "TestCompile/patterns/override/4.d2,1:1:2-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,1:1:2-1:4:5", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/4.d2,1:8:9-1:11:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,1:8:9-1:11:12", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/override/4.d2,1:12:13-1:15:16", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/override/4.d2,1:16:17-1:21:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/override/4.d2,1:23:24-1:25:26", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + } + }, + "from_glob": false + } + ] + } + ] +} diff --git a/testdata/d2ir/TestCompile/patterns/override/5.exp.json b/testdata/d2ir/TestCompile/patterns/override/5.exp.json new file mode 100644 index 0000000000..57c08fa6a1 --- /dev/null +++ b/testdata/d2ir/TestCompile/patterns/override/5.exp.json @@ -0,0 +1,991 @@ +{ + "fields": [ + { + "name": "a", + "references": [ + { + "string": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:6:80", + "src": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:6:80", + "edges": [ + { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:6:80", + "src": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + "from_glob": false + } + ] + }, + { + "name": "b", + "references": [ + { + "string": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:6:80", + "src": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:6:80", + "edges": [ + { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:6:80", + "src": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + "from_glob": false + } + ] + } + ], + "edges": [ + { + "edge_id": { + "src_path": [ + "a" + ], + "src_arrow": false, + "dst_path": [ + "b" + ], + "dst_arrow": true, + "index": 0, + "glob": false + }, + "map": { + "fields": [ + { + "name": "label", + "primary": { + "value": { + "range": "TestCompile/patterns/override/5.d2,6:23:105-6:26:108", + "value": [ + { + "string": "hey", + "raw_string": "hey" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/patterns/override/5.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/override/5.d2,1:16:17-1:21:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/override/5.d2,1:1:2-1:11:12", + "src": { + "range": "TestCompile/patterns/override/5.d2,1:1:2-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,1:1:2-1:4:5", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/5.d2,1:8:9-1:11:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,1:8:9-1:11:12", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/override/5.d2,1:0:1-1:25:26", + "edges": [ + { + "range": "TestCompile/patterns/override/5.d2,1:1:2-1:11:12", + "src": { + "range": "TestCompile/patterns/override/5.d2,1:1:2-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,1:1:2-1:4:5", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/5.d2,1:8:9-1:11:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,1:8:9-1:11:12", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/override/5.d2,1:12:13-1:15:16", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/override/5.d2,1:16:17-1:21:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,1:23:24-1:25:26", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + } + }, + "from_glob": true + }, + { + "string": { + "range": "TestCompile/patterns/override/5.d2,6:16:98-6:21:103", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/override/5.d2,6:16:98-6:21:103", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,6:16:98-6:21:103", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "context": { + "edge": { + "range": "TestCompile/patterns/override/5.d2,6:1:83-6:11:93", + "src": { + "range": "TestCompile/patterns/override/5.d2,6:1:83-6:4:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,6:1:83-6:4:86", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/5.d2,6:8:90-6:11:93", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,6:8:90-6:11:93", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/override/5.d2,6:0:82-6:26:108", + "edges": [ + { + "range": "TestCompile/patterns/override/5.d2,6:1:83-6:11:93", + "src": { + "range": "TestCompile/patterns/override/5.d2,6:1:83-6:4:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,6:1:83-6:4:86", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/5.d2,6:8:90-6:11:93", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,6:8:90-6:11:93", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/override/5.d2,6:12:94-6:15:97", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/override/5.d2,6:16:98-6:21:103", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,6:16:98-6:21:103", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,6:23:105-6:26:108", + "value": [ + { + "string": "hey", + "raw_string": "hey" + } + ] + } + } + } + }, + "from_glob": true + } + ] + } + ], + "edges": null + }, + "references": [ + { + "context": { + "edge": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:6:80", + "src": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:6:80", + "edges": [ + { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:6:80", + "src": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + "from_glob": false + }, + { + "context": { + "edge": { + "range": "TestCompile/patterns/override/5.d2,1:1:2-1:11:12", + "src": { + "range": "TestCompile/patterns/override/5.d2,1:1:2-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,1:1:2-1:4:5", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/5.d2,1:8:9-1:11:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,1:8:9-1:11:12", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/override/5.d2,1:0:1-1:25:26", + "edges": [ + { + "range": "TestCompile/patterns/override/5.d2,1:1:2-1:11:12", + "src": { + "range": "TestCompile/patterns/override/5.d2,1:1:2-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,1:1:2-1:4:5", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/5.d2,1:8:9-1:11:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,1:8:9-1:11:12", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/override/5.d2,1:12:13-1:15:16", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/override/5.d2,1:16:17-1:21:22", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,1:23:24-1:25:26", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + } + }, + "from_glob": false + }, + { + "context": { + "edge": { + "range": "TestCompile/patterns/override/5.d2,6:1:83-6:11:93", + "src": { + "range": "TestCompile/patterns/override/5.d2,6:1:83-6:4:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,6:1:83-6:4:86", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/5.d2,6:8:90-6:11:93", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,6:8:90-6:11:93", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + }, + "key": { + "range": "TestCompile/patterns/override/5.d2,6:0:82-6:26:108", + "edges": [ + { + "range": "TestCompile/patterns/override/5.d2,6:1:83-6:11:93", + "src": { + "range": "TestCompile/patterns/override/5.d2,6:1:83-6:4:86", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,6:1:83-6:4:86", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "TestCompile/patterns/override/5.d2,6:8:90-6:11:93", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,6:8:90-6:11:93", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "TestCompile/patterns/override/5.d2,6:12:94-6:15:97", + "int": null, + "glob": true + }, + "edge_key": { + "range": "TestCompile/patterns/override/5.d2,6:16:98-6:21:103", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,6:16:98-6:21:103", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/override/5.d2,6:23:105-6:26:108", + "value": [ + { + "string": "hey", + "raw_string": "hey" + } + ] + } + } + } + }, + "from_glob": false + } + ] + } + ] +} diff --git a/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json b/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json index a71fb970be..6e28bd0a30 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json @@ -73,7 +73,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -150,7 +151,8 @@ } } } - } + }, + "from_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 175299dad9..9186b1f98e 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json @@ -73,7 +73,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -150,7 +151,8 @@ } } } - } + }, + "from_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 1504168b97..ab4acb5748 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json @@ -73,7 +73,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -150,7 +151,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/prefix.exp.json b/testdata/d2ir/TestCompile/patterns/prefix.exp.json index 62dec6cc3c..d9d0cb0925 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix.exp.json @@ -73,7 +73,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -150,7 +151,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/reserved.exp.json b/testdata/d2ir/TestCompile/patterns/reserved.exp.json index 01fb1938f7..bbce28ec2d 100644 --- a/testdata/d2ir/TestCompile/patterns/reserved.exp.json +++ b/testdata/d2ir/TestCompile/patterns/reserved.exp.json @@ -81,7 +81,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -177,7 +178,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -302,7 +304,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -358,7 +361,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -414,7 +418,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -470,7 +475,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -606,7 +612,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -740,7 +747,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -874,7 +882,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -1008,7 +1017,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -1142,7 +1152,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -1276,7 +1287,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/scenarios.exp.json b/testdata/d2ir/TestCompile/patterns/scenarios.exp.json index 6f97c5e815..addb06ac45 100644 --- a/testdata/d2ir/TestCompile/patterns/scenarios.exp.json +++ b/testdata/d2ir/TestCompile/patterns/scenarios.exp.json @@ -71,7 +71,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -138,7 +139,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -205,7 +207,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -272,7 +275,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -427,7 +431,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -611,7 +616,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -678,7 +684,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -745,7 +752,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -812,7 +820,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -879,7 +888,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1006,7 +1016,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1131,7 +1142,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1256,7 +1268,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1381,7 +1394,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1506,7 +1520,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1631,7 +1646,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1756,7 +1772,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1881,7 +1898,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2006,7 +2024,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2131,7 +2150,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2256,7 +2276,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2381,7 +2402,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2502,7 +2524,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2623,7 +2646,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2744,7 +2768,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2865,7 +2890,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2986,7 +3012,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -3107,7 +3134,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -3228,7 +3256,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -3349,7 +3378,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -3470,7 +3500,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -3591,7 +3622,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -3712,7 +3744,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -3833,7 +3866,8 @@ "primary": {}, "value": {} } - } + }, + "from_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 08e7283b50..a9e6f9b64f 100644 --- a/testdata/d2ir/TestCompile/patterns/single-glob/defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/single-glob/defaults.exp.json @@ -81,7 +81,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -160,7 +161,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -241,7 +243,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -320,7 +323,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -401,7 +405,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -480,7 +485,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -561,7 +567,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -640,7 +647,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -764,7 +772,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -837,7 +846,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -955,7 +965,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1028,7 +1039,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -1146,7 +1158,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1219,7 +1232,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -1337,7 +1351,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1410,7 +1425,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -1528,7 +1544,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1646,7 +1663,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1764,7 +1782,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -1857,7 +1876,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1936,7 +1956,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2017,7 +2038,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2096,7 +2118,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2177,7 +2200,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2256,7 +2280,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2337,7 +2362,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2416,7 +2442,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2497,7 +2524,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2576,7 +2604,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -2700,7 +2729,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -2773,7 +2803,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -2891,7 +2922,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -2964,7 +2996,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -3082,7 +3115,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -3155,7 +3189,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -3273,7 +3308,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -3346,7 +3382,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -3464,7 +3501,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -3537,7 +3575,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -3695,7 +3734,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -3814,7 +3854,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -3971,7 +4012,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -4090,7 +4132,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -4247,7 +4290,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -4337,7 +4381,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -4416,7 +4461,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -4535,7 +4581,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -4654,7 +4701,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/suffix.exp.json b/testdata/d2ir/TestCompile/patterns/suffix.exp.json index 40da3b5a14..50d92a2f88 100644 --- a/testdata/d2ir/TestCompile/patterns/suffix.exp.json +++ b/testdata/d2ir/TestCompile/patterns/suffix.exp.json @@ -73,7 +73,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -150,7 +151,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json b/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json index dc21aecd18..9d27ec3e85 100644 --- a/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json @@ -77,7 +77,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -134,7 +135,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -215,7 +217,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -272,7 +275,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -353,7 +357,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -410,7 +415,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -491,7 +497,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -548,7 +555,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -637,7 +645,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -698,7 +707,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -755,7 +765,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -836,7 +847,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -897,7 +909,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -954,7 +967,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1035,7 +1049,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1096,7 +1111,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1153,7 +1169,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1234,7 +1251,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1295,7 +1313,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1352,7 +1371,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1433,7 +1453,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1490,7 +1511,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1598,7 +1620,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1741,7 +1764,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1849,7 +1873,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -1992,7 +2017,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -2081,7 +2107,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2138,7 +2165,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -2246,7 +2274,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -2389,7 +2418,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2497,7 +2527,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -2640,7 +2671,8 @@ } } } - } + }, + "from_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 6cd63562fa..d4020736aa 100644 --- a/testdata/d2ir/TestCompile/patterns/triple-glob/edge-defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/triple-glob/edge-defaults.exp.json @@ -111,7 +111,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -226,7 +227,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -341,7 +343,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -456,7 +459,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -579,7 +583,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -694,7 +699,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -809,7 +815,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -924,7 +931,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1039,7 +1047,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1154,7 +1163,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1274,7 +1284,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1357,7 +1368,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1446,7 +1458,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -1529,7 +1542,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -1620,7 +1634,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -1788,7 +1803,8 @@ } } } - } + }, + "from_glob": false }, { "context": { @@ -1981,7 +1997,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -2099,7 +2116,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -2182,7 +2200,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2271,7 +2290,8 @@ } } } - } + }, + "from_glob": true }, { "string": { @@ -2354,7 +2374,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -2445,7 +2466,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -2613,7 +2635,8 @@ } } } - } + }, + "from_glob": false }, { "context": { @@ -2806,7 +2829,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -2924,7 +2948,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -3013,7 +3038,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -3104,7 +3130,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -3297,7 +3324,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -3427,7 +3455,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -3603,7 +3632,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -3734,7 +3764,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -3910,7 +3941,8 @@ } } } - } + }, + "from_glob": true } ] }, @@ -4033,7 +4065,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -4148,7 +4181,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -4268,7 +4302,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -4357,7 +4392,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -4448,7 +4484,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -4641,7 +4678,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -4771,7 +4809,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -4947,7 +4986,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -5078,7 +5118,8 @@ } } } - } + }, + "from_glob": false }, { "string": { @@ -5254,7 +5295,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -5374,7 +5416,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -5463,7 +5506,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -5554,7 +5598,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -5722,7 +5767,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -5840,7 +5886,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -5929,7 +5976,8 @@ } } } - } + }, + "from_glob": true } ] } @@ -6020,7 +6068,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -6188,7 +6237,8 @@ } } } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/scenarios/edge.exp.json b/testdata/d2ir/TestCompile/scenarios/edge.exp.json index c0ef78879a..d9cefa0df3 100644 --- a/testdata/d2ir/TestCompile/scenarios/edge.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/edge.exp.json @@ -111,7 +111,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -226,7 +227,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -349,7 +351,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -497,7 +500,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -612,7 +616,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "string": { @@ -760,7 +765,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -952,7 +958,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1117,7 +1124,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1208,7 +1216,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false }, { "context": { @@ -1331,7 +1340,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1477,7 +1487,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1653,7 +1664,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1756,7 +1768,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/scenarios/root.exp.json b/testdata/d2ir/TestCompile/scenarios/root.exp.json index 0c7ae1e33a..058c75b245 100644 --- a/testdata/d2ir/TestCompile/scenarios/root.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/root.exp.json @@ -111,7 +111,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -226,7 +227,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -349,7 +351,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -464,7 +467,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -572,7 +576,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -673,7 +678,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -774,7 +780,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -877,7 +884,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -984,7 +992,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -1103,7 +1112,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1218,7 +1228,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1274,7 +1285,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1377,7 +1389,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1462,7 +1475,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1651,7 +1665,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1754,7 +1769,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/steps/recursive.exp.json b/testdata/d2ir/TestCompile/steps/recursive.exp.json index bcaeb4be09..41f2e26566 100644 --- a/testdata/d2ir/TestCompile/steps/recursive.exp.json +++ b/testdata/d2ir/TestCompile/steps/recursive.exp.json @@ -111,7 +111,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -226,7 +227,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -349,7 +351,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -464,7 +467,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -572,7 +576,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -673,7 +678,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -774,7 +780,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -877,7 +884,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -984,7 +992,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -1103,7 +1112,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1218,7 +1228,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1326,7 +1337,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1427,7 +1439,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1528,7 +1541,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1584,7 +1598,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1707,7 +1722,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1822,7 +1838,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1930,7 +1947,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -2031,7 +2049,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -2132,7 +2151,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2188,7 +2208,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -2244,7 +2265,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -2347,7 +2369,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -2432,7 +2455,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -2547,7 +2571,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -2650,7 +2675,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -2816,7 +2842,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -3086,7 +3113,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -3189,7 +3217,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/steps/root.exp.json b/testdata/d2ir/TestCompile/steps/root.exp.json index a8b486f76e..f87f3cf670 100644 --- a/testdata/d2ir/TestCompile/steps/root.exp.json +++ b/testdata/d2ir/TestCompile/steps/root.exp.json @@ -111,7 +111,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -226,7 +227,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -349,7 +351,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -464,7 +467,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -572,7 +576,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -673,7 +678,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -774,7 +780,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -877,7 +884,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -984,7 +992,8 @@ } } } - } + }, + "from_glob": false } ] }, @@ -1103,7 +1112,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1218,7 +1228,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1326,7 +1337,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1427,7 +1439,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1528,7 +1541,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }, @@ -1584,7 +1598,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1687,7 +1702,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] } @@ -1772,7 +1788,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -1961,7 +1978,8 @@ } } } - } + }, + "from_glob": false } ] } @@ -2064,7 +2082,8 @@ "primary": {}, "value": {} } - } + }, + "from_glob": false } ] }