Rename read/write to read_line and write_word

3 files changed, 23 insertions, 12 deletions

diff --git a/inc/cache.h b/inc/cache.h
index 20a40c2..17abcdd 100644
--- a/inc/cache.h
+++ b/inc/cache.h
@@ -20,13 +20,18 @@ class Cache : public Storage
 	Cache(Storage *lower, int delay);
 	~Cache();
 
-	Response write(Accessor accessor, signed int data, int address) override;
-	Response write_line(Accessor accessor, std::array<signed int, LINE_SIZE> data_line, int address) override;
-	Response read(
+	Response
+	write_word(Accessor accessor, signed int data, int address) override;
+	Response write_line(
+		Accessor accessor,
+		std::array<signed int, LINE_SIZE> data_line,
+		int address) override;
+	Response read_line(
 		Accessor accessor,
 		int address,
 		std::array<signed int, LINE_SIZE> &data_line) override;
-	Response read_word(Accessor accessor, int address, signed int &data) override;
+	Response
+	read_word(Accessor accessor, int address, signed int &data) override;
 
 	/**
 	 * Getter for the meta attribute.
diff --git a/inc/dram.h b/inc/dram.h
index 7774040..2771c3e 100644
--- a/inc/dram.h
+++ b/inc/dram.h
@@ -17,15 +17,20 @@ class Dram : public Storage
 	Dram(int lines, int delay);
 	~Dram();
 
-	Response write(Accessor accessor, signed int data, int address) override;
-	Response read(
+	Response
+	write_word(Accessor accessor, signed int data, int address) override;
+	Response read_line(
 		Accessor accessor,
 		int address,
 		std::array<signed int, LINE_SIZE> &data_line) override;
-	Response write_line(Accessor accessor, std::array<signed int, LINE_SIZE> data_line, int address) override;
-	Response read_word(Accessor accessor, int address, signed int &data) override;
+	Response write_line(
+		Accessor accessor,
+		std::array<signed int, LINE_SIZE> data_line,
+		int address) override;
+	Response
+	read_word(Accessor accessor, int address, signed int &data) override;
 
-	private:
+  private:
 	/**
 	 * Helper for `write` a word
 	 */
@@ -33,7 +38,8 @@ class Dram : public Storage
 	/**
 	 * Helper for writing a line.
 	 */
-	void do_write_line(std::array<signed int, LINE_SIZE> data_line, int address);
+	void
+	do_write_line(std::array<signed int, LINE_SIZE> data_line, int address);
 	/**
 	 * Helper for `read` a line
 	 */
diff --git a/inc/storage.h b/inc/storage.h
index fc93d7a..b54a6f7 100644
--- a/inc/storage.h
+++ b/inc/storage.h
@@ -20,7 +20,7 @@ class Storage
 	 * @param the address to write to.
 	 * @return a status code reflecting the state of the request.
 	 */
-	virtual Response write(Accessor accessor, signed int data, int address) = 0;
+	virtual Response write_word(Accessor accessor, signed int data, int address) = 0;
 
 	/**
 	 * Write a data line to given address in this level of storage
@@ -35,7 +35,7 @@ class Storage
 	 * @return a status code reflecting the state of the request, and the
 	 * data being returned.
 	 */
-	virtual Response read(
+	virtual Response read_line(
 		Accessor accessor,
 		int address,
 		std::array<signed int, LINE_SIZE> &data) = 0;