@@ -95,13 +95,13 @@ struct spec
9595
9696 constexpr explicit spec (const semantic_version& semver) noexcept
9797 : version{semver},
98- v1_1_0_allow_control_characters_in_comments {semantic_version{1 , 1 , 0 } <= semver},
9998 v1_1_0_allow_newlines_in_inline_tables {semantic_version{1 , 1 , 0 } <= semver},
10099 v1_1_0_allow_trailing_comma_in_inline_tables{semantic_version{1 , 1 , 0 } <= semver},
101- v1_1_0_allow_non_english_in_bare_keys {semantic_version{1 , 1 , 0 } <= semver},
102100 v1_1_0_add_escape_sequence_e {semantic_version{1 , 1 , 0 } <= semver},
103101 v1_1_0_add_escape_sequence_x {semantic_version{1 , 1 , 0 } <= semver},
104102 v1_1_0_make_seconds_optional {semantic_version{1 , 1 , 0 } <= semver},
103+ ext_allow_control_characters_in_comments{false },
104+ ext_allow_non_english_in_bare_keys{false },
105105 ext_hex_float {false },
106106 ext_num_suffix{false },
107107 ext_null_value{false }
@@ -110,14 +110,16 @@ struct spec
110110 semantic_version version; // toml version
111111
112112 // diff from v1.0.0 -> v1.1.0
113- bool v1_1_0_allow_control_characters_in_comments;
114113 bool v1_1_0_allow_newlines_in_inline_tables;
115114 bool v1_1_0_allow_trailing_comma_in_inline_tables;
116- bool v1_1_0_allow_non_english_in_bare_keys;
117115 bool v1_1_0_add_escape_sequence_e;
118116 bool v1_1_0_add_escape_sequence_x;
119117 bool v1_1_0_make_seconds_optional;
120118
119+ // discussed in toml-lang, but currently not in it
120+ bool ext_allow_control_characters_in_comments;
121+ bool ext_allow_non_english_in_bare_keys;
122+
121123 // library extensions
122124 bool ext_hex_float; // allow hex float (in C++ style)
123125 bool ext_num_suffix; // allow number suffix (in C++ style)
@@ -130,13 +132,13 @@ inline std::pair<const semantic_version&, std::array<bool, 10>>
130132to_tuple (const spec& s) noexcept
131133{
132134 return std::make_pair (std::cref (s.version ), std::array<bool , 10 >{{
133- s.v1_1_0_allow_control_characters_in_comments ,
134135 s.v1_1_0_allow_newlines_in_inline_tables ,
135136 s.v1_1_0_allow_trailing_comma_in_inline_tables ,
136- s.v1_1_0_allow_non_english_in_bare_keys ,
137137 s.v1_1_0_add_escape_sequence_e ,
138138 s.v1_1_0_add_escape_sequence_x ,
139139 s.v1_1_0_make_seconds_optional ,
140+ s.ext_allow_control_characters_in_comments ,
141+ s.ext_allow_non_english_in_bare_keys ,
140142 s.ext_hex_float ,
141143 s.ext_num_suffix ,
142144 s.ext_null_value
0 commit comments