2727 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828 */
2929
30+ #include < stack>
31+
3032#include " data_parser.hh"
3133
3234#include " config.h"
@@ -37,8 +39,7 @@ data_format data_parser::FORMAT_COMMA("comma", DT_INVALID, DT_COMMA);
3739data_format data_parser::FORMAT_EMDASH (" emdash" , DT_INVALID, DT_EMDASH);
3840data_format data_parser::FORMAT_PLAIN (" plain" , DT_INVALID, DT_INVALID);
3941
40- data_parser::
41- data_parser (data_scanner* ds)
42+ data_parser::data_parser (data_scanner* ds)
4243 : dp_errors(" dp_errors" , __FILE__, __LINE__),
4344 dp_pairs(" dp_pairs" , __FILE__, __LINE__), dp_msg_format(nullptr ),
4445 dp_msg_format_begin(ds->get_init_offset ()), dp_scanner(ds)
@@ -245,8 +246,7 @@ data_parser::pairup(data_parser::schema_id_t* schema,
245246 } while (key_iter != key_comps.begin () && !found);
246247 }
247248 if (!mixed_queue.empty ()) {
248- if (!el_stack.empty () &&
249- el_stack.back ().e_token == DNT_KEY
249+ if (!el_stack.empty () && el_stack.back ().e_token == DNT_KEY
250250 && mixed_queue.front ().e_token == DNT_KEY)
251251 {
252252 el_stack.POP_BACK ();
@@ -819,8 +819,7 @@ data_parser::end_of_value(data_parser::element_list_t& el_stack,
819819 } while (key_iter != key_comps.begin () && !found);
820820 }
821821 if (!mixed_queue.empty ()) {
822- if (!el_stack.empty () &&
823- el_stack.back ().e_token == DNT_KEY
822+ if (!el_stack.empty () && el_stack.back ().e_token == DNT_KEY
824823 && mixed_queue.front ().e_token == DNT_KEY)
825824 {
826825 el_stack.POP_BACK ();
@@ -856,8 +855,7 @@ data_parser::end_of_value(data_parser::element_list_t& el_stack,
856855 && (value.front ().e_token == DT_WORD
857856 || value.front ().e_token == DT_SYMBOL
858857 || value.front ().e_token == DT_ID)
859- && !el_stack.empty ()
860- && el_stack.back ().e_token != DNT_KEY)
858+ && !el_stack.empty () && el_stack.back ().e_token != DNT_KEY)
861859 {
862860 element_list_t ELEMENT_LIST_T (mixed_key);
863861
@@ -1169,16 +1167,14 @@ dfs_comma_next(data_format_state_t state, data_token_t next_token)
11691167 return retval;
11701168}
11711169
1172- data_parser::element::
1173- element ()
1170+ data_parser::element::element ()
11741171 : e_capture(-1 , -1 ), e_token(DT_INVALID), e_sub_elements(nullptr )
11751172{
11761173}
11771174
1178- data_parser::element::
1179- element (data_parser::element_list_t & subs,
1180- data_token_t token,
1181- bool assign_subs_elements)
1175+ data_parser::element::element (data_parser::element_list_t & subs,
1176+ data_token_t token,
1177+ bool assign_subs_elements)
11821178 : e_capture(subs.front().e_capture.c_begin, subs.back().e_capture.c_end),
11831179 e_token(token), e_sub_elements(nullptr )
11841180{
@@ -1187,8 +1183,7 @@ element(data_parser::element_list_t& subs,
11871183 }
11881184}
11891185
1190- data_parser::element::
1191- element (const data_parser::element& other)
1186+ data_parser::element::element (const data_parser::element& other)
11921187{
11931188 /* require(other.e_sub_elements == nullptr); */
11941189
@@ -1200,8 +1195,7 @@ element(const data_parser::element& other)
12001195 }
12011196}
12021197
1203- data_parser::element::~
1204- element ()
1198+ data_parser::element::~element ()
12051199{
12061200 delete this ->e_sub_elements ;
12071201 this ->e_sub_elements = nullptr ;
@@ -1355,8 +1349,7 @@ data_parser::element::is_value() const
13551349 }
13561350}
13571351
1358- data_parser::discover_format_state::
1359- discover_format_state ()
1352+ data_parser::discover_format_state::discover_format_state ()
13601353 : dfs_prefix_state(DFS_INIT), dfs_semi_state(DFS_INIT),
13611354 dfs_comma_state(DFS_INIT)
13621355{
0 commit comments