Remove support for $identifier inside IES

Author: WebFreak001

src/dparse/ast.d

@@ -75,7 +75,6 @@ shared static this()
     typeMap[typeid(XorExpression)] = 48;
     typeMap[typeid(InterpolatedStringExpression)] = 49;
     typeMap[typeid(InterpolatedStringText)] = 50;
-    typeMap[typeid(InterpolatedStringVariable)] = 51;
 }
 
 /// Describes which syntax was used in a list of declarations in the containing AST node
@@ -170,7 +169,7 @@ abstract class ASTVisitor
         case 46: visit(cast(TypeofExpression) n); break;
         case 47: visit(cast(UnaryExpression) n); break;
         case 48: visit(cast(XorExpression) n); break;
-        // skip 49, 50, 51 (used for InterpolatedStringPart)
+        // skip 49, 50 (used for InterpolatedStringPart)
         default: assert(false, __MODULE__ ~ " has a bug");
         }
     }
@@ -182,7 +181,6 @@ abstract class ASTVisitor
         {
         case 49: visit(cast(InterpolatedStringExpression) n); break;
         case 50: visit(cast(InterpolatedStringText) n); break;
-        case 51: visit(cast(InterpolatedStringVariable) n); break;
         default: assert(false, __MODULE__ ~ " has a bug");
         }
     }
@@ -308,7 +306,6 @@ abstract class ASTVisitor
     /** */ void visit(const InterpolatedString interpolatedString) { interpolatedString.accept(this); }
     /** */ void visit(const InterpolatedStringExpression interpolatedStringExpression) { interpolatedStringExpression.accept(this); }
     /** */ void visit(const InterpolatedStringText interpolatedStringText) { interpolatedStringText.accept(this); }
-    /** */ void visit(const InterpolatedStringVariable interpolatedStringVariable) { interpolatedStringVariable.accept(this); }
     /** */ void visit(const Invariant invariant_) { invariant_.accept(this); }
     /** */ void visit(const IsExpression isExpression) { isExpression.accept(this); }
     /** */ void visit(const KeyValuePair keyValuePair) { keyValuePair.accept(this); }
@@ -2382,12 +2379,12 @@ final class InterpolatedString : BaseNode
     mixin OpEquals!("startQuote.text", "postfixType");
 }
 
-///
+/// AST nodes within an interpolated string
 abstract class InterpolatedStringPart : BaseNode
 {
 }
 
-///
+/// Just plain text inside the interpolated string
 final class InterpolatedStringText : InterpolatedStringPart
 {
     override void accept(ASTVisitor visitor) const
@@ -2403,29 +2400,7 @@ final class InterpolatedStringText : InterpolatedStringPart
     mixin OpEquals!("text.text");
 }
 
-///
-final class InterpolatedStringVariable : InterpolatedStringPart
-{
-    override void accept(ASTVisitor visitor) const
-    {
-    }
-
-    /// The dollar token.
-    inout(Token) dollar() inout pure nothrow @nogc @safe scope
-    {
-        return tokens.length == 2 ? tokens[0] : Token.init;
-    }
-
-    /// The variable name token.
-    inout(Token) name() inout pure nothrow @nogc @safe scope
-    {
-        return tokens.length == 2 ? tokens[1] : Token.init;
-    }
-
-    mixin OpEquals!("name.text");
-}
-
-///
+/// A $(...) interpolation sequence
 final class InterpolatedStringExpression : InterpolatedStringPart
 {
     override void accept(ASTVisitor visitor) const

src/dparse/astprinter.d

@@ -599,11 +599,6 @@ class XMLPrinter : ASTVisitor
 		output.writeln("<text>", xmlEscape(interpolatedStringText.text.text), "</text>");
 	}
 
-	override void visit(const InterpolatedStringVariable interpolatedStringVariable)
-	{
-		output.writeln("<variable>", xmlEscape(interpolatedStringVariable.name.text), "</variable>");
-	}
-
 	override void visit(const InterpolatedStringExpression interpolatedStringExpression)
 	{
 		visit(interpolatedStringExpression.expression);

src/dparse/formatter.d

@@ -2019,7 +2019,6 @@ class Formatter(Sink)
         foreach (part; interpolatedString.parts)
         {
             if (cast(InterpolatedStringText) part) format(cast(InterpolatedStringText) part);
-            else if (cast(InterpolatedStringVariable) part) format(cast(InterpolatedStringVariable) part);
             else if (cast(InterpolatedStringExpression) part) format(cast(InterpolatedStringExpression) part);
         }
         put(interpolatedString.endQuote.text);
@@ -2030,12 +2029,6 @@ class Formatter(Sink)
         put(interpolatedStringText.text.text);
     }
 
-    void format(const InterpolatedStringVariable interpolatedStringVariable)
-    {
-        put("$");
-        put(interpolatedStringVariable.name.text);
-    }
-
     void format(const InterpolatedStringExpression interpolatedStringExpression)
     {
         put("$(");

src/dparse/parser.d

@@ -4674,13 +4674,7 @@ class Parser
         }
         else if (currentIs(tok!"$"))
         {
-            if (peekIs(tok!"identifier"))
-            {
-                node = allocator.make!InterpolatedStringVariable;
-                advance();
-                advance();
-            }
-            else if (peekIs(tok!"("))
+            if (peekIs(tok!"("))
             {
                 advance();
                 advance();