cleanup

d2ast/d2ast.go

@@ -423,7 +423,6 @@ func (s *BlockString) value()        {}
 func (a *Array) value()              {}
 func (m *Map) value()                {}
 func (i *Import) value()             {}
-func (i *Substitution) value()       {}
 
 func (n *Null) scalar()               {}
 func (b *Boolean) scalar()            {}
@@ -924,7 +923,6 @@ type ValueBox struct {
 	Array              *Array              `json:"array,omitempty"`
 	Map                *Map                `json:"map,omitempty"`
 	Import             *Import             `json:"import,omitempty"`
-	Substitution       *Substitution       `json:"substitution,omitempty"`
 }
 
 func (vb ValueBox) Unbox() Value {
@@ -949,8 +947,6 @@ func (vb ValueBox) Unbox() Value {
 		return vb.Map
 	case vb.Import != nil:
 		return vb.Import
-	case vb.Substitution != nil:
-		return vb.Substitution
 	default:
 		return nil
 	}
@@ -979,8 +975,6 @@ func MakeValueBox(v Value) ValueBox {
 		vb.Map = v
 	case *Import:
 		vb.Import = v
-	case *Substitution:
-		vb.Substitution = v
 	}
 	return vb
 }

d2ir/compile.go

@@ -109,11 +109,6 @@ func (c *compiler) resolveSubstitutions(refctx *RefContext) {
 	}
 
 	switch {
-	case refctx.Key.Value.Substitution != nil:
-		resolvedField := c.resolveSubstitution(varsMap, refctx.Key, refctx.Key.Value.Substitution)
-		if resolvedField != nil {
-			refctx.Key.Value = d2ast.MakeValueBox(resolvedField.Primary().Value)
-		}
 	case refctx.Key.Value.UnquotedString != nil:
 		for i, box := range refctx.Key.Value.UnquotedString.Value {
 			if box.Substitution != nil {
@@ -245,7 +240,6 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) {
 }
 
 func (c *compiler) compileKey(refctx *RefContext) {
-	// resolve substitutions here
 	c.resolveSubstitutions(refctx)
 	if len(refctx.Key.Edges) == 0 {
 		c.compileField(refctx.ScopeMap, refctx.Key.Key, refctx)

d2parser/parse.go

@@ -1596,9 +1596,6 @@ func (p *parser) parseValue() d2ast.ValueBox {
 	case '@':
 		box.Import = p.parseImport(false)
 		return box
-	case '$':
-		box.Substitution = p.parseSubstitution(false)
-		return box
 	}
 
 	p.replay(r)