From e09b0bb865bbb0087c46b4acd90b759f14dfa824 Mon Sep 17 00:00:00 2001 From: jwansek Date: Mon, 18 Oct 2021 16:40:56 +0100 Subject: added sableCC calculator --- .../sableCCCalculator/ProgramStack.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java (limited to 'code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java') diff --git a/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java b/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java new file mode 100644 index 0000000..1875e57 --- /dev/null +++ b/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java @@ -0,0 +1,28 @@ +package sableCCCalculator; +import sableCCCalculator.node.*; +import java.util.Stack; + +public class ProgramStack extends Stack { + + public String toString() { + String out = "Stack is now: ["; + for (int i = 0; i < this.size(); i++) { + String theStr = this.elementAt(i).toString(); + out += String.format("%s, ", theStr.substring(0, theStr.length() - 1)); + } + return out.substring(0, out.length() - 2) + "]"; + } + + public static void main(String[] args) { + ProgramStack myStack = new ProgramStack<>(); + myStack.add(new TNumber("2")); + myStack.add(new TNumber("4")); + myStack.add(new TNumber("6")); + myStack.add(new TNumber("0")); + myStack.add(new TNumber("1")); + myStack.add(new TDouble("24601.10642")); + + System.out.println(myStack.pop().getText()); + System.out.println(myStack); + } +} -- cgit v1.2.3 From 8f50e4d189bad9dbd180fd945881950769c3a989 Mon Sep 17 00:00:00 2001 From: jwansek Date: Sun, 24 Oct 2021 14:07:29 +0100 Subject: added the start of a type system --- .../sableCCCalculator/ProgramStack.java | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java') diff --git a/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java b/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java index 1875e57..c1046ee 100644 --- a/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java +++ b/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java @@ -1,26 +1,27 @@ package sableCCCalculator; -import sableCCCalculator.node.*; +import sableCCCalculator.types.*; import java.util.Stack; -public class ProgramStack extends Stack { +public class ProgramStack extends Stack { public String toString() { String out = "Stack is now: ["; for (int i = 0; i < this.size(); i++) { - String theStr = this.elementAt(i).toString(); - out += String.format("%s, ", theStr.substring(0, theStr.length() - 1)); + // String theStr = this.elementAt(i).toString(); + // out += String.format("%s, ", theStr.substring(0, theStr.length() - 1)); + out += String.format("%s, ", this.elementAt(i).toString()); } return out.substring(0, out.length() - 2) + "]"; } public static void main(String[] args) { - ProgramStack myStack = new ProgramStack<>(); - myStack.add(new TNumber("2")); - myStack.add(new TNumber("4")); - myStack.add(new TNumber("6")); - myStack.add(new TNumber("0")); - myStack.add(new TNumber("1")); - myStack.add(new TDouble("24601.10642")); + ProgramStack myStack = new ProgramStack<>(); + myStack.add(new Int(2)); + myStack.add(new Int(4)); + myStack.add(new Int(6)); + myStack.add(new Int(0)); + myStack.add(new Int(1)); + myStack.add(new Decimal(24601.10642)); System.out.println(myStack.pop().getText()); System.out.println(myStack); -- cgit v1.2.3 From aa3a6929584eaa63cafb73353a62effd75d4dd8c Mon Sep 17 00:00:00 2001 From: jwansek Date: Mon, 25 Oct 2021 15:20:30 +0100 Subject: added using symbol table in stack --- .../sableCCCalculator/ProgramStack.java | 26 ++++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java') diff --git a/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java b/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java index c1046ee..b49c0d1 100644 --- a/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java +++ b/code/simpleSableCCCalulator/sableCCCalculator/ProgramStack.java @@ -1,29 +1,31 @@ package sableCCCalculator; +import sableCCCalculator.SymbolTable.SymbolTableIndex; import sableCCCalculator.types.*; import java.util.Stack; -public class ProgramStack extends Stack { +public class ProgramStack extends Stack { - public String toString() { + public String toString(SymbolTable table) { String out = "Stack is now: ["; for (int i = 0; i < this.size(); i++) { // String theStr = this.elementAt(i).toString(); // out += String.format("%s, ", theStr.substring(0, theStr.length() - 1)); - out += String.format("%s, ", this.elementAt(i).toString()); + out += String.format("%s, ", table.get(this.elementAt(i))); } return out.substring(0, out.length() - 2) + "]"; } public static void main(String[] args) { - ProgramStack myStack = new ProgramStack<>(); - myStack.add(new Int(2)); - myStack.add(new Int(4)); - myStack.add(new Int(6)); - myStack.add(new Int(0)); - myStack.add(new Int(1)); - myStack.add(new Decimal(24601.10642)); + ProgramStack myStack = new ProgramStack(); + SymbolTable table = new SymbolTable(); + myStack.add(table.addConstant(new Int(2))); + myStack.add(table.addConstant(new Int(4))); + myStack.add(table.addConstant(new Int(6))); + myStack.add(table.addConstant(new Int(0))); + myStack.add(table.addConstant(new Int(1))); + myStack.add(table.addConstant(new Decimal(24601.10642))); - System.out.println(myStack.pop().getText()); - System.out.println(myStack); + System.out.println(table.get(myStack.pop())); + System.out.println(myStack.toString(table)); } } -- cgit v1.2.3