Rename variable extends to super_class

jeannielynnmoulton · jeannielynnmoulton · commit fbad2d921a8f · 2018-07-31T11:12:45.000+01:00
This better reflects the bytecode.
diff --git a/jbmc/src/java_bytecode/java_bytecode_convert_class.cpp b/jbmc/src/java_bytecode/java_bytecode_convert_class.cpp
@@ -303,9 +303,9 @@ void java_bytecode_convert_classt::convert(
   else
     class_type.set_access(ID_default);
 
-  if(!c.extends.empty())
+  if(!c.super_class.empty())
   {
-    const symbol_typet base("java::" + id2string(c.extends));
+    const symbol_typet base("java::" + id2string(c.super_class));
 
     // if the superclass is generic then the class has the superclass reference
     // including the generic info in its signature
@@ -323,7 +323,7 @@ void java_bytecode_convert_classt::convert(
       }
       catch(const unsupported_java_class_signature_exceptiont &e)
       {
-        warning() << "Superclass: " << c.extends << " of class: " << c.name
+        warning() << "Superclass: " << c.super_class << " of class: " << c.name
                   << "\n could not parse signature: " << superclass_ref.value()
                   << "\n " << e.what()
                   << "\n ignoring that the superclass is generic" << eom;
@@ -336,9 +336,9 @@ void java_bytecode_convert_classt::convert(
     }
     class_typet::componentt base_class_field;
     base_class_field.type() = class_type.bases().at(0).type();
-    base_class_field.set_name("@"+id2string(c.extends));
-    base_class_field.set_base_name("@"+id2string(c.extends));
-    base_class_field.set_pretty_name("@"+id2string(c.extends));
+    base_class_field.set_name("@" + id2string(c.super_class));
+    base_class_field.set_base_name("@" + id2string(c.super_class));
+    base_class_field.set_pretty_name("@" + id2string(c.super_class));
     class_type.components().push_back(base_class_field);
   }
 
@@ -561,7 +561,7 @@ void java_bytecode_convert_classt::convert(
   }
 
   // is this a root class?
-  if(c.extends.empty())
+  if(c.super_class.empty())
     java_root_class(*class_symbol);
 }
 
diff --git a/jbmc/src/java_bytecode/java_bytecode_parse_tree.cpp b/jbmc/src/java_bytecode/java_bytecode_parse_tree.cpp
@@ -38,8 +38,8 @@ void java_bytecode_parse_treet::classt::output(std::ostream &out) const
   }
 
   out << "class " << name;
-  if(!extends.empty())
-    out << " extends " << extends;
+  if(!super_class.empty())
+    out << " extends " << super_class;
   out << " {" << '\n';
 
   for(fieldst::const_iterator
diff --git a/jbmc/src/java_bytecode/java_bytecode_parse_tree.h b/jbmc/src/java_bytecode/java_bytecode_parse_tree.h
@@ -197,7 +197,7 @@ struct java_bytecode_parse_treet
     classt &operator=(classt &&) = default;
     #endif
 
-    irep_idt name, extends;
+    irep_idt name, super_class;
     bool is_abstract=false;
     bool is_enum=false;
     bool is_public=false, is_protected=false, is_private=false;
diff --git a/jbmc/src/java_bytecode/java_bytecode_parser.cpp b/jbmc/src/java_bytecode/java_bytecode_parser.cpp
@@ -503,7 +503,7 @@ void java_bytecode_parsert::rClassFile()
     constant(this_class).type().get(ID_C_base_name);
 
   if(super_class!=0)
-    parsed_class.extends=
+    parsed_class.super_class=
       constant(super_class).type().get(ID_C_base_name);
 
   rinterfaces(parsed_class);

Original file line number	Diff line number	Diff line change
`@@ -303,9 +303,9 @@ void java_bytecode_convert_classt::convert(`
`303`	`303`	`else`
`304`	`304`	`class_type.set_access(ID_default);`
`305`	`305`
`306`		`- if(!c.extends.empty())`
	`306`	`+ if(!c.super_class.empty())`
`307`	`307`	`{`
`308`		`- const symbol_typet base("java::" + id2string(c.extends));`
	`308`	`+ const symbol_typet base("java::" + id2string(c.super_class));`
`309`	`309`
`310`	`310`	`// if the superclass is generic then the class has the superclass reference`
`311`	`311`	`// including the generic info in its signature`
`@@ -323,7 +323,7 @@ void java_bytecode_convert_classt::convert(`
`323`	`323`	`}`
`324`	`324`	`catch(const unsupported_java_class_signature_exceptiont &e)`
`325`	`325`	`{`
`326`		`- warning() << "Superclass: " << c.extends << " of class: " << c.name`
	`326`	`+ warning() << "Superclass: " << c.super_class << " of class: " << c.name`
`327`	`327`	`<< "\n could not parse signature: " << superclass_ref.value()`
`328`	`328`	`<< "\n " << e.what()`
`329`	`329`	`<< "\n ignoring that the superclass is generic" << eom;`
`@@ -336,9 +336,9 @@ void java_bytecode_convert_classt::convert(`
`336`	`336`	`}`
`337`	`337`	`class_typet::componentt base_class_field;`
`338`	`338`	`base_class_field.type() = class_type.bases().at(0).type();`
`339`		`- base_class_field.set_name("@"+id2string(c.extends));`
`340`		`- base_class_field.set_base_name("@"+id2string(c.extends));`
`341`		`- base_class_field.set_pretty_name("@"+id2string(c.extends));`
	`339`	`+ base_class_field.set_name("@" + id2string(c.super_class));`
	`340`	`+ base_class_field.set_base_name("@" + id2string(c.super_class));`
	`341`	`+ base_class_field.set_pretty_name("@" + id2string(c.super_class));`
`342`	`342`	`class_type.components().push_back(base_class_field);`
`343`	`343`	`}`
`344`	`344`
`@@ -561,7 +561,7 @@ void java_bytecode_convert_classt::convert(`
`561`	`561`	`}`
`562`	`562`
`563`	`563`	`// is this a root class?`
`564`		`- if(c.extends.empty())`
	`564`	`+ if(c.super_class.empty())`
`565`	`565`	`java_root_class(*class_symbol);`
`566`	`566`	`}`
`567`	`567`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ void java_bytecode_parse_treet::classt::output(std::ostream &out) const`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`out << "class " << name;`
`41`		`- if(!extends.empty())`
`42`		`- out << " extends " << extends;`
	`41`	`+ if(!super_class.empty())`
	`42`	`+ out << " extends " << super_class;`
`43`	`43`	`out << " {" << '\n';`
`44`	`44`
`45`	`45`	`for(fieldst::const_iterator`