Skip to content

Commit eecc61a

Browse files
ntrelthewilsonator
authored andcommitted
Restore GRAMMAR_INFORMATIVE macro
1 parent d69d8db commit eecc61a

File tree

8 files changed

+12
-14
lines changed

8 files changed

+12
-14
lines changed

book/dlang.org.ddoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ GLOSSARY = $(HTTP dlang.org/spec/glossary.html#$0, $0)
184184
GLOSSARY2 = $(HTTP dlang.org/spec/glossary.html#$1, $2)
185185
GNAME=<a id="$0">$(SPANC gname, $0)</a>
186186
GRAMMAR=$(TC pre, bnf notranslate, $0)
187-
INFORMATIVE_GRAMMAR=$(GRAMMAR $0)
187+
GRAMMAR_INFORMATIVE=$(GRAMMAR $0)
188188
GRAMMAR_LEX=$(GRAMMAR $0)
189189
GREEN=$(SPANC green, $0)
190190
GSELF=$(I $0)

dlang.org.ddoc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,11 @@ GLINK_LEX=$(DDSUBLINK spec/lex,$1,$(I $1))
184184
GLOSSARY = $(HTTP dlang.org/spec/glossary.html#$0, $0)
185185
GLOSSARY2 = $(HTTP dlang.org/spec/glossary.html#$1, $2)
186186
GNAME=<a id="$0">$(SPANC gname, $0)</a>
187-
188-
_=Any macro beginning with GRAMMAR will be picked up by ddoc/source/preprocessor.d
187+
_=
189188
GRAMMAR=$(TC pre, bnf notranslate, $0)
190-
INFORMATIVE_GRAMMAR=$(GRAMMAR $0)
189+
GRAMMAR_INFORMATIVE=$(GRAMMAR $0)
191190
GRAMMAR_LEX=$(GRAMMAR $0)
192191
INLINE_GRAMMAR=$(TC tt, bnf notranslate, $0)
193-
194192
GREEN=$(SPANC green, $0)
195193
GSELF=$(I $0)
196194
GT=&gt;

spec/class.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1532,7 +1532,7 @@ $(GNAME AnonBaseClassList):
15321532

15331533
which is equivalent to:
15341534

1535-
$(INFORMATIVE_GRAMMAR
1535+
$(GRAMMAR_INFORMATIVE
15361536
$(D class) $(GLINK_LEX Identifier) $(D :) $(I AnonBaseClassList) $(I AggregateBody)
15371537
// ...
15381538
$(D new) $(I Identifier) $(I ConstructorArgs)

spec/expression.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3502,7 +3502,7 @@ void foo()
35023502

35033503
$(H4 $(LNAME2 is-parameter-list, Parameter List Forms))
35043504

3505-
$(INFORMATIVE_GRAMMAR
3505+
$(GRAMMAR_INFORMATIVE
35063506
$(D is $(LPAREN)) $(I Type) $(D :) $(I TypeSpecialization) $(D ,) $(GLINK2 template, TemplateParameterList) $(D $(RPAREN))
35073507
$(D is $(LPAREN)) $(I Type) $(D ==) $(I TypeSpecialization) $(D ,) $(GLINK2 template, TemplateParameterList) $(D $(RPAREN))
35083508
$(D is $(LPAREN)) $(I Type) $(I Identifier) $(D :) $(I TypeSpecialization) $(D ,) $(GLINK2 template, TemplateParameterList) $(D $(RPAREN))

spec/importc.dd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ int main()
415415

416416
$(P This is described in C11 7.6.1)
417417

418-
$(INFORMATIVE_GRAMMAR
418+
$(GRAMMAR_INFORMATIVE
419419
#pragma STDC FENV_ACCESS on-off-switch
420420

421421
on-off-switch:
@@ -650,7 +650,7 @@ _Static_assert(sizeof(A) == 1, "A should be size 1");
650650
$(H3 $(LNAME2 typeof, `typeof` Operator))
651651

652652
$(P The `typeof` operator may be used as a type specifier:)
653-
$(INFORMATIVE_GRAMMAR
653+
$(GRAMMAR_INFORMATIVE
654654
$(GNAME type-specifier):
655655
$(GNAME typeof-specifier)
656656

@@ -663,7 +663,7 @@ $(GNAME typeof-specifier):
663663

664664
$(P Modules can be imported with a $(I CImportDeclaration):)
665665

666-
$(INFORMATIVE_GRAMMAR
666+
$(GRAMMAR_INFORMATIVE
667667
$(GNAME CImportDeclaration):
668668
$(D __import) $(GLINK2 module, ImportList) $(D ;)
669669
)

spec/simd.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import core.simd;
5555

5656
$(P The types defined will all follow the naming convention:)
5757

58-
$(INFORMATIVE_GRAMMAR
58+
$(GRAMMAR_INFORMATIVE
5959
$(I typeNN)
6060
)
6161
where $(I type) is the vector element type and $(I NN) is the number

spec/statement.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ $(H3 $(LNAME2 foreach_over_struct_and_classes, Foreach over Structs and Classes
723723
These functions must each have the signature below:
724724
)
725725

726-
$(INFORMATIVE_GRAMMAR
726+
$(GRAMMAR_INFORMATIVE
727727
$(GNAME OpApplyDeclaration):
728728
`int opApply` `(` `scope` `int delegate` `(` $(I OpApplyParameters) `)` `dg` `)` `;`
729729

spec/type.dd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ $(H2 $(LNAME2 functions, Function Types))
660660

661661
$(P A function type has the form:)
662662

663-
$(INFORMATIVE_GRAMMAR
663+
$(GRAMMAR_INFORMATIVE
664664
$(GLINK2 declaration, StorageClasses)$(OPT) $(GLINK Type) $(GLINK2 function, Parameters) $(GLINK2 function, FunctionAttributes)$(OPT)
665665
)
666666

@@ -671,7 +671,7 @@ A function type is only used for type tests or as the target type of a pointer.)
671671
$(P Instantiating a function type is illegal. Instead, a pointer to function
672672
or delegate can be used. Those have these type forms respectively:)
673673

674-
$(INFORMATIVE_GRAMMAR
674+
$(GRAMMAR_INFORMATIVE
675675
$(GLINK Type) `function` $(GLINK2 function, Parameters) $(GLINK2 function, FunctionAttributes)$(OPT)
676676
$(GLINK Type) `delegate` $(GLINK2 function, Parameters) $(GLINK2 function, MemberFunctionAttributes)$(OPT)
677677
)

0 commit comments

Comments
 (0)