Merge pull request #2504 from MartinNowak/fix_lex_links_in_grammar

fix lex links in grammar overview

Author: MartinNowak

dlang.org.ddoc

@@ -176,6 +176,7 @@ GEN_DATETIME=$(DATETIME)
 GLINK=$(RELATIVE_LINK2 $0, $(I $0))
 GLINK2=$(DDSUBLINK spec/$1,$2,$(I $2))
 GLINK2_ALTTEXT=$(DDSUBLINK spec/$1,$2,$(I $3))
+GLINK_LEX=$(DDSUBLINK spec/lex,$1,$(I $1))
 GLOSSARY = $(HTTP dlang.org/glossary.html#$0, $0)
 GLOSSARY2 = $(HTTP dlang.org/glossary.html#$1, $2)
 GNAME=<a id="$0">$(SPANC gname, $0)</a>

ebook.ddoc

@@ -50,6 +50,7 @@ _=
 
 GLINK2=$(GLINK $2)
 GLINK2_ALTTEXT=$(RELATIVE_LINK2 $2, $3)
+GLINK_LEX=$(GLINK $1)
 DDLINK=$(RELATIVE_LINK2 $2, $3)
 DDSUBLINK=$(RELATIVE_LINK2 $2, $3)
 DPLLINK=$(LINK2 https://dlang.org/$1, $2)

spec/entity.dd

@@ -6,7 +6,7 @@ $(HEADERNAV_TOC)
 
 $(GRAMMAR
 $(GNAME NamedCharacterEntity):
-    $(CODE_AMP) $(GLINK2 lex, Identifier) $(D ;)
+    $(CODE_AMP) $(GLINK_LEX Identifier) $(D ;)
 )
 
         $(P The full list of named character entities from the

spec/expression.dd

@@ -1121,8 +1121,8 @@ $(GNAME PrimaryExpression):
     $(D true)
     $(D false)
     $(D $)
-    $(GLINK2 lex, IntegerLiteral)
-    $(GLINK2 lex, FloatLiteral)
+    $(GLINK_LEX IntegerLiteral)
+    $(GLINK_LEX FloatLiteral)
     $(GLINK CharacterLiteral)
     $(GLINK StringLiterals)
     $(GLINK ArrayLiteral)
@@ -1232,8 +1232,8 @@ $(H3 $(LNAME2 string_literals, String Literals))
 
 $(GRAMMAR
 $(GNAME StringLiterals):
-    $(GLINK2 lex, StringLiteral)
-    $(I StringLiterals) $(GLINK2 lex, StringLiteral)
+    $(GLINK_LEX StringLiteral)
+    $(I StringLiterals) $(GLINK_LEX StringLiteral)
 )
 
     $(P String literals can implicitly convert to any
@@ -2208,7 +2208,7 @@ $(SPEC_SUBNAV_PREV_NEXT pragma, Pragmas, statement, Statements)
 Macros:
         CHAPTER=10
         TITLE=Expressions
-        IDENTIFIER=$(GLINK2 lex, Identifier)
+        IDENTIFIER=$(GLINK_LEX Identifier)
         USUAL_ARITHMETIC_CONVERSIONS=$(DDSUBLINK spec/type, usual-arithmetic-conversions, Usual Arithmetic Conversions)
         INTEGER_PROMOTIONS=$(DDSUBLINK spec/type, integer-promotions, Integer Promotions)
         _=

spec/grammar.dd

@@ -28,6 +28,5 @@ Macros:
         PSCURLY_PSSCOPE=$(GLINK ScopeBlockStatement)
         PSCURLYSCOPE=$(GLINK NonEmptyOrScopeBlockStatement)
         TRAITS_LINK2=$(LINK2 traits.html#$1, $(D $1))
-        GLINK_LEX=$(GLINK2 lex, $1)
         GLINK2=$(GLINK $2)
         GRAMMAR_SUMMARY=$0

spec/iasm.dd

@@ -73,12 +73,12 @@ $(GNAME AsmInstruction):
     $(D df) $(I Operands)
     $(D dd) $(I Operands)
     $(D de) $(I Operands)
-    $(D db) $(GLINK2 lex, StringLiteral)
-    $(D ds) $(GLINK2 lex, StringLiteral)
-    $(D di) $(GLINK2 lex, StringLiteral)
-    $(D dl) $(GLINK2 lex, StringLiteral)
-    $(D dw) $(GLINK2 lex, StringLiteral)
-    $(D dq) $(GLINK2 lex, StringLiteral)
+    $(D db) $(GLINK_LEX StringLiteral)
+    $(D ds) $(GLINK_LEX StringLiteral)
+    $(D di) $(GLINK_LEX StringLiteral)
+    $(D dl) $(GLINK_LEX StringLiteral)
+    $(D dw) $(GLINK_LEX StringLiteral)
+    $(D dq) $(GLINK_LEX StringLiteral)
     $(I Opcode)
     $(I Opcode Operands)
 
@@ -109,7 +109,7 @@ $(H2 $(LNAME2 align, align $(I IntegerExpression)))
 
 $(GRAMMAR
 $(GNAME IntegerExpression):
-    $(GLINK2 lex, IntegerLiteral)
+    $(GLINK_LEX IntegerLiteral)
     $(I Identifier)
 )
 
@@ -336,8 +336,8 @@ $(GNAME AsmUnaExp):
     $(I AsmPrimaryExp)
 
 $(GNAME AsmPrimaryExp):
-    $(GLINK2 lex, IntegerLiteral)
-    $(GLINK2 lex, FloatLiteral)
+    $(GLINK_LEX IntegerLiteral)
+    $(GLINK_LEX FloatLiteral)
     $(D __LOCAL_SIZE)
     $(D $)
     $(GLINK Register)

spec/intro.dd

@@ -35,7 +35,7 @@ $(OL
         The source file is divided up into a sequence of tokens.
         $(DDSUBLINK spec/lex, specialtokens, Special tokens)
         are replaced with other tokens.
-        $(GLINK2 lex, SpecialTokenSequence)s
+        $(GLINK_LEX SpecialTokenSequence)s
         are processed and removed.
         )
 

spec/latex.ddoc

@@ -94,6 +94,7 @@ _=
 GLINK=$(LINK2 $0, $(I $0))
 GLINK2=$(GLINK $2)
 GLINK2_ALTTEXT=$(LINK2 $2, $(I $3))
+GLINK_LEX=$(GLINK $1)
 GNAME={\fontshape{sl}\selectfont $0}
 _=
 

spec/module.dd

@@ -115,7 +115,7 @@ $(GNAME PackageName):
 
 $(P The $(I Identifier)s preceding the rightmost are the $(I Packages) that the
 module is in. The packages correspond to directory names in the source file
-path. Package and module names cannot be $(GLINK2 lex, Keyword)s.)
+path. Package and module names cannot be $(GLINK_LEX Keyword)s.)
 
 $(P If present, the $(I ModuleDeclaration) appears syntactically first in the
 source file, and there can be only one per source file.)
@@ -178,7 +178,7 @@ import foo;  // Deprecated: module foo is deprecated - Please use foo2 instead.
     characters lower case letters, digits or `_` to ensure maximum portability and compatibility with
     various file systems.)
     $(LI The file names for packages and modules should also be composed of
-    the ASCII characters lower case letters, digits or `_` and should not be a $(GLINK2 lex, Keyword).)
+    the ASCII characters lower case letters, digits or `_` and should not be a $(GLINK_LEX Keyword).)
     ))
 
 $(H2 $(LEGACY_LNAME2 ImportDeclaration, import-declaration, Import Declaration))
@@ -208,11 +208,11 @@ $(GNAME ImportBindList):
     $(GLINK ImportBind) $(D ,) $(I ImportBindList)
 
 $(GNAME ImportBind):
-    $(GLINK2 lex, Identifier)
-    $(GLINK2 lex, Identifier) = $(I Identifier)
+    $(GLINK_LEX Identifier)
+    $(GLINK_LEX Identifier) = $(I Identifier)
 
 $(GNAME ModuleAliasIdentifier):
-    $(GLINK2 lex, Identifier)
+    $(GLINK_LEX Identifier)
 )
 
 $(P There are several forms of the $(I ImportDeclaration), from generalized to

spec/template.dd

@@ -89,10 +89,10 @@ $(GNAME SymbolTail):
 $(GNAME TemplateSingleArgument):
     $(I Identifier)
     $(GLINK2 declaration, BasicTypeX)
-    $(GLINK2 lex, CharacterLiteral)
-    $(GLINK2 lex, StringLiteral)
-    $(GLINK2 lex, IntegerLiteral)
-    $(GLINK2 lex, FloatLiteral)
+    $(GLINK_LEX CharacterLiteral)
+    $(GLINK_LEX StringLiteral)
+    $(GLINK_LEX IntegerLiteral)
+    $(GLINK_LEX FloatLiteral)
     $(D true)
     $(D false)
     $(D null)