18 files changed, 187 insertions, 281 deletions

diff --git a/le/CMakeLists.txt b/le/CMakeLists.txt
index a453669..6bea735 100644
--- a/le/CMakeLists.txt
+++ b/le/CMakeLists.txt
@@ -3,15 +3,11 @@ add_library(le STATIC
 	le_header.hpp le_header.cpp
 	le_file.hpp le_file.cpp
 	le_object_table.hpp le_object_table.cpp
-	le_object_table_entry.hpp le_object_table_entry.cpp
 	le_object_page_table.hpp le_object_page_table.cpp
-	le_object_page_table_entry.hpp le_object_page_table_entry.cpp
 	le_object_iterate_data_map_table.hpp le_object_iterate_data_map_table.cpp
 	le_resource_table.hpp le_resource_table.cpp
 	le_resident_name_table.hpp le_resident_name_table.cpp
-	le_resident_name_table_entry.hpp le_resident_name_table_entry.cpp
 	le_entry_table.hpp le_entry_table.cpp
-	le_entry_table_entry.hpp le_entry_table_entry.cpp
 	le_fixup_page_table.hpp le_fixup_page_table.cpp
 	le_fixup_record_table.hpp le_fixup_record_table.cpp
 )
diff --git a/le/le_entry_table.cpp b/le/le_entry_table.cpp
index 28f901d..6e8b0c7 100644
--- a/le/le_entry_table.cpp
+++ b/le/le_entry_table.cpp
@@ -1,9 +1,58 @@
 #include "le_entry_table.hpp"
 
+#include "parse.hpp"
 #include "output.hpp"
 
+#include "boost/fusion/adapted/struct.hpp"
+
+typedef boost::variant<binparse::Offset16, binparse::Offset32> EntryT;
+
+BOOST_FUSION_ADAPT_STRUCT(
+	le::EntryTable::Entry::EntryPoint,
+	(binparse::Value8, flags)
+	(EntryT, entry)
+)
+
+BOOST_FUSION_ADAPT_STRUCT(
+	le::EntryTable::Entry,
+	(binparse::Value8, nr_entries)
+	(binparse::Value8, flags)
+	(binparse::Value16, object_index)
+	(std::vector<le::EntryTable::Entry::EntryPoint>, entries)
+)
+
 namespace le {
 
+EntryTable::Entry parse_entry_table_entry(std::istream& is) {
+	EntryTable::Entry entry;
+
+	entry.nr_entries = binparse::parse<binparse::Value8>(is, "nr_entries");
+	entry.flags = binparse::parse<binparse::Value8>(is, "flags");
+	entry.object_index = binparse::parse<binparse::Value16>(is, "object_index");
+	
+	for(Value8 i = Value8(0); i < entry.nr_entries; i++) {
+		if(entry.flags & 2) {
+			entry.entries.push_back({
+				binparse::parse<Value8>(is, "flags"),
+				binparse::parse<Offset32>(is, "entry")
+			});
+		} else {
+			entry.entries.push_back({
+				binparse::parse<Value8>(is, "flags"),
+				binparse::parse<Offset16>(is, "entry")
+			});
+		}
+	}
+	
+	return entry;
+}
+
+std::ostream& operator<<(std::ostream& os, EntryTable::Entry const& entry)
+{
+	return binparse::operator<<(os, entry);
+}
+
+
 EntryTable parse_entry_table(std::istream& is, binparse::Offset32 offset)
 {
 	is.seekg(0, std::ios::beg);
diff --git a/le/le_entry_table.hpp b/le/le_entry_table.hpp
index f31f542..ad2bbe5 100644
--- a/le/le_entry_table.hpp
+++ b/le/le_entry_table.hpp
@@ -1,15 +1,32 @@
 #pragma once
 
-#include "le_entry_table_entry.hpp"
+#include "types.hpp"
+
+#include <boost/variant.hpp>
 
 #include <map>
 #include <iostream>
+#include <vector>
 
 namespace le {
 
+using namespace binparse;
+
 struct EntryTable
 {
-	std::map<uint32_t, EntryTableEntry> entries;
+	struct Entry {
+		struct EntryPoint {
+			Value8 flags;
+			boost::variant<Offset16, Offset32> entry;
+		};
+	
+		Value8 nr_entries;
+		Value8 flags;
+		Value16 object_index;
+		std::vector<EntryPoint> entries;
+	};
+
+	std::map<uint32_t, EntryTable::Entry> entries;
 };
 
 EntryTable parse_entry_table(std::istream& is, binparse::Offset32 offset);
diff --git a/le/le_entry_table_entry.cpp b/le/le_entry_table_entry.cpp
deleted file mode 100644
index 4894ec0..0000000
--- a/le/le_entry_table_entry.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "le_entry_table_entry.hpp"
-
-#include "parse.hpp"
-#include "output.hpp"
-
-#include <boost/fusion/adapted/struct.hpp>
-
-typedef boost::variant<binparse::Offset16, binparse::Offset32> EntryT;
-
-BOOST_FUSION_ADAPT_STRUCT(
-	le::EntryPoint,
-	(binparse::Value8, flags)
-	(EntryT, entry)
-)
-
-BOOST_FUSION_ADAPT_STRUCT(
-	le::EntryTableEntry,
-	(binparse::Value8, nr_entries)
-	(binparse::Value8, flags)
-	(binparse::Value16, object_index)
-	(std::vector<le::EntryPoint>, entries)
-)
-
-namespace le {
-
-EntryTableEntry parse_entry_table_entry(std::istream& is) {
-	EntryTableEntry entry;
-
-	entry.nr_entries = binparse::parse<binparse::Value8>(is, "nr_entries");
-	entry.flags = binparse::parse<binparse::Value8>(is, "flags");
-	entry.object_index = binparse::parse<binparse::Value16>(is, "object_index");
-	
-	for(Value8 i = Value8(0); i < entry.nr_entries; i++) {
-		if(entry.flags & 2) {
-			entry.entries.push_back({
-				binparse::parse<Value8>(is, "flags"),
-				binparse::parse<Offset32>(is, "entry")
-			});
-		} else {
-			entry.entries.push_back({
-				binparse::parse<Value8>(is, "flags"),
-				binparse::parse<Offset16>(is, "entry")
-			});
-		}
-	}
-	
-	return entry;
-}
-
-std::ostream&operator<<(std::ostream& os, const EntryTableEntry& entry)
-{
-	return binparse::operator<<(os, entry);
-}
-
-}
\ No newline at end of file
diff --git a/le/le_entry_table_entry.hpp b/le/le_entry_table_entry.hpp
deleted file mode 100644
index 209c1bb..0000000
--- a/le/le_entry_table_entry.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "types.hpp"
-
-#include <boost/variant.hpp>
-
-#include <vector>
-
-namespace le {
-
-using binparse::Value8;
-using binparse::Value16;
-using binparse::Offset16;
-using binparse::Offset32;
-
-struct EntryPoint {
-	binparse::Value8 flags;
-	boost::variant<Offset16, Offset32> entry;
-};
-
-struct EntryTableEntry {
-
-	Value8 nr_entries;
-	Value8 flags;
-	Value16 object_index;
-	std::vector<EntryPoint> entries;
-};
-
-EntryTableEntry parse_entry_table_entry(std::istream& is);
-
-std::ostream& operator<<(std::ostream& os, EntryTableEntry const& entry);
-
-}
diff --git a/le/le_fixup_record_table.cpp b/le/le_fixup_record_table.cpp
index 9331626..51dee60 100644
--- a/le/le_fixup_record_table.cpp
+++ b/le/le_fixup_record_table.cpp
@@ -222,8 +222,6 @@ FixupRecordTable parse_fixup_record_table(std::istream& is, Offset32 offset, Fix
 			auto x = parse(is);
 			table.entries[Value32(i)].push_back(x);
 		}
-		
-		
 	}
 	
 	return table;
diff --git a/le/le_object_page_table.cpp b/le/le_object_page_table.cpp
index d8fd290..9843689 100644
--- a/le/le_object_page_table.cpp
+++ b/le/le_object_page_table.cpp
@@ -3,8 +3,27 @@
 #include "parse.hpp"
 #include "output.hpp"
 
+#include <boost/fusion/adapted/struct.hpp>
+
+BOOST_FUSION_ADAPT_STRUCT(
+	le::ObjectPageTable::Entry,
+	(binparse::Value16, high)
+	(binparse::Value8, low)
+	(binparse::Value8, flags)
+)
+
 namespace le {
 
+ObjectPageTable::Entry parse_object_page_table_entry(std::istream& is)
+{
+	return binparse::parse<ObjectPageTable::Entry>(is);
+}
+
+std::ostream& operator<<(std::ostream& os, ObjectPageTable::Entry const& entry)
+{
+	return binparse::operator<<(os, entry);
+}
+
 ObjectPageTable parse_object_page_table(std::istream& is, binparse::Offset32 offset, binparse::Value32 nr_pages)
 {
 	is.seekg(0, std::ios::beg);
diff --git a/le/le_object_page_table.hpp b/le/le_object_page_table.hpp
index 08a67e6..da464b5 100644
--- a/le/le_object_page_table.hpp
+++ b/le/le_object_page_table.hpp
@@ -2,18 +2,29 @@
 
 #include "types.hpp"
 
-#include "le_object_page_table_entry.hpp"
-
 #include <map>
 
 namespace le {
 
-using binparse::Value32;
-using binparse::Offset32;
+using namespace binparse;
 
 struct ObjectPageTable
 {
-	std::map<Value32, ObjectPageTableEntry> entries;
+	struct Entry {
+		enum class object_page_flags {
+			legal_physical = 0,
+			iteration_data = 1,
+			invalid = 2,
+			zero_filled = 3,
+			range_of = 4
+		};
+	
+		Value16 high;
+		Value8 low;
+		Value8 flags;
+	};
+	
+	std::map<Value32, ObjectPageTable::Entry> entries;
 };
 
 ObjectPageTable parse_object_page_table(std::istream& is, Offset32 offset, Value32 nr_pages);
diff --git a/le/le_object_page_table_entry.cpp b/le/le_object_page_table_entry.cpp
deleted file mode 100644
index 73bdb61..0000000
--- a/le/le_object_page_table_entry.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "le_object_page_table_entry.hpp"
-
-#include "parse.hpp"
-#include "output.hpp"
-
-#include <boost/fusion/adapted/struct.hpp>
-
-BOOST_FUSION_ADAPT_STRUCT(
-	le::ObjectPageTableEntry,
-	(binparse::Offset16, high_page_number)
-	(binparse::Value8, low_page_number)
-	(binparse::Value8, flags)
-)
-
-namespace le {
-
-ObjectPageTableEntry parse_object_page_table_entry(std::istream& is)
-{
-	return binparse::parse<ObjectPageTableEntry>(is);
-}
-
-std::ostream& operator<<(std::ostream& os, const ObjectPageTableEntry& entry)
-{
-	return binparse::operator<<(os, entry);
-}
-
-}
\ No newline at end of file
diff --git a/le/le_object_page_table_entry.hpp b/le/le_object_page_table_entry.hpp
deleted file mode 100644
index 3254365..0000000
--- a/le/le_object_page_table_entry.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "types.hpp"
-
-namespace le {
-
-using binparse::Offset16;
-using binparse::Value8;
-
-enum class object_page_flags {
-	legal_physical = 0,
-	iteration_data = 1,
-	invalid = 2,
-	zero_filled = 3,
-	range_of = 4
-};
-
-struct ObjectPageTableEntry {
-	Offset16 high_page_number;
-	Value8 low_page_number;
-	Value8 flags;
-};
-
-ObjectPageTableEntry parse_object_page_table_entry(std::istream& is);
-
-std::ostream& operator<<(std::ostream& os, ObjectPageTableEntry const& entry);
-
-}
diff --git a/le/le_object_table.cpp b/le/le_object_table.cpp
index 3e87fb0..7523257 100644
--- a/le/le_object_table.cpp
+++ b/le/le_object_table.cpp
@@ -1,11 +1,33 @@
 #include "le_object_table.hpp"
 
 #include "output.hpp"
+#include "parse.hpp"
+
+#include <boost/fusion/adapted/struct.hpp>
 
 #include <iostream>
 
+BOOST_FUSION_ADAPT_STRUCT(
+	le::ObjectTable::Entry,
+	(binparse::Value32, virtual_size)
+	(binparse::Offset32, reloc_base_address)
+	(binparse::Value32, object_flags)
+	(binparse::Value32, page_table_index)
+	(binparse::Value32, nr_page_table_entries)
+	(binparse::Value32, reserved)
+)
+
 namespace le {
 
+ObjectTable::Entry parse_object_table_entry(std::istream& is) {
+	return parse<ObjectTable::Entry>(is);
+}
+
+std::ostream& operator<<(std::ostream& os, ObjectTable::Entry const& entry)
+{
+	return binparse::operator<<(os, entry);
+}
+
 ObjectTable parse_object_table(std::istream& is, Offset32 offset, Value32 nr_objects)
 {
 	is.seekg(0, std::ios::beg);
diff --git a/le/le_object_table.hpp b/le/le_object_table.hpp
index c840734..c3f584d 100644
--- a/le/le_object_table.hpp
+++ b/le/le_object_table.hpp
@@ -1,13 +1,43 @@
 #pragma once
 
-#include "le_object_table_entry.hpp"
+#include "types.hpp"
 
 #include <map>
 
 namespace le {
 
-struct ObjectTable {
-	std::map<uint32_t, ObjectTableEntry> entries;
+using namespace binparse;
+
+struct ObjectTable {	
+	struct Entry {
+		enum class ObjectFlags {
+			readable = 0x1,
+			writable = 0x2,
+			executable = 0x4,
+			resource = 0x8,
+			discardable = 0x10,
+			shared = 0x20,
+			has_preload_pages = 0x40,
+			has_invalid_pages = 0x80,
+			has_zero_filled_pages = 0x100,
+			is_resident = 0x200,
+			is_resident_and_contiguous = 0x300,
+			is_resident_and_long_lockable = 0x400,
+			alias_16_16_required = 0x1000,
+			big_bit_setting = 0x2000,
+			is_conforming_for_code = 0x4000,
+			IO_privilege_level = 0x8000,
+		};
+	
+		Value32 virtual_size;
+		Offset32 reloc_base_address;
+		Value32 object_flags;
+		Value32 page_table_index;
+		Value32 nr_page_table_entries;
+		Value32 reserved;
+	};
+
+	std::map<uint32_t, Entry> entries;
 };
 
 ObjectTable parse_object_table(std::istream& is, Offset32 offset, Value32 nr_objects);
diff --git a/le/le_object_table_entry.cpp b/le/le_object_table_entry.cpp
deleted file mode 100644
index 68e77ba..0000000
--- a/le/le_object_table_entry.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "le_object_table_entry.hpp"
-
-#include "parse.hpp"
-#include "output.hpp"
-
-#include <boost/fusion/adapted/struct.hpp>
-
-BOOST_FUSION_ADAPT_STRUCT(
-	le::ObjectTableEntry,
-	(binparse::Value32, virtual_size)
-	(binparse::Offset32, reloc_base_address)
-	(binparse::Value32, object_flags)
-	(binparse::Value32, page_table_index)
-	(binparse::Value32, nr_page_table_entries)
-	(binparse::Value32, reserved)
-)
-
-namespace le {
-
-ObjectTableEntry parse_object_table_entry(std::istream& is) {
-	using binparse::parse;
-	
-	return parse<ObjectTableEntry>(is);
-}
-
-std::ostream& operator<<(std::ostream& os, const ObjectTableEntry& entry)
-{
-	return binparse::operator<<(os, entry);
-}
-
-}
diff --git a/le/le_object_table_entry.hpp b/le/le_object_table_entry.hpp
deleted file mode 100644
index c456a15..0000000
--- a/le/le_object_table_entry.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include "types.hpp"
-
-namespace le {
-
-using binparse::Value32;
-using binparse::Offset32;
-
-enum class ObjectFlags {
-	readable = 0x1,
-	writable = 0x2,
-	executable = 0x4,
-	resource = 0x8,
-	discardable = 0x10,
-	shared = 0x20,
-	has_preload_pages = 0x40,
-	has_invalid_pages = 0x80,
-	has_zero_filled_pages = 0x100,
-	is_resident = 0x200,
-	is_resident_and_contiguous = 0x300,
-	is_resident_and_long_lockable = 0x400,
-	alias_16_16_required = 0x1000,
-	big_bit_setting = 0x2000,
-	is_conforming_for_code = 0x4000,
-	IO_privilege_level = 0x8000,
-};
-
-struct ObjectTableEntry {
-	Value32 virtual_size;
-	Offset32 reloc_base_address;
-	Value32 object_flags;
-	Value32 page_table_index;
-	Value32 nr_page_table_entries;
-	Value32 reserved;
-};
-
-ObjectTableEntry parse_object_table_entry(std::istream& is);
-
-std::ostream& operator<<(std::ostream& os, ObjectTableEntry const& entry); 
-
-}
diff --git a/le/le_resident_name_table.cpp b/le/le_resident_name_table.cpp
index bc34999..4633431 100644
--- a/le/le_resident_name_table.cpp
+++ b/le/le_resident_name_table.cpp
@@ -1,9 +1,28 @@
 #include "le_resident_name_table.hpp"
 
+#include "parse.hpp"
 #include "output.hpp"
 
+#include <boost/fusion/adapted/struct.hpp>
+
+BOOST_FUSION_ADAPT_STRUCT(
+	le::ResidentNameTable::Entry,
+	(binparse::PString8, string)
+	(binparse::Value16, index)
+)
+
 namespace le {
 
+ResidentNameTable::Entry parse_resident_name_table_entry(std::istream& is)
+{
+	return binparse::parse<ResidentNameTable::Entry>(is);
+}
+
+std::ostream&operator<<(std::ostream& os, ResidentNameTable::Entry const& entry)
+{
+	return binparse::operator<<(os, entry);
+}
+
 ResidentNameTable parse_resident_name_table(std::istream& is, binparse::Offset32 offset)
 {
 	is.seekg(0, std::ios::beg);
diff --git a/le/le_resident_name_table.hpp b/le/le_resident_name_table.hpp
index aa81577..1369383 100644
--- a/le/le_resident_name_table.hpp
+++ b/le/le_resident_name_table.hpp
@@ -1,14 +1,22 @@
 #pragma once
 
-#include "le_resident_name_table_entry.hpp"
+#include "types.hpp"
 
 #include <vector>
 #include <iostream>
 
 namespace le {
 
+using namespace binparse;
+
 struct ResidentNameTable {
-	std::vector<ResidentNameTableEntry> entries;
+	
+	struct Entry {
+		PString8 string;
+		Value16 index;
+	};
+
+	std::vector<ResidentNameTable::Entry> entries;
 };
 
 ResidentNameTable parse_resident_name_table(std::istream& is, binparse::Offset32 offset);
diff --git a/le/le_resident_name_table_entry.cpp b/le/le_resident_name_table_entry.cpp
deleted file mode 100644
index a82cbeb..0000000
--- a/le/le_resident_name_table_entry.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "le_resident_name_table_entry.hpp"
-
-#include "parse.hpp"
-#include "output.hpp"
-
-#include <boost/fusion/adapted/struct.hpp>
-
-BOOST_FUSION_ADAPT_STRUCT(
-	le::ResidentNameTableEntry,
-	(binparse::PString8, string)
-	(binparse::Value16, index)
-)
-
-namespace le {
-
-ResidentNameTableEntry parse_resident_name_table_entry(std::istream& is)
-{
-	return binparse::parse<ResidentNameTableEntry>(is);
-}
-
-std::ostream&operator<<(std::ostream& os, ResidentNameTableEntry const& entry)
-{
-	return binparse::operator<<(os, entry);
-}
-
-}
\ No newline at end of file
diff --git a/le/le_resident_name_table_entry.hpp b/le/le_resident_name_table_entry.hpp
deleted file mode 100644
index 95c83bc..0000000
--- a/le/le_resident_name_table_entry.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "types.hpp"
-
-#include <string>
-
-namespace le {
-
-using binparse::PString8;
-using binparse::Value16;
-
-struct ResidentNameTableEntry {
-	PString8 string;
-	Value16 index;
-};
-
-ResidentNameTableEntry parse_resident_name_table_entry(std::istream& is);
-
-std::ostream& operator<<(std::ostream& os, ResidentNameTableEntry const& entry);
-
-}
\ No newline at end of file