diff --git a/app/src/main/java/hatelace/Address.java b/app/src/main/java/hatelace/Address.java index 913e50a..fb4d249 100644 --- a/app/src/main/java/hatelace/Address.java +++ b/app/src/main/java/hatelace/Address.java @@ -10,4 +10,8 @@ public class Address { public int getAddress() { return address; } + + public String toString() { + return Integer.toString(address); + } } diff --git a/app/src/main/java/hatelace/Instruction.java b/app/src/main/java/hatelace/Instruction.java index 9489197..74e72b2 100644 --- a/app/src/main/java/hatelace/Instruction.java +++ b/app/src/main/java/hatelace/Instruction.java @@ -15,7 +15,7 @@ public abstract class Instruction { for (Object operand : this.operands()) { sb.append(" "); - sb.append(operand); + sb.append(operand.toString()); } return sb.toString(); diff --git a/app/src/main/java/hatelace/IntWord.java b/app/src/main/java/hatelace/IntWord.java index d77a068..2381cc2 100644 --- a/app/src/main/java/hatelace/IntWord.java +++ b/app/src/main/java/hatelace/IntWord.java @@ -7,6 +7,7 @@ public class IntWord extends Word { this.value = value; } + @Override public Integer getValue() { return value; } @@ -26,4 +27,8 @@ public class IntWord extends Word { public Word divide(Word other) { return new IntWord(value / (Integer) other.getValue()); } + + public String toString() { + return value.toString(); + } } diff --git a/app/src/main/java/hatelace/Word.java b/app/src/main/java/hatelace/Word.java index c4e19c1..f611c61 100644 --- a/app/src/main/java/hatelace/Word.java +++ b/app/src/main/java/hatelace/Word.java @@ -1,9 +1,10 @@ package hatelace; public abstract class Word { - public abstract T getValue(); + public abstract Integer getValue(); public abstract Word add(Word other); public abstract Word subtract(Word other); public abstract Word multiply(Word other); public abstract Word divide(Word other); + public abstract String toString(); }