CWG2629 Variables of floating-point type as switch conditions

Author: burblebee

source/statements.tex

@@ -100,11 +100,8 @@
 declared variable
 contextually converted to \tcode{bool}\iref{conv}.
 If that
-conversion is ill-formed, the program is ill-formed. The value of a
-\grammarterm{condition} that is an initialized declaration in a
-\keyword{switch} statement is the value of the declared variable if it has
-integral or enumeration type, or of that variable implicitly converted
-to integral or enumeration type otherwise. The value of a
+conversion is ill-formed, the program is ill-formed.
+The value of a
 \grammarterm{condition} that is an expression is the value of the
 expression, contextually converted to \tcode{bool}
 for statements other
@@ -412,7 +409,11 @@
 several statements depending on the value of a condition.
 
 \pnum
-The condition shall be of integral type, enumeration type, or class
+The value of a \grammarterm{condition}
+that is an initialized declaration
+is the value of the declared variable,
+or the value of the \grammarterm{expression} otherwise.
+The value of the condition shall be of integral type, enumeration type, or class
 type. If of class type, the
 condition is contextually implicitly converted\iref{conv} to
 an integral or enumeration type.