Skip to content

[spec] Tweak GRAMMAR_INLINE macro formatting #4328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thewilsonator merged 1 commit into from
Nov 23, 2025
Merged

[spec] Tweak GRAMMAR_INLINE macro formatting #4328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion book/dlang.org.ddoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ GNAME=<a id="$0">$(SPANC gname, $0)</a>
GRAMMAR=$(TC pre, bnf notranslate, $0)
GRAMMAR_INFORMATIVE=$(GRAMMAR $0)
GRAMMAR_LEX=$(GRAMMAR $0)
GRAMMAR_INLINE=$(TC tt, bnf notranslate, $0)
GRAMMAR_INLINE=$(TC tt, bnf_inline notranslate, $0)
GREEN=$(SPANC green, $0)
GSELF=$(I $0)
GT=&gt;
Expand Down
8 changes: 7 additions & 1 deletion css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ body, .d_decl .quickindex
font-family: "Roboto Slab", sans-serif;
}

pre, code, .tt, .d_inlinecode, td.param_id, .CodeMirror pre, .d_decl
pre, code, .tt, .d_inlinecode, .bnf_inline, td.param_id, .CodeMirror pre, .d_decl
{
font-family: Consolas, "Bitstream Vera Sans Mono", "Andale Mono", Monaco, "DejaVu Sans Mono", "Lucida Console", monospace;
}
Expand Down Expand Up @@ -1202,6 +1202,12 @@ body.dcompiler dt a.anchor:hover:before
background-color: white;
}

.bnf_inline
{
font-size: small;
background-color: #F5F5F5; /* differentiate grammar from paragraph punctuation */
}

.ddoccode
{
background-color: #f3eeee;
Expand Down
2 changes: 1 addition & 1 deletion dlang.org.ddoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ $(COMMENT GRAMMAR invocations will appear in spec/grammar.html, but NOT the suff
GRAMMAR=$(TC pre, bnf notranslate, $0)
GRAMMAR_INFORMATIVE=$(GRAMMAR $0)
GRAMMAR_LEX=$(GRAMMAR $0)
GRAMMAR_INLINE=$(TC tt, bnf notranslate, $0)
GRAMMAR_INLINE=$(TC tt, bnf_inline notranslate, $0)
GREEN=$(SPANC green, $0)
GSELF=$(I $0)
GT=&gt;
Expand Down
2 changes: 1 addition & 1 deletion spec/expression.dd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1911,7 +1911,7 @@ $(GNAME Slice):
The special variable `$` is declared and set to be the number
of elements in the $(I PostfixExpression) (when available).
A new declaration scope is created for the evaluation of the
$(GRAMMAR_INLINE *AssignExpression* .. *AssignExpression*) and `$` appears in
$(GRAMMAR_INLINE *AssignExpression* `..` *AssignExpression*) and `$` appears in
that scope only.
)

Expand Down
13 changes: 6 additions & 7 deletions spec/statement.dd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1808,16 +1808,15 @@ L1:
---
)

$(P The second form, $(CODE goto default;), transfers to the innermost $(GLINK
$(P The second form, $(GRAMMAR_INLINE `goto default`;), transfers to the innermost $(GLINK
DefaultStatement) of an enclosing $(GLINK SwitchStatement).)

$(P The third form, $(CODE goto case;), transfers to the
$(P The third form, $(GRAMMAR_INLINE `goto case`;), transfers to the
next $(GLINK CaseStatement) of the innermost enclosing
$(GLINK SwitchStatement).)

$(P The fourth form, $(CODE goto case) *Expression*$(D ;), transfers to the
$(GLINK CaseStatement) of the innermost enclosing
$(GLINK SwitchStatement)
$(P The fourth form, $(GRAMMAR_INLINE `goto case` *Expression*;), transfers to the
$(GLINK CaseStatement) of the innermost enclosing $(GLINK SwitchStatement)
with a matching *Expression*.)

$(SPEC_RUNNABLE_EXAMPLE_RUN
Expand All @@ -1842,15 +1841,15 @@ switch (x)
---
)

$(P Any intervening finally clauses are executed, along with releasing any
$(P Any intervening `finally` clauses are executed, along with releasing any
intervening synchronization mutexes.)

$(P It is illegal for a $(I GotoStatement) to be used to skip
initializations within its containing scope.)

$(BEST_PRACTICE Prefer using a higher-level control-flow construct
or a labelled $(GLINK BreakStatement)/$(GLINK ContinueStatement)
rather than the $(GRAMMAR_INLINE *`goto` Identifier;*) form.)
rather than the $(GRAMMAR_INLINE `goto` *Identifier*;) form.)


$(H2 $(LEGACY_LNAME2 WithStatement, with-statement, With Statement))
Expand Down