Rename java_class_file to java_class.

Author: AnthonyCalandra

Makefile

@@ -6,7 +6,7 @@ LDFLAGS=-g -Iinclude
 LDLIBS=
 NAME=bytecode-scanner
 
-SRCS=src/main.cc src/java_class_file.cc src/constant_pool.cc src/constant_pool_entry_parser.cc \
+SRCS=src/main.cc src/java_class.cc src/constant_pool.cc src/constant_pool_entry_parser.cc \
 src/field_info.cc src/attribute_info.cc src/method_info.cc src/attribute/code_attribute.cc \
 src/attribute/bootstrap_methods_attribute.cc \
 src/attribute/annotation_default_attribute.cc src/attribute/constant_value_attribute.cc \

include/find_api_calls.hh

@@ -22,7 +22,7 @@
 #include <optional>
 #include <vector>
 
-#include "java_class_file.hh"
+#include "java_class.hh"
 
 struct api_call_info
 {
@@ -31,5 +31,5 @@ struct api_call_info
     std::string method;
 };
 
-std::vector<api_call_info> find_api_calls(const java_class_file& clazz,
+std::vector<api_call_info> find_api_calls(const java_class& clazz,
     const std::vector<std::string>& apis);

include/java_class_file.hh include/java_class.hh

@@ -33,7 +33,7 @@ enum class classfile_access_flag : uint16_t
     Synthetic = 0x1000, Annotation = 0x2000, Enum = 0x4000
 };
 
-class java_class_file
+class java_class
 {
     constant_pool cp;
     classfile_access_flag access_flags;
@@ -45,12 +45,12 @@ class java_class_file
     entry_attributes attributes;
 
 public:
-    explicit java_class_file(constant_pool cp, classfile_access_flag access_flags,
+    explicit java_class(constant_pool cp, classfile_access_flag access_flags,
         constant_pool_entry_id this_index, constant_pool_entry_id super_index,
         std::vector<constant_pool_entry_id> interfaces_ids, std::vector<field_info> fields,
         std::vector<method_info> methods, entry_attributes attributes);
 
-    explicit java_class_file(constant_pool cp, classfile_access_flag access_flags,
+    explicit java_class(constant_pool cp, classfile_access_flag access_flags,
         constant_pool_entry_id this_index, constant_pool_entry_id super_index,
         std::vector<constant_pool_entry_id> interfaces_ids);
 
@@ -94,5 +94,5 @@ public:
         return attributes;
     }
 
-    static java_class_file parse_class_file(const std::string& path);
+    static java_class parse_class_file(const std::string& path);
 };

src/find_api_calls.cc

@@ -26,7 +26,7 @@
 #include "code_attribute.hh"
 #include "find_api_calls.hh"
 #include "invalid_class_format_exception.hh"
-#include "java_class_file.hh"
+#include "java_class.hh"
 #include "line_number_table_attribute.hh"
 
 std::optional<api_call_info> get_api_call_info(const constant_pool& cp, uint16_t pc, uint8_t high, uint8_t low,
@@ -71,7 +71,7 @@ uint16_t get_line_number(const code_attribute& code, uint16_t pc)
     return 0;
 }
 
-std::vector<api_call_info> find_api_calls(const java_class_file& clazz, const std::vector<std::string>& apis)
+std::vector<api_call_info> find_api_calls(const java_class& clazz, const std::vector<std::string>& apis)
 {
     std::vector<api_call_info> calls;
     const auto& cp = clazz.get_class_constant_pool();

src/java_class_file.cc src/java_class.cc

@@ -23,7 +23,7 @@
 #include "constant_pool.hh"
 #include "field_info.hh"
 #include "invalid_class_format_exception.hh"
-#include "java_class_file.hh"
+#include "java_class.hh"
 #include "method_info.hh"
 #include "util.hh"
 
@@ -35,7 +35,7 @@ struct version_info
     uint16_t major_version;
 };
 
-java_class_file java_class_file::parse_class_file(const std::string& path)
+java_class java_class::parse_class_file(const std::string& path)
 {
     std::ifstream file {path, std::ios::binary};
     if (!file.is_open())
@@ -75,7 +75,7 @@ java_class_file java_class_file::parse_class_file(const std::string& path)
         interfaces_ids.push_back(entry_id);
     }
 
-    auto class_instance = java_class_file{
+    auto class_instance = java_class{
         std::move(constant_pool), access_flags, this_index, super_index, std::move(interfaces_ids)
     };
     // Parsing fields, methods, and attributes are slightly different in this case because we need
@@ -87,7 +87,7 @@ java_class_file java_class_file::parse_class_file(const std::string& path)
     return class_instance;
 }
 
-java_class_file::java_class_file(constant_pool cp, classfile_access_flag access_flags,
+java_class::java_class(constant_pool cp, classfile_access_flag access_flags,
     constant_pool_entry_id this_index, constant_pool_entry_id super_index,
     std::vector<constant_pool_entry_id> interfaces_ids, std::vector<field_info> fields,
     std::vector<method_info> methods, entry_attributes attributes) :
@@ -101,9 +101,9 @@ java_class_file::java_class_file(constant_pool cp, classfile_access_flag access_
         attributes{std::move(attributes)}
 {}
 
-java_class_file::java_class_file(constant_pool cp, classfile_access_flag access_flags,
+java_class::java_class(constant_pool cp, classfile_access_flag access_flags,
     constant_pool_entry_id this_index, constant_pool_entry_id super_index,
     std::vector<constant_pool_entry_id> interfaces_ids) :
-        java_class_file{std::move(cp), access_flags, this_index, super_index,
+        java_class{std::move(cp), access_flags, this_index, super_index,
             std::move(interfaces_ids), {}, {}, {}}
 {}

src/main.cc

@@ -30,7 +30,7 @@
 
 #include "find_api_calls.hh"
 #include "invalid_class_format_exception.hh"
-#include "java_class_file.hh"
+#include "java_class.hh"
 
 void denormalize_api_names(std::vector<std::string>& apis)
 {
@@ -41,7 +41,7 @@ void denormalize_api_names(std::vector<std::string>& apis)
     });
 }
 
-void do_dump_cp(const java_class_file& clazz)
+void do_dump_cp(const java_class& clazz)
 {
     std::vector<std::string> id_col, entry_col, pointed_col;
     const auto& constant_pool = clazz.get_class_constant_pool();
@@ -201,7 +201,7 @@ void do_dump_cp(const java_class_file& clazz)
     }
 }
 
-void do_scan(const java_class_file& clazz, const std::string& class_name, const std::vector<std::string>& api_names)
+void do_scan(const java_class& clazz, const std::string& class_name, const std::vector<std::string>& api_names)
 {
     std::cout << "Found the following API calls in " << class_name << ":" << std::endl;
     const auto calls = find_api_calls(clazz, api_names);
@@ -216,7 +216,7 @@ void do_command(cxxopts::ParseResult args) {
     const auto class_name = args["input"].as<std::string>();
     try
     {
-        const auto clazz = java_class_file::parse_class_file(class_name);
+        const auto clazz = java_class::parse_class_file(class_name);
         if (args.count("dump-cp"))
         {
             do_dump_cp(clazz);