@@ -478,39 +478,39 @@ void java_bytecode_convert_classt::add_array_types(symbol_tablet &symbol_table)
478
478
if (symbol_table.has_symbol (symbol_type_identifier))
479
479
return ;
480
480
481
- struct_typet struct_type ;
481
+ class_typet class_type ;
482
482
// we have the base class, java.lang.Object, length and data
483
483
// of appropriate type
484
- struct_type .set_tag (symbol_type_identifier);
484
+ class_type .set_tag (symbol_type_identifier);
485
485
486
- struct_type .components ().reserve (3 );
487
- struct_typet ::componentt
488
- comp0 ( " @java.lang.Object" , symbol_typet (" java::java.lang.Object" ));
486
+ class_type .components ().reserve (3 );
487
+ class_typet ::componentt comp0 (
488
+ " @java.lang.Object" , symbol_typet (" java::java.lang.Object" ));
489
489
comp0.set_pretty_name (" @java.lang.Object" );
490
490
comp0.set_base_name (" @java.lang.Object" );
491
- struct_type .components ().push_back (comp0);
491
+ class_type .components ().push_back (comp0);
492
492
493
- struct_typet ::componentt comp1 (" length" , java_int_type ());
493
+ class_typet ::componentt comp1 (" length" , java_int_type ());
494
494
comp1.set_pretty_name (" length" );
495
495
comp1.set_base_name (" length" );
496
- struct_type .components ().push_back (comp1);
496
+ class_type .components ().push_back (comp1);
497
497
498
- struct_typet ::componentt
499
- comp2 ( " data" , java_reference_type (java_type_from_char (l)));
498
+ class_typet ::componentt comp2 (
499
+ " data" , java_reference_type (java_type_from_char (l)));
500
500
comp2.set_pretty_name (" data" );
501
501
comp2.set_base_name (" data" );
502
- struct_type .components ().push_back (comp2);
502
+ class_type .components ().push_back (comp2);
503
503
504
504
INVARIANT (
505
- is_valid_java_array (struct_type ),
505
+ is_valid_java_array (class_type ),
506
506
" Constructed a new type representing a Java Array "
507
507
" object that doesn't match expectations" );
508
508
509
509
symbolt symbol;
510
510
symbol.name =symbol_type_identifier;
511
511
symbol.base_name =symbol_type.get (ID_C_base_name);
512
512
symbol.is_type =true ;
513
- symbol.type =struct_type ;
513
+ symbol.type = class_type ;
514
514
symbol_table.add (symbol);
515
515
516
516
// Also provide a clone method:
0 commit comments