(alx-0014r6-D) Refactor syntax of conditional directives

Signed-off-by: Alejandro Colomar <[email protected]>

Author: alejandro-colomar

source/preprocessor.tex

@@ -59,40 +59,6 @@
     \terminal{\# }new-line
 \end{bnf}
 
-\begin{bnf}
-\nontermdef{if-section}\br
-    if-group \opt{elif-groups} \opt{else-group} endif-line
-\end{bnf}
-
-\begin{bnf}
-\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}
-\end{bnf}
-
-\begin{bnf}
-\nontermdef{elif-groups}\br
-    elif-group \opt{elif-groups}
-\end{bnf}
-
-\begin{bnf}
-\nontermdef{elif-group}\br
-    \terminal{\# elif \ \ \ } constant-expression new-line \opt{group}\br
-    \terminal{\# elifdef } identifier new-line \opt{group}\br
-    \terminal{\# elifndef} identifier new-line \opt{group}
-\end{bnf}
-
-\begin{bnf}
-\nontermdef{else-group}\br
-    \terminal{\# else \ \ } new-line \opt{group}
-\end{bnf}
-
-\begin{bnf}
-\nontermdef{endif-line}\br
-    \terminal{\# endif \ } new-line
-\end{bnf}
-
 \begin{bnf}
 \nontermdef{text-line}\br
     \opt{pp-tokens} new-line
@@ -275,6 +241,40 @@
 \indextext{preprocessing directive!conditional inclusion}%
 \indextext{inclusion!conditional|see{preprocessing directive, conditional inclusion}}
 
+\begin{bnf}
+\nontermdef{if-section}\br
+    if-group \opt{elif-groups} \opt{else-group} endif-line
+\end{bnf}
+
+\begin{bnf}
+\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}
+\end{bnf}
+
+\begin{bnf}
+\nontermdef{elif-groups}\br
+    elif-group \opt{elif-groups}
+\end{bnf}
+
+\begin{bnf}
+\nontermdef{elif-group}\br
+    \terminal{\# elif \ \ \ } constant-expression new-line \opt{group}\br
+    \terminal{\# elifdef } identifier new-line \opt{group}\br
+    \terminal{\# elifndef} identifier new-line \opt{group}
+\end{bnf}
+
+\begin{bnf}
+\nontermdef{else-group}\br
+    \terminal{\# else \ \ } new-line \opt{group}
+\end{bnf}
+
+\begin{bnf}
+\nontermdef{endif-line}\br
+    \terminal{\# endif \ } new-line
+\end{bnf}
+
 \indextext{\idxcode{defined}}%
 \begin{bnf}
 \nontermdef{defined-macro-expression}\br