From 4b11ef49e73512917f3dd8fde84c06d9c0c6ca4b Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Tue, 16 Apr 2024 15:28:20 +0200 Subject: [PATCH] Program implements toString --- app/src/main/java/hatelace/Main.java | 6 +----- app/src/main/java/hatelace/Program.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/hatelace/Main.java b/app/src/main/java/hatelace/Main.java index d380b1d..ac1aa2d 100644 --- a/app/src/main/java/hatelace/Main.java +++ b/app/src/main/java/hatelace/Main.java @@ -15,11 +15,7 @@ public class Main { computer.run(); memory.dump(); - // Print the program - System.out.println("Program:"); - for (Instruction instruction : program) { - System.out.println(instruction); - } + System.out.println(program); System.out.println("Completed"); } diff --git a/app/src/main/java/hatelace/Program.java b/app/src/main/java/hatelace/Program.java index 510478f..499ba62 100644 --- a/app/src/main/java/hatelace/Program.java +++ b/app/src/main/java/hatelace/Program.java @@ -3,4 +3,13 @@ package hatelace; import java.util.ArrayList; // This is simply an intermediate class to comply with the specified API requirements. -public abstract class Program extends ArrayList {} +public abstract class Program extends ArrayList { + public String toString() { + StringBuilder builder = new StringBuilder(); + for (Instruction instruction : this) { + builder.append(instruction.toString()); + builder.append("\n"); + } + return builder.toString(); + } +}