Skip to content

[cpp, lex, over] Make bnf indentation in source match presentation. #2035

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
merged 1 commit into from
Apr 15, 2018
Merged

[cpp, lex, over] Make bnf indentation in source match presentation. #2035

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
18 changes: 9 additions & 9 deletions source/lex.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,15 +796,15 @@
%% Ed. note: character protrusion would misalign various operators.
\microtypesetup{protrusion=false}\obeyspaces
\nontermdef{preprocessing-op-or-punc} \textnormal{one of}\br
\terminal{\{ \} [ ] \# \#\# ( )}\br
\terminal{<: :> <\% \%> \%: \%:\%: ; : ...}\br
\terminal{new delete ? :: . .* -> ->* \~}\br
\terminal{! + - * / \% \caret{} \& |}\br
\terminal{= += -= *= /= \%= \caret{}= \&= |=}\br
\terminal{== != < > <= >= <=> \&\& ||}\br
\terminal{<< >> <<= >>= ++ -- ,}\br
\terminal{and or xor not bitand bitor compl}\br
\terminal{and_eq or_eq xor_eq not_eq}
\terminal{\{ \} [ ] \# \#\# ( )}\br
\terminal{<: :> <\% \%> \%: \%:\%: ; : ...}\br
\terminal{new delete ? :: . .* -> ->* \~}\br
\terminal{! + - * / \% \caret{} \& |}\br
\terminal{= += -= *= /= \%= \caret{}= \&= |=}\br
\terminal{== != < > <= >= <=> \&\& ||}\br
\terminal{<< >> <<= >>= ++ -- ,}\br
\terminal{and or xor not bitand bitor compl}\br
\terminal{and_eq or_eq xor_eq not_eq}
\end{bnf}

Each \grammarterm{preprocessing-op-or-punc} is converted to a single token
Expand Down
10 changes: 5 additions & 5 deletions source/overloading.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3077,11 +3077,11 @@
%% Ed. note: character protrusion would misalign various operators.
\microtypesetup{protrusion=false}\obeyspaces
\nontermdef{operator} \textnormal{one of}\br
\terminal{new delete new[] delete[] (\rlap{\,)} [\rlap{\,]} -> ->* \~}\br
\terminal{! + - * / \% \caret{} \& |}\br
\terminal{= += -= *= /= \%= \caret{}= \&= |=}\br
\terminal{== != < > <= >= <=> \&\& ||}\br
\terminal{<< >> <<= >>= ++ -- ,}\br
\terminal{new delete new[] delete[] (\rlap{\,)} [\rlap{\,]} -> ->* \~}\br
\terminal{! + - * / \% \caret{} \& |}\br
\terminal{= += -= *= /= \%= \caret{}= \&= |=}\br
\terminal{== != < > <= >= <=> \&\& ||}\br
\terminal{<< >> <<= >>= ++ -- ,}\br
\end{bnf}
\begin{note}
The last two operators are function call\iref{expr.call}
Expand Down
32 changes: 16 additions & 16 deletions source/preprocessor.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@

\begin{bnf}\obeyspaces
\nontermdef{control-line}\br
\terminal{\# include} pp-tokens new-line\br
\terminal{\# define } identifier replacement-list new-line\br
\terminal{\# define } identifier lparen \opt{identifier-list} \terminal{)} replacement-list new-line\br
\terminal{\# define } identifier lparen \terminal{... )} replacement-list new-line\br
\terminal{\# define } identifier lparen identifier-list \terminal{, ... )} replacement-list new-line\br
\terminal{\# undef } identifier new-line\br
\terminal{\# line } pp-tokens new-line\br
\terminal{\# error } \opt{pp-tokens} new-line\br
\terminal{\# pragma } \opt{pp-tokens} new-line\br
\terminal{\# }new-line
\terminal{\# include} pp-tokens new-line\br
\terminal{\# define } identifier replacement-list new-line\br
\terminal{\# define } identifier lparen \opt{identifier-list} \terminal{)} replacement-list new-line\br
\terminal{\# define } identifier lparen \terminal{... )} replacement-list new-line\br
\terminal{\# define } identifier lparen identifier-list \terminal{, ... )} replacement-list new-line\br
\terminal{\# undef } identifier new-line\br
\terminal{\# line } pp-tokens new-line\br
\terminal{\# error } \opt{pp-tokens} new-line\br
\terminal{\# pragma } \opt{pp-tokens} new-line\br
\terminal{\# }new-line
\end{bnf}

\begin{bnf}
Expand All @@ -68,9 +68,9 @@

\begin{bnf}\obeyspaces
\nontermdef{if-group}\br
\terminal{\# if } constant-expression new-line \opt{group}\br
\terminal{\# ifdef } identifier new-line \opt{group}\br
\terminal{\# ifndef } identifier new-line \opt{group}
\terminal{\# if } constant-expression new-line \opt{group}\br
\terminal{\# ifdef } identifier new-line \opt{group}\br
\terminal{\# ifndef } identifier new-line \opt{group}
\end{bnf}

\begin{bnf}
Expand All @@ -81,17 +81,17 @@

\begin{bnf}\obeyspaces
\nontermdef{elif-group}\br
\terminal{\# elif } constant-expression new-line \opt{group}
\terminal{\# elif } constant-expression new-line \opt{group}
\end{bnf}

\begin{bnf}\obeyspaces
\nontermdef{else-group}\br
\terminal{\# else } new-line \opt{group}
\terminal{\# else } new-line \opt{group}
\end{bnf}

\begin{bnf}\obeyspaces
\nontermdef{endif-line}\br
\terminal{\# endif } new-line
\terminal{\# endif } new-line
\end{bnf}

\begin{bnf}
Expand Down