JP 04: [lex.icon] Consistently order descriptions of integer literals in

increasing radix order.

Fixes #368.

Author: zygoloid

source/lex.tex

@@ -799,16 +799,17 @@
 \indextext{literal!integer}%
 \begin{bnf}
 \nontermdef{integer-literal}\br
-    decimal-literal integer-suffix\opt\br
+    binary-literal integer-suffix\opt\br
     octal-literal integer-suffix\opt\br
-    hexadecimal-literal integer-suffix\opt\br
-    binary-literal integer-suffix\opt
+    decimal-literal integer-suffix\opt\br
+    hexadecimal-literal integer-suffix\opt
 \end{bnf}
 
 \begin{bnf}
-\nontermdef{decimal-literal}\br
-    nonzero-digit\br
-    decimal-literal \terminal{'}\opt digit
+\nontermdef{binary-literal}\br
+    \terminal{0b} binary-digit\br
+    \terminal{0B} binary-digit\br
+    binary-literal \terminal{'}\opt binary-digit
 \end{bnf}
 
 \begin{bnf}
@@ -817,6 +818,12 @@
     octal-literal \terminal{'}\opt octal-digit
 \end{bnf}
 
+\begin{bnf}
+\nontermdef{decimal-literal}\br
+    nonzero-digit\br
+    decimal-literal \terminal{'}\opt digit
+\end{bnf}
+
 \begin{bnf}
 \nontermdef{hexadecimal-literal}\br
     \terminal{0x} hexadecimal-digit\br
@@ -825,20 +832,19 @@
 \end{bnf}
 
 \begin{bnf}
-\nontermdef{binary-literal}\br
-    \terminal{0b} binary-digit\br
-    \terminal{0B} binary-digit\br
-    binary-literal \terminal{'}\opt binary-digit
+\nontermdef{binary-digit}\br
+    \terminal{0}\br
+    \terminal{1}
 \end{bnf}
 
 \begin{bnf}
-\nontermdef{nonzero-digit} \textnormal{one of}\br
-    \terminal{1  2  3  4  5  6  7  8  9}
+\nontermdef{octal-digit} \textnormal{one of}\br
+    \terminal{0  1  2  3  4  5  6  7}
 \end{bnf}
 
 \begin{bnf}
-\nontermdef{octal-digit} \textnormal{one of}\br
-    \terminal{0  1  2  3  4  5  6  7}
+\nontermdef{nonzero-digit} \textnormal{one of}\br
+    \terminal{1  2  3  4  5  6  7  8  9}
 \end{bnf}
 
 \begin{bnf}
@@ -848,12 +854,6 @@
     \terminal{A  B  C  D  E  F}
 \end{bnf}
 
-\begin{bnf}
-\nontermdef{binary-digit}\br
-    \terminal{0}\br
-    \terminal{1}
-\end{bnf}
-
 \begin{bnf}
 \nontermdef{integer-suffix}\br
     unsigned-suffix long-suffix\opt \br
@@ -881,26 +881,29 @@
 \indextext{literal!\idxcode{unsigned}}%
 \indextext{literal!\idxcode{long}}%
 \indextext{literal!integer}%
-\indextext{literal!hexadecimal}%
+\indextext{literal!binary}%
 \indextext{literal!octal}%
 \indextext{literal!decimal}%
-\indextext{literal!binary}%
+\indextext{literal!hexadecimal}%
 \indextext{literal!base~of integer}%
 An \term{integer literal} is a sequence of digits that has no period
 or exponent part, with optional separating single quotes that are ignored
 when determining its value. An integer literal may have a prefix that specifies
 its base and a suffix that specifies its type. The lexically first digit
-of the sequence of digits is the most significant. A \term{decimal}
-integer literal (base ten) begins with a digit other than \tcode{0} and
-consists of a sequence of decimal digits. An \term{octal} integer
+of the sequence of digits is the most significant.
+A \term{binary} integer literal (base two) begins with
+\tcode{0b} or \tcode{0B} and consists of a sequence of binary digits.
+An \term{octal} integer
 literal (base eight) begins with the digit \tcode{0} and consists of a
 sequence of octal digits.\footnote{The digits \tcode{8} and \tcode{9} are not octal digits. }
+A \term{decimal}
+integer literal (base ten) begins with a digit other than \tcode{0} and
+consists of a sequence of decimal digits.
 A \term{hexadecimal} integer literal (base sixteen) begins with
 \tcode{0x} or \tcode{0X} and consists of a sequence of hexadecimal
 digits, which include the decimal digits and the letters \tcode{a}
 through \tcode{f} and \tcode{A} through \tcode{F} with decimal values
-ten through fifteen. A \term{binary} integer literal (base two) begins with
-\tcode{0b} or \tcode{0B} and consists of a sequence of binary digits.
+ten through fifteen.
 \enterexample The number twelve can be written \tcode{12}, \tcode{014},
 \tcode{0XC}, or \tcode{0b1100}. The literals \tcode{1048576},
 \tcode{1'048'576}, \tcode{0X100000}, \tcode{0x10'0000}, and