Skip to content

Commit ca28aab

Browse files
committed
Clean up string initialization
1 parent 56c4f68 commit ca28aab

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

cpp23/string_init.dot.cpp

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@
77

88
subgraph cluster_string_literal_initialization {
99
INSTRUCTION_NODE(STRING_LITERAL_INIT_HEAD, "Initialization as follows:", "[dcl.init.string]")
10-
STRING_LITERAL_INIT_HEAD -> string_literal_verify_kind
11-
12-
INSTRUCTION_NODE(string_literal_verify_kind, "Verify array type and literal type match.")
13-
string_literal_verify_kind -> { string_literal_kind_char, string_literal_kind_char8, string_literal_kind_char16, string_literal_kind_char32, string_literal_kind_wchar, string_literal_kind_other }
14-
15-
{
10+
-> INSTRUCTION_NODE(string_literal_verify_kind, "Verify array type and literal type match.")
11+
-> {
1612
rank=same;
1713

1814
string_literal_kind_char [label="char[] / ordinary literal"]
@@ -26,19 +22,17 @@ subgraph cluster_string_literal_initialization {
2622
string_literal_kind_char -> string_literal_kind_char8 -> string_literal_kind_char16 -> string_literal_kind_char32 -> string_literal_kind_wchar -> string_literal_kind_other [style=invis]
2723
}
2824

29-
LINK_TO_ILL_FORMED(string_literal_kind_other)
25+
string_literal_kind_other -> NEW_ILL_FORMED()
3026

3127
{ string_literal_kind_char, string_literal_kind_char8, string_literal_kind_char16, string_literal_kind_char32, string_literal_kind_wchar } -> string_literal_initialize_first
3228

3329
INSTRUCTION_NODE(string_literal_initialize_first, "Initialize the first elements of the array with successive values from the string literal.")
3430
-> string_literal_has_too_many
3531

36-
YN_QUESTION_NODE_NO_CITE(string_literal_has_too_many, "Are there more initializers than array elements?", string_literal_ill_formed_too_many, string_literal_initialize_rest)
37-
38-
ILL_FORMED_NODE(string_literal_ill_formed_too_many)
32+
YN_QUESTION_NODE_NO_CITE(string_literal_has_too_many, "Are there more initializers than array elements?", NEW_ILL_FORMED(), string_literal_initialize_rest)
3933

4034
INSTRUCTION_NODE(string_literal_initialize_rest, "Zero-initialize the remaining elements of the array (if any).")
41-
LINK_TO_DONE(string_literal_initialize_rest)
35+
-> NEW_DONE()
4236
}
4337

4438
#endif

0 commit comments

Comments
 (0)