Skip to content
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.

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

[cpp.cond] Make defined and __has_include show up in Annex A #1467

Merged
merged 1 commit into from
Feb 15, 2017
Merged
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions source/preprocessor.tex
Original file line number Diff line number Diff line change
Expand Up @@ -188,31 +188,31 @@
\indextext{inclusion!conditional|see{preprocessing directive, conditional inclusion}}

\indextext{\idxcode{defined}}%
\begin{ncbnf}
\begin{bnf}
\nontermdef{defined-macro-expression}\br
\terminal{defined} identifier\br
\terminal{defined (} identifier \terminal{)}
\end{ncbnf}
\end{bnf}

\begin{ncbnf}
\begin{bnf}
\nontermdef{h-preprocessing-token}\br
\textnormal{any \grammarterm{preprocessing-token} other than \terminal{>}}
\end{ncbnf}
\end{bnf}

\begin{ncbnf}
\begin{bnf}
\nontermdef{h-pp-tokens}\br
h-preprocessing-token\br
h-pp-tokens h-preprocessing-token
\end{ncbnf}
\end{bnf}

\indextext{__HAS_INCLUDE@\xname{has_include}}%
\begin{ncbnf}
\begin{bnf}
\nontermdef{has-include-expression}\br
\terminal{\xname{has_include} ( <} h-char-sequence \terminal{> )}\br
\terminal{\xname{has_include} ( "} q-char-sequence \terminal{" )}\br
\terminal{\xname{has_include} (} string-literal \terminal{)}\br
\terminal{\xname{has_include} ( <} h-pp-tokens \terminal{> )}
\end{ncbnf}
\end{bnf}

\pnum
The expression that controls conditional inclusion
Expand Down