Separate recursing for the destination and recursing for a subobject

Author: randomnetcat

cpp23/aggregate_init.dot.cpp

@@ -77,7 +77,7 @@ subgraph cluster_aggregate_initialization {
 
 			INSTRUCTION_NODE(aggregate_initialization_explicit_union_defn_d, "Let D be the designated-initializer-clause naming a member of the anonymous union member.", "[dcl.init.aggr]/4.1")
 			-> INSTRUCTION_NODE(aggregate_initialize_explicit_union_init, "Initialize the element with the braced-init-list { D }.")
-			-> NEW_RECURSE()
+			-> NEW_RECURSE_SUBOBJECT()
 			-> aggregate_initialize_explicit_repeat_next
 		}
 
@@ -88,11 +88,11 @@ subgraph cluster_aggregate_initialization {
 				aggregate_initialize_explicit_copy_kind -> aggregate_initialize_explicit_copy_designated [label="designated-initializer-list"]
 
 			INSTRUCTION_NODE(aggregate_initialize_explicit_copy_init_list, "Copy-initialize the element from the corresponding initializer-clause.", "[dcl.init.aggr]/4.2")
-			-> NEW_RECURSE()
+			-> NEW_RECURSE_SUBOBJECT()
 			-> aggregate_initialize_explicit_is_narrowing_checked
 
 			INSTRUCTION_NODE(aggregate_initialize_explicit_copy_designated, "Initialize the element with the brace-or-equal-initializer of the corresponding designated-initializer-clause.", "[dcl.init.aggr]/4.2")
-			-> NEW_RECURSE()
+			-> NEW_RECURSE_SUBOBJECT()
 			-> aggregate_initialize_explicit_is_narrowing_checked
 
 			YN_QUESTION_NODE(aggregate_initialize_explicit_is_narrowing_checked, "Is the initializer of the form \"assignment-expression\" or \"= assignment-expression\"?", "[dcl.init.aggr]/4.2", aggregate_initialize_explicit_is_narrowing, aggregate_initialize_explicit_repeat_next)
@@ -117,7 +117,7 @@ subgraph cluster_aggregate_initialization {
 			YN_QUESTION_NODE(aggregate_initialize_nonexplicit_nonunion_has_dflt_mem_init, "Does the element have a default member initializer?", "[dcl.init.aggr]/5.1", aggregate_initialize_nonexplicit_nonunion_dflt_mem_init, aggregate_initialize_nonexplicit_nonunion_is_reference)
 
 			INSTRUCTION_NODE(aggregate_initialize_nonexplicit_nonunion_dflt_mem_init, "The element is initialized from that initializer.", "[dcl.init.aggr]/5.1")
-			-> NEW_RECURSE()
+			-> NEW_RECURSE_SUBOBJECT()
 			-> aggregate_initialize_nonexplicit_nonunion_repeat_next
 		}
 
@@ -126,7 +126,7 @@ subgraph cluster_aggregate_initialization {
 			YN_QUESTION_NODE(aggregate_initialize_nonexplicit_nonunion_is_reference, "Is the element a reference?", "[dcl.init.aggr]/5.2", NEW_ILL_FORMED(), aggregate_initialize_nonexplicit_nonunion_copy_init)
 
 			INSTRUCTION_NODE(aggregate_initialize_nonexplicit_nonunion_copy_init, "The element is copy-initialized from an empty initializer list.", "[dcl.init.aggr]/5.2")
-			-> NEW_RECURSE()
+			-> NEW_RECURSE_SUBOBJECT()
 			-> aggregate_initialize_nonexplicit_nonunion_repeat_next
 		}
 
@@ -144,14 +144,14 @@ subgraph cluster_aggregate_initialization {
 			YN_QUESTION_NODE(aggregate_initialize_nonexplicit_union_empty_has_dflt, "Does any variant member of the union have a default member initializer?", "[dcl.init.aggr]/5.4", aggregate_initialize_nonexplicit_union_dflt_mem, aggregate_initialize_nonexplicit_union_first_mem)
 
 			INSTRUCTION_NODE(aggregate_initialize_nonexplicit_union_dflt_mem, "That member is initialized from its default member initializer.", "[dcl.init.aggr]/5.4")
-			-> NEW_RECURSE()
+			-> NEW_RECURSE_SUBOBJECT()
 			-> NEW_DONE()
 		}
 
 		// 5.4
 		{
 			INSTRUCTION_NODE(aggregate_initialize_nonexplicit_union_first_mem, "The first member of the union (if any) is copy-initialized from an empty initializer list.", "[dcl.init.aggr]/5.5")
-			-> NEW_RECURSE()
+			-> NEW_RECURSE_SUBOBJECT()
 			-> NEW_DONE()
 		}
 	}

cpp23/common.h

@@ -3,12 +3,15 @@
 
 #define DONE_NODE(id) { id [label="Done.", style=filled, fillcolor=green, shape=box, color=green, fontcolor=white]; }
 #define ILL_FORMED_NODE(id) { id [label="The program is ill-formed.", shape=box, style=filled, color=red, fontcolor=white]; }
-#define RECURSE_NODE(id) { id [label="Recurse with the new initialization.", shape=box, style=filled, color=blue, fontcolor=white]}
+#define RECURSE_SUBOBJECT_NODE(id) { id [label="Partially recurse.", shape=box, style=filled, color=lightblue, fontcolor=black]}
+#define RECURSE_NODE(id) { id [label="Recurse.", shape=box, style=filled, color=blue, fontcolor=white]}
 
 #define NEW_DONE() { DONE_NODE(TOKEN_CAT(__local_done_, __COUNTER__)); }
 #define NEW_ILL_FORMED() { ILL_FORMED_NODE(TOKEN_CAT(__local_ill_formed_, __COUNTER__)); }
 #define NEW_RECURSE() { RECURSE_NODE(TOKEN_CAT(__local_recurse, __COUNTER__)); }
-#define INTERNALLY_RECURSES(id) { id -> { RECURSE_NODE(TOKEN_CAT(id, __recurse)); } [style="dotted"]; }
+#define NEW_RECURSE_SUBOBJECT() { RECURSE_SUBOBJECT_NODE(TOKEN_CAT(__local_recurse_subobject, __COUNTER__)); }
+
+#define INTERNALLY_RECURSES_SUBOBJECT(id) { id -> { RECURSE_SUBOBJECT_NODE(TOKEN_CAT(id, __recurse)); } [style="dotted"]; }
 
 // Arguments: name of source node, optional edge attrs.
 #define LINK_TO_DONE(id, ...) { id -> { DONE_NODE(TOKEN_CAT(id, __generated_done)); } __VA_ARGS__; }

cpp23/flowchart.dot.cpp

@@ -52,7 +52,7 @@ digraph initialization {
 		-> INSTRUCTION_NODE(array_value_init_n, "For each k < i <= n, value-initialize the i-th array element.")
 		-> NEW_DONE()
 
-		INTERNALLY_RECURSES(array_copy_init_k)
+		INTERNALLY_RECURSES_SUBOBJECT(array_copy_init_k)
 		INTERNALLY_VALUE_INITS(array_value_init_n)
 	}
 
@@ -113,7 +113,7 @@ digraph initialization {
 			-> INSTRUCTION_NODE(class_aggregate_paren_initialize_rest, "The remaining elements are initialized with their default member initializers, if any, and are otherwise value-initialized.")
 			-> NEW_DONE()
 
-			INTERNALLY_RECURSES(class_aggregate_paren_initialize_first_k)
+			INTERNALLY_RECURSES_SUBOBJECT(class_aggregate_paren_initialize_first_k)
 			INTERNALLY_VALUE_INITS(class_aggregate_paren_initialize_rest)
 		}
 

cpp23/list_init.dot.cpp

@@ -84,7 +84,7 @@ subgraph list_initialization {
 		-> INSTRUCTION_NODE(list_initializer_list_init_array, "Copy-initialize each element of the array with the corresponding element of the initializer list.")
 		-> list_initializer_list_is_narrowing
 
-		INTERNALLY_RECURSES(list_initializer_list_init_array)
+		INTERNALLY_RECURSES_SUBOBJECT(list_initializer_list_init_array)
 
 		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)
 
@@ -168,7 +168,7 @@ subgraph list_initialization {
 		-> list_ref_prvalue_init_prvalue
 
 		INSTRUCTION_NODE(list_ref_prvalue_init_prvalue, "The prvalue initializes its result object by copy-list-initialization.", "[dcl.init.list]/3.10")
-		-> NEW_RECURSE()
+		-> NEW_RECURSE_SUBOBJECT()
 		-> INSTRUCTION_NODE(list_ref_prvalue_init_ref, "The reference is direct-initialized by the prvalue.", "[dcl.init.list]/3.10")
 		-> NEW_RECURSE()
 	}