Skip to content

Commit 6e50ed8

Browse files
committed
Final pass of small fixes
1 parent a18a22c commit 6e50ed8

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

cpp23/aggregate_init.dot.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ subgraph cluster_aggregate_initialization {
4242

4343
// 3.2
4444
{
45-
YN_QUESTION_NODE(aggregate_explicit_is_init_list, "Is the initializer list an brace-enclosed initializer-list?", "[dcl.init.aggr]/3.2", aggregate_explicit_init_list_defn_n, aggregate_explicit_empty)
45+
YN_QUESTION_NODE(aggregate_explicit_is_init_list, "Is the initializer list a brace-enclosed initializer-list?", "[dcl.init.aggr]/3.2", aggregate_explicit_init_list_defn_n, aggregate_explicit_empty)
4646

4747
INSTRUCTION_NODE(aggregate_explicit_init_list_defn_n, "Let n be the number of elements in the initializer list.", "[dcl.init.aggr]/3.2")
4848
-> INSTRUCTION_NODE(aggregate_explicit_init_list, "The explicitly initialized elements are the first n elements of the aggregate.", "[dcl.init.aggr]/3.2")
@@ -95,8 +95,8 @@ subgraph cluster_aggregate_initialization {
9595
-> NEW_RECURSE_SUBOBJECT()
9696
-> aggregate_initialize_explicit_is_narrowing_checked_no_eq
9797

98-
YN_QUESTION_NODE(aggregate_initialize_explicit_is_narrowing_checked_no_eq, "Is the initializer of the form \"assignment-expression\"?", "[dcl.init.aggr]/4.2", aggregate_initialize_explicit_is_narrowing, aggregate_initialize_explicit_is_narrowing_checked_eq)
99-
YN_QUESTION_NODE(aggregate_initialize_explicit_is_narrowing_checked_eq, "Is the initializer of the form \"= assignment-expression\"?", "[dcl.init.aggr]/4.2", aggregate_initialize_explicit_is_narrowing, aggregate_initialize_explicit_repeat_next)
98+
YN_QUESTION_NODE(aggregate_initialize_explicit_is_narrowing_checked_no_eq, "Is that initializer of the form \"assignment-expression\"?", "[dcl.init.aggr]/4.2", aggregate_initialize_explicit_is_narrowing, aggregate_initialize_explicit_is_narrowing_checked_eq)
99+
YN_QUESTION_NODE(aggregate_initialize_explicit_is_narrowing_checked_eq, "Is that initializer of the form \"= assignment-expression\"?", "[dcl.init.aggr]/4.2", aggregate_initialize_explicit_is_narrowing, aggregate_initialize_explicit_repeat_next)
100100
YN_QUESTION_NODE(aggregate_initialize_explicit_is_narrowing, "Is a narrowing conversion required to convert the expression?", "[dcl.init.aggr]/4.2", NEW_ILL_FORMED(), aggregate_initialize_explicit_repeat_next)
101101
}
102102

cpp23/flowchart.dot.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ digraph initialization {
8787
YN_QUESTION_NODE(class_is_copy_init, "Is the initialization copy-initialization?", "[dcl.init.general]/16.6.2", class_is_copy_init_same_class, class_is_direct_init)
8888

8989
YN_QUESTION_NODE(class_is_copy_init_same_class, "Is the cv-unqualified version of the source type the same class as the class of the destination?", "[dcl.init.general]/16.6.2", class_consider_constructors, class_is_copy_init_derived_class)
90-
YN_QUESTION_NODE(class_is_copy_init_derived_class, "Is the cv-unqualified version of the source type a derived class of the destination type?", "[dcl.init.general]/16.6.2", class_consider_constructors, class_user_defined_conv_head)
90+
YN_QUESTION_NODE(class_is_copy_init_derived_class, "Is the cv-unqualified version of the source type a derived class of the class of the destination?", "[dcl.init.general]/16.6.2", class_consider_constructors, class_user_defined_conv_head)
9191

9292
INSTRUCTION_NODE(class_is_direct_init, "The initialization is direct-initialization.", "[dcl.init.general]/16.6.2")
9393
class_is_direct_init -> class_consider_constructors
@@ -148,10 +148,7 @@ digraph initialization {
148148
-> INSTRUCTION_NODE(class_source_overload_resolution, "Use overload resolution to select the best applicable conversion function.")
149149
-> class_source_conversion_is_impossible
150150

151-
YN_QUESTION_NODE_NO_CITE(class_source_conversion_is_impossible, "Is the conversion impossible?", class_source_conversion_ill_formed, class_source_conversion_is_ambiguous)
152-
YN_QUESTION_NODE_NO_CITE(class_source_conversion_is_ambiguous, "Is the conversion ambiguous?", class_source_conversion_ill_formed, class_source_initialize)
153-
154-
ILL_FORMED_NODE(class_source_conversion_ill_formed)
151+
YN_QUESTION_NODE_NO_CITE(class_source_conversion_is_impossible, "Is the conversion ambiguous or impossible?", NEW_ILL_FORMED(), class_source_initialize)
155152

156153
INSTRUCTION_NODE(class_source_initialize, "Call the selected user-defined conversion to convert the initializer expression into the object being initialized.")
157154
-> NEW_DONE()

cpp23/list_init.dot.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ subgraph list_initialization {
8888

8989
YN_QUESTION_NODE_NO_CITE(list_initializer_list_is_narrowing, "Is a narrowing conversion required to initialize any of the elements?", NEW_ILL_FORMED(), list_initializer_list_init_object)
9090

91-
INSTRUCTION_NODE(list_initializer_list_init_object, "The initializer_list is constructed to refer to the materialized array.")
91+
INSTRUCTION_NODE(list_initializer_list_init_object, "Construct the initializer_list to refer to the materialized array.")
9292
-> NEW_DONE()
9393
}
9494

@@ -135,7 +135,7 @@ subgraph list_initialization {
135135
-> list_final_singleton_is_dest_ref
136136

137137
YN_QUESTION_NODE(list_final_singleton_is_dest_ref, "Is T a reference type?", "[dcl.init.list]/3.9", list_final_singleton_is_dest_ref_related, list_final_singleton_type)
138-
YN_QUESTION_NODE(list_final_singleton_is_dest_ref_related, "Is the T's referenced type reference-related to E?", "[dcl.init.list]/3.9", list_final_singleton_type, list_ref_prvalue_is_ref)
138+
YN_QUESTION_NODE(list_final_singleton_is_dest_ref_related, "Is T's referenced type reference-related to E?", "[dcl.init.list]/3.9", list_final_singleton_type, list_ref_prvalue_is_ref)
139139

140140
QUESTION_NODE(list_final_singleton_type, "What is the type of initialization?", "[dcl.init.list]/3.9")
141141
list_final_singleton_type -> list_final_singleton_direct [label="direct-list-initialization"]
@@ -159,9 +159,9 @@ subgraph list_initialization {
159159
INSTRUCTION_NODE(list_ref_prvalue_prvalue_generated, "Generate a prvalue.", "[dcl.init.list]/3.10")
160160
-> list_ref_prvalue_type_is_unknown_bound
161161

162-
YN_QUESTION_NODE(list_ref_prvalue_type_is_unknown_bound, "Is the destination type \"referencce to array of unknown bound of U\"?", "[dcl.init.list]/3.10", list_ref_prvalue_type_unknown_bound, list_ref_prvalue_type_normal)
162+
YN_QUESTION_NODE(list_ref_prvalue_type_is_unknown_bound, "Is T \"reference to array of unknown bound of U\"?", "[dcl.init.list]/3.10", list_ref_prvalue_type_unknown_bound, list_ref_prvalue_type_normal)
163163

164-
INSTRUCTION_NODE(list_ref_prvalue_type_normal, "The type of the prvalue is the type referenced by the destination type.", "[dcl.init.list]/3.10")
164+
INSTRUCTION_NODE(list_ref_prvalue_type_normal, "The type of the prvalue is the type referenced by T.", "[dcl.init.list]/3.10")
165165
-> list_ref_prvalue_init_prvalue
166166

167167
INSTRUCTION_NODE(list_ref_prvalue_type_unknown_bound, "The type of the prvalue is the type of x in U x[] H, where H is the initializer list.", "[dcl.init.list]/3.10")

cpp23/reference_init.dot.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ subgraph cluster_reference_initialization {
103103
{
104104
INSTRUCTION_NODE(reference_temp_implicit_conv, "The initializer expression is implicitly converted to a prvalue of type \"T1\".", "[dcl.init.ref]/5.4.2")
105105
-> INSTRUCTION_NODE(reference_temp_implicit_conv_materialize, "Apply the temporary materialization conversion to the prvalue, considering the type of the prvalue to be \"cv1 T1\".", "[dcl.init.ref]/5.4.2")
106-
-> INSTRUCTION_NODE(reference_temp_implicit_conv_materialize_bind, "Bind reference to the result.", "[dcl.init.ref]/5.4.2")
106+
-> INSTRUCTION_NODE(reference_temp_implicit_conv_materialize_bind, "Bind the reference to the result.", "[dcl.init.ref]/5.4.2")
107107
-> reference_temp_implicit_conv_is_reference_related
108108
}
109109

0 commit comments

Comments
 (0)