File tree 2 files changed +10
-9
lines changed
2 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -127,7 +127,8 @@ void java_bytecode_typecheckt::typecheck_expr_java_string_literal(exprt &expr)
127
127
escape_non_alnum (escaped);
128
128
identifier_str << " java::java.lang.String.Literal." << escaped;
129
129
// Avoid naming clashes by virtue of escaping:
130
- size_t unique_num=++(escaped_string_literal_count[identifier_str.str ()]);
130
+ size_t unique_num=escaped_string_literal_count[identifier_str.str ()];
131
+ unique_num++;
131
132
if (unique_num!=1 )
132
133
identifier_str << unique_num;
133
134
Original file line number Diff line number Diff line change @@ -448,24 +448,24 @@ char java_char_from_type(const typet &type)
448
448
449
449
if (id==ID_signedbv)
450
450
{
451
- const size_t width (type. get_unsigned_int (ID_width) );
452
- if (java_int_type (). get_unsigned_int (ID_width) == width)
451
+ const size_t width= to_signedbv_type (type). get_width ( );
452
+ if (to_signedbv_type ( java_int_type ()). get_width ()== width)
453
453
return ' i' ;
454
- else if (java_long_type (). get_unsigned_int (ID_width) == width)
454
+ else if (to_signedbv_type ( java_long_type ()). get_width ()== width)
455
455
return ' l' ;
456
- else if (java_short_type (). get_unsigned_int (ID_width) == width)
456
+ else if (to_signedbv_type ( java_short_type ()). get_width ()== width)
457
457
return ' s' ;
458
- else if (java_byte_type (). get_unsigned_int (ID_width) == width)
458
+ else if (to_signedbv_type ( java_byte_type ()). get_width ()== width)
459
459
return ' b' ;
460
460
}
461
461
else if (id==ID_unsignedbv)
462
462
return ' c' ;
463
463
else if (id==ID_floatbv)
464
464
{
465
- const size_t width (type. get_unsigned_int (ID_width ));
466
- if (java_float_type (). get_unsigned_int (ID_width) == width)
465
+ const size_t width (to_floatbv_type ( type). get_width ( ));
466
+ if (to_floatbv_type ( java_float_type ()). get_width ()== width)
467
467
return ' f' ;
468
- else if (java_double_type (). get_unsigned_int (ID_width) == width)
468
+ else if (to_floatbv_type ( java_double_type ()). get_width ()== width)
469
469
return ' d' ;
470
470
}
471
471
else if (id==ID_c_bool)
You can’t perform that action at this time.
0 commit comments