More istring spec work.

Author: schveiguy

spec/istring.dd

@@ -10,49 +10,97 @@ string, but can contain values that are passed directly to a function that is
 able to accept them. It is transformed into a $(I Sequence) of expressions that
 can be overloaded or handled by template functions.)
 
+$(H2 $(LNAME2 ies, IES Literals))
+
 $(GRAMMAR
 $(GNAME InterpolationExpressionSequence):
+    $(GLINK InterpolatedDoubleQuotedLiteral)
+    $(GLINK InterpolatedWysiwygLiteral)
+    $(GLINK InterpolatedTokenLiteral)
+)
+
+$(P An Interpolation Expression sequence can either wysiwyg quoted, double
+quoted, or a token literal. Only double quoted literals can have escapes in
+them.)
+
+$(P Unlike string literals, IES literals cannot have a suffix defining the
+width of the character type for the string expressions.)
+
+$(H3 $(LNAME2 ies_doublequoted, Double Quoted IES Literals))
+
+$(GRAMMAR
+$(GNAME InterpolatedDoubleQuotedLiteral):
     $(B i") $(GLINK InterpolatedDoubleQuotedCharacters)$(OPT) $(B ")
-    $(B $(BACKTICK)) $(GLINK InterpolatedWysiwygCharacters)$(OPT) $(B $(BACKTICK))
-    $(D q{) $(GLINK InterpolatedTokenStringTokens)$(OPT) $(D })
 
 $(GNAME InterpolatedDoubleQuotedCharacters):
     $(GLINK InterpolatedDoubleQuotedCharacter)
     $(GLINK InterpolatedDoubleQuotedCharacter) $(GSELF InterpolatedDoubleQuotedCharacters)
 
 $(GNAME InterpolatedDoubleQuotedCharacter):
-    $(GLINK DoubleQuotedCharacter)
+    $(GLINK2 lexical, DoubleQuotedCharacter)
     $(GLINK InterpolationEscapeSequence)
     $(GLINK InterpolationExpression)
 
 $(GNAME InterpolationEscapeSequence):
     $(GLINK EscapeSequence)
     $(B \\\$)
 
+$(GNAME InterpolationExpression):
+    $(B \$$(LPAREN)) $(GLINK AssignExpression) $(B $(RPAREN))
+)
+
+$(P Like $(GLINK2 lexical, DoubleQuotedString), double-quoted IES literals can
+have escape characters in them. Added to the normal escapes is the ability to
+escape a literal $)
+
+$(P A $ followed by any other chraracter other than a left parenthesis is
+treated as a literal $ in the expression, there is no need to escape it.)
+
+$(P The expression inside an $(GLINK InterpolationExpression) is a full D
+expression, and escapes are not needed inside that part of the expression.)
+
+$(H3 $(LNAME2 ies_wysiwyg, Wysiwyg IES Literals))
+
+$(GRAMMAR
+$(GNAME InterpolatedWysiwygLiteral):
+    $(B i$(BACKTICK)) $(GLINK InterpolatedWysiwygCharacters)$(OPT) $(B $(BACKTICK))
+
 $(GNAME InterpolatedWysiwygCharacters):
     $(GLINK InterpolatedWysiwygCharacter)
     $(GLINK InterpolatedWysiwygCharacter) $(GSELF InterpolatedWysiwygCharacters)
 
 $(GNAME InterpolatedWysiwygCharacter):
-    $(GLINK WysiwygCharacter)
+    $(GLINK2 lexical, WysiwygCharacter)
     $(GLINK InterpolationExpression)
+)
+
+$(P Wysiwyg ("what you see is what you get") IES literals are defined like
+$(GLINK2 lexical, WysiwygString) strings, but only support backquote syntax. No
+escapes are recognized inside these literals.)
+
+$(H3 $(LNAME2 ies_token, Token IES Literals))
+
+$(GRAMMAR
+$(GNAME InterpolatedTokenLiteral):
+    $(D iq{) $(GLINK InterpolatedTokenStringTokens)$(OPT) $(D })
 
 $(GNAME InterpolatedTokenStringTokens):
     $(GLINK InterpolatedTokenStringTokenNoBraces)
     $(GLINK InterpolatedTokenStringToken) $(GSELF InterpolatedTokenStringTokens)
 
 $(GNAME InterpolatedTokenStringToken):
     $(GLINK InterpolatedTokenNoBraces)
-    (D {) $(GSELF InterpolatedTokenStringTokens)$(OPT) $(D })
+    $(B {) $(GSELF InterpolatedTokenStringTokens)$(OPT) $(B })
 
 $(GNAME InterpolatedTokenNoBraces):
-    $(GLINK TokenNoBraces)
-    $(GLINK InterpolationExpression);
-
-$(GNAME InterpolationExpression):
-    $(B $ (LPAREN)) $(GLINK AssignExpression) $(B $(RPAREN))
+    $(GLINK2 lexical, TokenNoBraces)
+    $(GLINK InterpolationExpression)
 )
 
+$(P Like $(GLINK2 lexical, TokenString), IES Token literals must contain only
+valid D tokens, with the exception of $(GLINK InterpolationExpression). No
+escapes are recognized.)
+
 $(H2 $(LNAME2 expression_translation, Expression Translation))
 
 $(P When the lexer encounters an Interpolation Expression Sequence, the token
@@ -64,7 +112,7 @@ $(D core.interpolation.InterpolationFooter()))
 $(P Each part $(D str) of the token which is literal string data is translated
 into the expression $(D core.interpolation.InterpolatedLiteral!(str)))
 
-$(P Each part $(D $$(LPAREN)expr$(RPAREN)) of the token which is an $(GLINK
+$(P Each part $(D \$$(LPAREN)expr$(RPAREN)) of the token which is an $(GLINK
 InterpolationExpression) is translated into the sequence $(D
 core.interpolation.InterpolatedExpression!(expr)$(COMMA) expr).)
 
@@ -154,7 +202,7 @@ alias result = processIES!i"Here is a type: $(int)";
 $(H2 $(LNAME2 tostring, Converting to a String))
 
 $(P In many cases, it is desirable to convert an IES to a $(D string). The
-Phobos function $(D std.conv.text) can convert the IES to a $(D string) for use
+Phobos function $(REF text, std.conv) can convert the IES to a $(D string) for use
 in any context where a string is needed, for instance to assign to a string
 variable, or call a function that accepts a string.)
 
@@ -177,4 +225,4 @@ $(SPEC_SUBNAV_PREV_NEXT lex, Lexical, grammar, Grammar)
 
 Macros:
 CHAPTER = 3
-TITLE = Interpolation Expression Sequences
+TITLE = Interpolation Expression Sequence

spec/lex.dd

@@ -350,6 +350,8 @@ $(GNAME WysiwygCharacter):
                  // 'a', '"', 'b', '\', 'n'
         ---
 
+$(P See also $(GLINK2 istring, InterpolatedWysiwygLiteral))
+
 $(H3 $(LNAME2 double_quoted_strings, Double Quoted Strings))
 $(GRAMMAR_LEX
 $(GNAME DoubleQuotedString):
@@ -377,6 +379,9 @@ $(GNAME DoubleQuotedCharacter):
         "        // string is 3 characters,
                  // 'a', 'b', and a linefeed
         ---
+
+$(P See also $(GLINK2 istring, InterpolatedDoubleQuotedLiteral))
+
 $(H3 $(LNAME2 delimited_strings, Delimited Strings))
 $(GRAMMAR_LEX
 $(GNAME DelimitedString):
@@ -493,6 +498,8 @@ $(GNAME TokenStringToken):
                                 // __EOF__ is not a token, it's end of file
         ---
 
+$(P See also $(GLINK2 istring, InterpolatedTokenLiteral))
+
 $(H3 $(LNAME2 hex_strings, Hex Strings))
 $(GRAMMAR
 $(GNAME HexString):
@@ -655,8 +662,6 @@ $(UL
 $(P Otherwise, it resolves to the type with the smallest size it
     will fit into.)
 
-$(P For Interpolation Expression Sequences, see $(GLINK2 istring, InterpolationExpressionSequence).)
-
 $(H2 $(LNAME2 integerliteral, Integer Literals))
 
 $(GRAMMAR_LEX