[basic.namespace] - C++23 → Trunk

Files changed (1) hide show

tmp/tmp4clj96xm/{from.md → to.md} +24 -12

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

@@ -180,13 +180,13 @@ namespace unique '{' namespace-body '}'
 ```
 where `inline` appears if and only if it appears in the
 *unnamed-namespace-definition* and all occurrences of *`unique`* in a
 translation unit are replaced by the same identifier, and this
-identifier differs from all other identifiers in the translation unit.
-The optional *attribute-specifier-seq* in the
-*unnamed-namespace-definition* appertains to *`unique`*.
 [*Example 1*:
 ``` cpp
 namespace { int i; }            // unique::i
@@ -210,59 +210,71 @@ void h() {
 — *end example*]
 ### Namespace alias <a id="namespace.alias">[[namespace.alias]]</a>
-A *namespace-alias-definition* declares an alternate name for a
-namespace according to the following grammar:
 ``` bnf
 namespace-alias:
         identifier
 ```
 ``` bnf
 namespace-alias-definition:
         namespace identifier '=' qualified-namespace-specifier ';'
 ```
 ``` bnf
 qualified-namespace-specifier:
     nested-name-specifierₒₚₜ namespace-name
 ```
 The *identifier* in a *namespace-alias-definition* becomes a
-*namespace-alias* and denotes the namespace denoted by the
-*qualified-namespace-specifier*.
 [*Note 1*: When looking up a *namespace-name* in a
 *namespace-alias-definition*, only namespace names are considered, see
 [[basic.lookup.udir]]. — *end note*]
 ### Using namespace directive <a id="namespace.udir">[[namespace.udir]]</a>
 ``` bnf
 using-directive:
     attribute-specifier-seqₒₚₜ using namespace nested-name-specifierₒₚₜ namespace-name ';'
 ```
 A *using-directive* shall not appear in class scope, but may appear in
 namespace scope or in block scope.
 [*Note 1*: When looking up a *namespace-name* in a *using-directive*,
 only namespace names are considered, see
 [[basic.lookup.udir]]. — *end note*]
 The optional *attribute-specifier-seq* appertains to the
 *using-directive*.
-[*Note 2*: A *using-directive* makes the names in the nominated
 namespace usable in the scope in which the *using-directive* appears
 after the *using-directive* [[basic.lookup.unqual]], [[namespace.qual]].
 During unqualified name lookup, the names appear as if they were
 declared in the nearest enclosing namespace which contains both the
-*using-directive* and the nominated namespace. — *end note*]
 [*Note 3*: A *using-directive* does not introduce any
 names. — *end note*]
 [*Example 1*:
@@ -296,13 +308,13 @@ void f4() {
 ```
 — *end example*]
 [*Note 4*: A *using-directive* is transitive: if a scope contains a
-*using-directive* that nominates a namespace that itself contains
-*using-directive*s, the namespaces nominated by those *using-directive*s
-are also eligible to be considered. — *end note*]
 [*Example 2*:
 ``` cpp
 namespace M {

 ```
 where `inline` appears if and only if it appears in the
 *unnamed-namespace-definition* and all occurrences of *`unique`* in a
 translation unit are replaced by the same identifier, and this
+identifier differs from all other identifiers in the program. The
+optional *attribute-specifier-seq* in the *unnamed-namespace-definition*
+appertains to *`unique`*.
 [*Example 1*:
 ``` cpp
 namespace { int i; }            // unique::i
 — *end example*]
 ### Namespace alias <a id="namespace.alias">[[namespace.alias]]</a>
+A *namespace-alias-definition* declares a *namespace alias* according to
+the following grammar:
 ``` bnf
 namespace-alias:
         identifier
 ```
 ``` bnf
 namespace-alias-definition:
         namespace identifier '=' qualified-namespace-specifier ';'
+        namespace identifier '=' splice-specifier ';'
 ```
 ``` bnf
 qualified-namespace-specifier:
     nested-name-specifierₒₚₜ namespace-name
 ```
+The *splice-specifier* (if any) shall designate a namespace that is not
+the global namespace.
 The *identifier* in a *namespace-alias-definition* becomes a
+*namespace-alias*.
+The underlying entity [[basic.pre]] of the namespace alias is the
+namespace either denoted by the *qualified-namespace-specifier* or
+designated by the *splice-specifier*.
 [*Note 1*: When looking up a *namespace-name* in a
 *namespace-alias-definition*, only namespace names are considered, see
 [[basic.lookup.udir]]. — *end note*]
 ### Using namespace directive <a id="namespace.udir">[[namespace.udir]]</a>
 ``` bnf
 using-directive:
     attribute-specifier-seqₒₚₜ using namespace nested-name-specifierₒₚₜ namespace-name ';'
+    attribute-specifier-seqₒₚₜ using namespace splice-specifier ';'
 ```
+The *splice-specifier* (if any) shall designate a namespace that is not
+the global namespace. The *nested-name-specifier*, *namespace-name*, and
+*splice-specifier* shall not be dependent.
 A *using-directive* shall not appear in class scope, but may appear in
 namespace scope or in block scope.
 [*Note 1*: When looking up a *namespace-name* in a *using-directive*,
 only namespace names are considered, see
 [[basic.lookup.udir]]. — *end note*]
 The optional *attribute-specifier-seq* appertains to the
 *using-directive*.
+[*Note 2*: A *using-directive* makes the names in the designated
 namespace usable in the scope in which the *using-directive* appears
 after the *using-directive* [[basic.lookup.unqual]], [[namespace.qual]].
 During unqualified name lookup, the names appear as if they were
 declared in the nearest enclosing namespace which contains both the
+*using-directive* and the designated namespace. — *end note*]
 [*Note 3*: A *using-directive* does not introduce any
 names. — *end note*]
 [*Example 1*:
 ```
 — *end example*]
 [*Note 4*: A *using-directive* is transitive: if a scope contains a
+*using-directive* that designates a namespace that itself contains
+*using-directive*s, the namespaces designated by those
+*using-directive*s are also eligible to be considered. — *end note*]
 [*Example 2*:
 ``` cpp
 namespace M {

Diff to HTML by rtfpessoa