@@ -19,7 +19,7 @@ UTEST(parse, header) {
1919 ASSERT_EQ ((size_t )2 ,r .value .structs [0 ].fields_count );
2020 ASSERT_STREQ ("enemy" ,r .value .structs [0 ].name );
2121 ASSERT_STREQ ("x" ,r .value .structs [0 ].fields [0 ].name );
22- ASSERT_EQ (ast_float ,r .value .structs [0 ].fields [0 ].type );
22+ ASSERT_EQ (ast_float , ( int ) r .value .structs [0 ].fields [0 ].type );
2323}
2424
2525UTEST (parse , unknown_type ) {
@@ -99,25 +99,25 @@ UTEST(parse, multiple_structs) {
9999 ASSERT_STREQ ("enemy" , r .value .structs [0 ].name );
100100 ASSERT_EQ ((size_t )4 , r .value .structs [0 ].fields_count );
101101 ASSERT_STREQ ("x" , r .value .structs [0 ].fields [0 ].name );
102- ASSERT_EQ (ast_float , r .value .structs [0 ].fields [0 ].type );
102+ ASSERT_EQ (ast_float , ( int ) r .value .structs [0 ].fields [0 ].type );
103103 ASSERT_STREQ ("y" , r .value .structs [0 ].fields [1 ].name );
104- ASSERT_EQ (ast_float , r .value .structs [0 ].fields [1 ].type );
104+ ASSERT_EQ (ast_float , ( int ) r .value .structs [0 ].fields [1 ].type );
105105 ASSERT_STREQ ("health" , r .value .structs [0 ].fields [2 ].name );
106- ASSERT_EQ (ast_int , r .value .structs [0 ].fields [2 ].type );
106+ ASSERT_EQ (ast_int , ( int ) r .value .structs [0 ].fields [2 ].type );
107107 ASSERT_STREQ ("speed" , r .value .structs [0 ].fields [3 ].name );
108- ASSERT_EQ (ast_double , r .value .structs [0 ].fields [3 ].type );
108+ ASSERT_EQ (ast_double , ( int ) r .value .structs [0 ].fields [3 ].type );
109109
110110 // player: char id, int score, int level, float damage
111111 ASSERT_STREQ ("player" , r .value .structs [1 ].name );
112112 ASSERT_EQ ((size_t )4 , r .value .structs [1 ].fields_count );
113113 ASSERT_STREQ ("id" , r .value .structs [1 ].fields [0 ].name );
114- ASSERT_EQ (ast_char , r .value .structs [1 ].fields [0 ].type );
114+ ASSERT_EQ (ast_char , ( int ) r .value .structs [1 ].fields [0 ].type );
115115 ASSERT_STREQ ("score" , r .value .structs [1 ].fields [1 ].name );
116- ASSERT_EQ (ast_int , r .value .structs [1 ].fields [1 ].type );
116+ ASSERT_EQ (ast_int , ( int ) r .value .structs [1 ].fields [1 ].type );
117117 ASSERT_STREQ ("level" , r .value .structs [1 ].fields [2 ].name );
118- ASSERT_EQ (ast_int , r .value .structs [1 ].fields [2 ].type );
118+ ASSERT_EQ (ast_int , ( int ) r .value .structs [1 ].fields [2 ].type );
119119 ASSERT_STREQ ("damage" , r .value .structs [1 ].fields [3 ].name );
120- ASSERT_EQ (ast_float , r .value .structs [1 ].fields [3 ].type );
120+ ASSERT_EQ (ast_float , ( int ) r .value .structs [1 ].fields [3 ].type );
121121}
122122
123123UTEST (parse , many_structs_no_cap ) {
@@ -480,9 +480,9 @@ UTEST(parse, tab_or_newline_after_type) {
480480 ASSERT_FALSE (r .err );
481481 ASSERT_EQ ((size_t )2 , r .value .structs [0 ].fields_count );
482482 ASSERT_STREQ ("x" , r .value .structs [0 ].fields [0 ].name );
483- ASSERT_EQ (ast_int , r .value .structs [0 ].fields [0 ].type );
483+ ASSERT_EQ (ast_int , ( int ) r .value .structs [0 ].fields [0 ].type );
484484 ASSERT_STREQ ("y" , r .value .structs [0 ].fields [1 ].name );
485- ASSERT_EQ (ast_float , r .value .structs [0 ].fields [1 ].type );
485+ ASSERT_EQ (ast_float , ( int ) r .value .structs [0 ].fields [1 ].type );
486486}
487487
488488/* fuzz-derived: 'typedef struct {' inside a struct-name region made the
@@ -536,7 +536,7 @@ UTEST(parse, array_field) {
536536 ASSERT_EQ ((size_t )3 , r .value .structs [0 ].fields_count );
537537 ASSERT_STREQ ("pos" , r .value .structs [0 ].fields [0 ].name );
538538 ASSERT_EQ ((size_t )4 , r .value .structs [0 ].fields [0 ].array_size );
539- ASSERT_EQ (ast_float , r .value .structs [0 ].fields [0 ].type );
539+ ASSERT_EQ (ast_float , ( int ) r .value .structs [0 ].fields [0 ].type );
540540 ASSERT_STREQ ("name" , r .value .structs [0 ].fields [1 ].name );
541541 ASSERT_EQ ((size_t )32 , r .value .structs [0 ].fields [1 ].array_size );
542542 ASSERT_STREQ ("id" , r .value .structs [0 ].fields [2 ].name );
@@ -596,11 +596,11 @@ UTEST(diff, array_resize) {
596596 ASSERT_FALSE (r .err );
597597 struct_diff * sd = & r .value .structs [0 ];
598598 ASSERT_EQ ((size_t )2 , sd -> ops_count );
599- ASSERT_EQ (field_op_copy , sd -> ops [0 ].kind );
599+ ASSERT_EQ (field_op_copy , ( int ) sd -> ops [0 ].kind );
600600 ASSERT_STREQ ("pos" , sd -> ops [0 ].name );
601601 ASSERT_EQ ((size_t )4 , sd -> ops [0 ].old_array_size );
602602 ASSERT_EQ ((size_t )2 , sd -> ops [0 ].new_array_size );
603- ASSERT_EQ (field_op_zero , sd -> ops [1 ].kind );
603+ ASSERT_EQ (field_op_zero , ( int ) sd -> ops [1 ].kind );
604604 ASSERT_STREQ ("vel" , sd -> ops [1 ].name );
605605 ASSERT_EQ ((size_t )3 , sd -> ops [1 ].new_array_size );
606606}
@@ -649,13 +649,13 @@ UTEST(diff, add_field) {
649649 ASSERT_EQ ((size_t )2 , sd -> old_count );
650650 ASSERT_EQ ((size_t )3 , sd -> new_count );
651651 ASSERT_EQ ((size_t )3 , sd -> ops_count );
652- ASSERT_EQ (field_op_copy , sd -> ops [0 ].kind );
652+ ASSERT_EQ (field_op_copy , ( int ) sd -> ops [0 ].kind );
653653 ASSERT_STREQ ("x" , sd -> ops [0 ].name );
654- ASSERT_EQ (field_op_copy , sd -> ops [1 ].kind );
654+ ASSERT_EQ (field_op_copy , ( int ) sd -> ops [1 ].kind );
655655 ASSERT_STREQ ("y" , sd -> ops [1 ].name );
656- ASSERT_EQ (field_op_zero , sd -> ops [2 ].kind );
656+ ASSERT_EQ (field_op_zero , ( int ) sd -> ops [2 ].kind );
657657 ASSERT_STREQ ("health" , sd -> ops [2 ].name );
658- ASSERT_EQ (ast_int , sd -> ops [2 ].type );
658+ ASSERT_EQ (ast_int , ( int ) sd -> ops [2 ].type );
659659}
660660
661661UTEST (diff , remove_field ) {
@@ -675,8 +675,8 @@ UTEST(diff, remove_field) {
675675 ASSERT_FALSE (r .err );
676676 struct_diff * sd = & r .value .structs [0 ];
677677 ASSERT_EQ ((size_t )2 , sd -> ops_count );
678- ASSERT_EQ (field_op_copy , sd -> ops [0 ].kind );
679- ASSERT_EQ (field_op_copy , sd -> ops [1 ].kind );
678+ ASSERT_EQ (field_op_copy , ( int ) sd -> ops [0 ].kind );
679+ ASSERT_EQ (field_op_copy , ( int ) sd -> ops [1 ].kind );
680680}
681681
682682UTEST (diff , new_struct ) {
@@ -693,7 +693,7 @@ UTEST(diff, new_struct) {
693693 ASSERT_EQ ((size_t )1 , r .value .struct_count );
694694 struct_diff * sd = & r .value .structs [0 ];
695695 ASSERT_EQ ((size_t )0 , sd -> old_count );
696- ASSERT_EQ (field_op_zero , sd -> ops [0 ].kind );
696+ ASSERT_EQ (field_op_zero , ( int ) sd -> ops [0 ].kind );
697697}
698698
699699UTEST (diff , bad_old_header ) {
@@ -836,7 +836,7 @@ UTEST(diff, rename_via_was) {
836836 "typedef struct { float x; int light_count SENI_WAS(num_lights); } enemy;" );
837837 ASSERT_FALSE (d .err );
838838 ASSERT_EQ ((size_t )0 , d .question_count );
839- ASSERT_EQ (field_op_copy , d .value .structs [0 ].ops [1 ].kind );
839+ ASSERT_EQ (field_op_copy , ( int ) d .value .structs [0 ].ops [1 ].kind );
840840 ASSERT_STREQ ("light_count" , d .value .structs [0 ].ops [1 ].name );
841841 ASSERT_STREQ ("num_lights" , d .value .structs [0 ].ops [1 ].old_name );
842842}
@@ -860,7 +860,7 @@ UTEST(diff, rename_ambiguity_question) {
860860 ASSERT_TRUE (strstr (d .questions [0 ].message ,
861861 "really removed? annotate: SENI_DROPPED(num_lights)" ) != NULL );
862862 /* meanwhile the conservative op stands: added field zeroes */
863- ASSERT_EQ (field_op_zero , d .value .structs [0 ].ops [1 ].kind );
863+ ASSERT_EQ (field_op_zero , ( int ) d .value .structs [0 ].ops [1 ].kind );
864864}
865865
866866UTEST (diff , dropped_silences_question ) {
@@ -872,7 +872,7 @@ UTEST(diff, dropped_silences_question) {
872872 "typedef struct { float x; int light_count; SENI_DROPPED(num_lights) } enemy;" );
873873 ASSERT_FALSE (d .err );
874874 ASSERT_EQ ((size_t )0 , d .question_count );
875- ASSERT_EQ (field_op_zero , d .value .structs [0 ].ops [1 ].kind );
875+ ASSERT_EQ (field_op_zero , ( int ) d .value .structs [0 ].ops [1 ].kind );
876876}
877877
878878UTEST (diff , no_question_when_types_differ ) {
@@ -921,7 +921,7 @@ UTEST(diff, stale_was_is_inert) {
921921 "typedef struct { float x; int light_count SENI_WAS(num_lights); } enemy;" );
922922 ASSERT_FALSE (d .err );
923923 ASSERT_EQ ((size_t )0 , d .question_count );
924- ASSERT_EQ (field_op_copy , d .value .structs [0 ].ops [1 ].kind );
924+ ASSERT_EQ (field_op_copy , ( int ) d .value .structs [0 ].ops [1 ].kind );
925925 ASSERT_STREQ ("light_count" , d .value .structs [0 ].ops [1 ].old_name );
926926}
927927
@@ -944,7 +944,7 @@ UTEST(annotate, rename_round_trip) {
944944 diff_result d = diff_structs (& a , old_header , an .code );
945945 ASSERT_FALSE (d .err );
946946 ASSERT_EQ ((size_t )0 , d .question_count );
947- ASSERT_EQ (field_op_copy , d .value .structs [0 ].ops [1 ].kind );
947+ ASSERT_EQ (field_op_copy , ( int ) d .value .structs [0 ].ops [1 ].kind );
948948 ASSERT_STREQ ("num_lights" , d .value .structs [0 ].ops [1 ].old_name );
949949}
950950
@@ -1007,7 +1007,7 @@ UTEST(annotate, dropped_round_trip) {
10071007 diff_result d = diff_structs (& a , old_header , an .code );
10081008 ASSERT_FALSE (d .err );
10091009 ASSERT_EQ ((size_t )0 , d .question_count );
1010- ASSERT_EQ (field_op_zero , d .value .structs [0 ].ops [1 ].kind );
1010+ ASSERT_EQ (field_op_zero , ( int ) d .value .structs [0 ].ops [1 ].kind );
10111011 /* answering twice is refused */
10121012 an = annotate_dropped (& a , an .code , "enemy" , "num_lights" );
10131013 ASSERT_TRUE (an .err != NULL );
0 commit comments