[cpp] - C++11 → C++14

Files changed (1) hide show

tmp/tmp7voerwuu/{from.md → to.md} +20 -20

tmp/tmp7voerwuu/{from.md → to.md} RENAMED Viewed

@@ -25,11 +25,11 @@ group:
 ``` bnf
 group-part:
     if-section
     control-line
     text-line
- \# non-directive
 ```
 ``` bnf
 if-section:
     if-group elif-groupsₒₚₜ else-groupₒₚₜ endif-line
@@ -229,14 +229,14 @@ A preprocessing directive of the form
 '# include' pp-tokens new-line
 ```
 (that does not match one of the two previous forms) is permitted. The
 preprocessing tokens after `include` in the directive are processed just
-as in normal text (Each identifier currently defined as a macro name is
-replaced by its replacement list of preprocessing tokens.). If the
-directive resulting after all replacements does not match one of the two
-previous forms, the behavior is undefined.[^7] The method by which a
 sequence of preprocessing tokens between a `<` and a `>` preprocessing
 token pair or a pair of `"` characters is combined into a single header
 name preprocessing token is *implementation-defined*.
 The implementation shall provide unique mappings for sequences
@@ -358,16 +358,16 @@ macro. The individual arguments within the list are separated by comma
 preprocessing tokens, but comma preprocessing tokens between matching
 inner parentheses do not separate arguments. If there are sequences of
 preprocessing tokens within the list of arguments that would otherwise
 act as preprocessing directives,[^10] the behavior is undefined.
-If there is a `...` in the identifier-list in the macro definition, then
-the trailing arguments, including any separating comma preprocessing
-tokens, are merged to form a single item: the variable arguments. The
-number of arguments so combined is such that, following merger, the
-number of arguments is one more than the number of parameters in the
-macro definition (excluding the `...`).
 ### Argument substitution <a id="cpp.subst">[[cpp.subst]]</a>
 After the arguments for the invocation of a function-like macro have
 been identified, argument substitution takes place. A parameter in the
@@ -526,11 +526,11 @@ To illustrate the rules for redefinition and reexamination, the sequence
 #define f(a)    f(x * (a))
 #undef  x
 #define x       2
 #define g       f
 #define z       z[0]
-#define h       g(\sim
 #define m(a)    a(w)
 #define w       0,1
 #define t(a)    a
 #define p()     int
 #define q(x)    x
@@ -546,11 +546,11 @@ char c[2][6] = { str(hello), str() };
 results in
 ``` cpp
 f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1);
-f(2 * (2+(3,4)-0,1)) | f(2 * (\sim 5)) & f(2 * (0,1))^m(0,1);
 int i[] = { 1, 23, 4, 5, };
 char c[2][6] = { "hello", "" };
 ```
 To illustrate the rules for creating character string literals and
@@ -758,18 +758,18 @@ The presumed name of the current source file (a character string
 literal).[^13]
 - **`__LINE__`**
 The presumed line number (within the current source file) of the current
-source line (an integer constant).
 - **`__STDC_HOSTED__`**
-The integer constant `1` if the implementation is a hosted
-implementation or the integer constant `0` if it is not.
 - **`__TIME__`**
 The time of translation of the source file: a character string literal
 of the form `"hh:mm:ss"` as in the time generated by the `asctime`
@@ -784,11 +784,11 @@ implementation:
 Whether \_\_STDC\_\_ is predefined and if so, what its value is, are
 *implementation-defined*.
 - **`__STDC_MB_MIGHT_NEQ_WC__`**
-The integer constant `1`, intended to indicate that, in the encoding for
 `wchar_t`, a member of the basic character set need not have a code
 value equal to its value when used as the lone character in an ordinary
 character literal.
 - **`__STDC_VERSION__`**
@@ -796,27 +796,27 @@ character literal.
 Whether \_\_STDC_VERSION\_\_ is predefined and if so, what its value is,
 are *implementation-defined*.
 - **`__STDC_ISO_10646__`**
-An integer constant of the form `yyyymmL` (for example, `199712L`). If
 this symbol is defined, then every character in the Unicode required
 set, when stored in an object of type `wchar_t`, has the same value as
 the short identifier of that character. The *Unicode required set*
 consists of all the characters that are defined by ISO/IEC 10646, along
 with all amendments and technical corrigenda as of the specified year
 and month.
 - **`__STDCPP_STRICT_POINTER_SAFETY__`**
-Defined, and has the value integer constant 1, if and only if the
 implementation has strict pointer safety (
 [[basic.stc.dynamic.safety]]).
 - **`__STDCPP_THREADS__`**
-Defined, and has the value integer constant 1, if and only if a program
 can have more than one thread of execution ([[intro.multithread]]).
 The values of the predefined macros (except for `__FILE__` and
 `__LINE__`) remain constant throughout the translation unit.

 ``` bnf
 group-part:
     if-section
     control-line
     text-line
+ '#' non-directive
 ```
 ``` bnf
 if-section:
     if-group elif-groupsₒₚₜ else-groupₒₚₜ endif-line
 '# include' pp-tokens new-line
 ```
 (that does not match one of the two previous forms) is permitted. The
 preprocessing tokens after `include` in the directive are processed just
+as in normal text (i.e., each identifier currently defined as a macro
+name is replaced by its replacement list of preprocessing tokens). If
+the directive resulting after all replacements does not match one of the
+two previous forms, the behavior is undefined.[^7] The method by which a
 sequence of preprocessing tokens between a `<` and a `>` preprocessing
 token pair or a pair of `"` characters is combined into a single header
 name preprocessing token is *implementation-defined*.
 The implementation shall provide unique mappings for sequences
 preprocessing tokens, but comma preprocessing tokens between matching
 inner parentheses do not separate arguments. If there are sequences of
 preprocessing tokens within the list of arguments that would otherwise
 act as preprocessing directives,[^10] the behavior is undefined.
+If there is a `...` immediately preceding the `)` in the function-like
+macro definition, then the trailing arguments, including any separating
+comma preprocessing tokens, are merged to form a single item: the
+*variable arguments*. The number of arguments so combined is such that,
+following merger, the number of arguments is one more than the number of
+parameters in the macro definition (excluding the `...`).
 ### Argument substitution <a id="cpp.subst">[[cpp.subst]]</a>
 After the arguments for the invocation of a function-like macro have
 been identified, argument substitution takes place. A parameter in the
 #define f(a)    f(x * (a))
 #undef  x
 #define x       2
 #define g       f
 #define z       z[0]
+#define h       g(~
 #define m(a)    a(w)
 #define w       0,1
 #define t(a)    a
 #define p()     int
 #define q(x)    x
 results in
 ``` cpp
 f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1);
+f(2 * (2+(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1);
 int i[] = { 1, 23, 4, 5, };
 char c[2][6] = { "hello", "" };
 ```
 To illustrate the rules for creating character string literals and
 literal).[^13]
 - **`__LINE__`**
 The presumed line number (within the current source file) of the current
+source line (an integer literal).
 - **`__STDC_HOSTED__`**
+The integer literal `1` if the implementation is a hosted implementation
+or the integer literal `0` if it is not.
 - **`__TIME__`**
 The time of translation of the source file: a character string literal
 of the form `"hh:mm:ss"` as in the time generated by the `asctime`
 Whether \_\_STDC\_\_ is predefined and if so, what its value is, are
 *implementation-defined*.
 - **`__STDC_MB_MIGHT_NEQ_WC__`**
+The integer literal `1`, intended to indicate that, in the encoding for
 `wchar_t`, a member of the basic character set need not have a code
 value equal to its value when used as the lone character in an ordinary
 character literal.
 - **`__STDC_VERSION__`**
 Whether \_\_STDC_VERSION\_\_ is predefined and if so, what its value is,
 are *implementation-defined*.
 - **`__STDC_ISO_10646__`**
+An integer literal of the form `yyyymmL` (for example, `199712L`). If
 this symbol is defined, then every character in the Unicode required
 set, when stored in an object of type `wchar_t`, has the same value as
 the short identifier of that character. The *Unicode required set*
 consists of all the characters that are defined by ISO/IEC 10646, along
 with all amendments and technical corrigenda as of the specified year
 and month.
 - **`__STDCPP_STRICT_POINTER_SAFETY__`**
+Defined, and has the value integer literal 1, if and only if the
 implementation has strict pointer safety (
 [[basic.stc.dynamic.safety]]).
 - **`__STDCPP_THREADS__`**
+Defined, and has the value integer literal 1, if and only if a program
 can have more than one thread of execution ([[intro.multithread]]).
 The values of the predefined macros (except for `__FILE__` and
 `__LINE__`) remain constant throughout the translation unit.

Diff to HTML by rtfpessoa