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/Translation.java | 132 +++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 code/simpleSableCCCalulator/sableCCCalculator/Translation.java (limited to 'code/simpleSableCCCalulator/sableCCCalculator/Translation.java') diff --git a/code/simpleSableCCCalulator/sableCCCalculator/Translation.java b/code/simpleSableCCCalulator/sableCCCalculator/Translation.java new file mode 100644 index 0000000..d8fd74d --- /dev/null +++ b/code/simpleSableCCCalulator/sableCCCalculator/Translation.java @@ -0,0 +1,132 @@ +package sableCCCalculator; +import sableCCCalculator.analysis.*; +import sableCCCalculator.node.*; + +class Translation extends DepthFirstAdapter +{ + private ProgramStack programStack = new ProgramStack<>(); + + public void caseTNumber(TNumber node) + { + System.out.println("Pushing " + Integer.parseInt(node.getText()) + " to stack"); + programStack.push(node); + System.out.println(programStack); + } + + public void caseTDouble(TDouble node) + { + System.out.println("Pushing a double: " + Double.parseDouble(node.getText())); + programStack.push(node); + System.out.println(programStack); + } + + public void outASineTerm(ASineTerm node) + { + Double num = Double.parseDouble(programStack.pop().getText()); + System.out.println("Popped " + num); + Double out = Math.sin(Math.toRadians(num)); + programStack.push(new TDouble(String.format("%f", out))); + System.out.println("Pushed sin(" + num + ") = " + out + " to stack"); + System.out.println(programStack); + } + + public void outAPlusExpr(APlusExpr node) + { + Double num2 = Double.parseDouble(programStack.pop().getText()); + Double num1 = Double.parseDouble(programStack.pop().getText()); + System.out.println("Popped " + num1 + " and " + num2 + " from stack"); + Double out = num1 + num2; + if ((out % 1) == 0) + { + // the output is an integer, change types to save memory + programStack.push(new TNumber(String.format("%d", out.intValue()))); + } + else + { + programStack.push(new TDouble(String.format("%f", out))); + } + + System.out.println("Pushed " + num1 + "+" + num2 + "=" + out + " to stack"); + System.out.println(programStack); + } + + public void outAMinusExpr(AMinusExpr node) + { + Double num2 = Double.parseDouble(programStack.pop().getText()); + Double num1 = Double.parseDouble(programStack.pop().getText()); + System.out.println("Popped " + num1 + " and " + num2 + " from stack"); + Double out = num1 - num2; + if ((out % 1) == 0) + { + // the output is an integer, change types to save memory + programStack.push(new TNumber(String.format("%d", out.intValue()))); + } + else + { + programStack.push(new TDouble(String.format("%f", out))); + } + + System.out.println("Pushed " + num1 + "-" + num2 + "=" + out + " to stack"); + System.out.println(programStack); + } + + public void outAMultFactor(AMultFactor node) + { + Double num2 = Double.parseDouble(programStack.pop().getText()); + Double num1 = Double.parseDouble(programStack.pop().getText()); + System.out.println("Popped " + num1 + " and " + num2 + " from stack"); + Double out = num1 * num2; + if ((out % 1) == 0) + { + // the output is an integer, change types to save memory + programStack.push(new TNumber(String.format("%d", out.intValue()))); + } + else + { + programStack.push(new TDouble(String.format("%f", out))); + } + + System.out.println("Pushed " + num1 + "*" + num2 + "=" + out + " to stack"); + System.out.println(programStack); + } + + public void outADivFactor(ADivFactor node) + { + Double num2 = Double.parseDouble(programStack.pop().getText()); + Double num1 = Double.parseDouble(programStack.pop().getText()); + System.out.println("Popped " + num1 + " and " + num2 + " from stack"); + Double out = num1 / num2; + if ((out % 1) == 0) + { + // the output is an integer, change types to save memory + programStack.push(new TNumber(String.format("%d", out.intValue()))); + } + else + { + programStack.push(new TDouble(String.format("%f", out))); + } + + System.out.println("Pushed " + num1 + "/" + num2 + "=" + out + " to stack"); + System.out.println(programStack); + } + + public void outAModFactor(AModFactor node) + { + Double num2 = Double.parseDouble(programStack.pop().getText()); + Double num1 = Double.parseDouble(programStack.pop().getText()); + System.out.println("Popped " + num1 + " and " + num2 + " from stack"); + Double out = num1 % num2; + if ((out % 1) == 0) + { + // the output is an integer, change types to save memory + programStack.push(new TNumber(String.format("%d", out.intValue()))); + } + else + { + programStack.push(new TDouble(String.format("%f", out))); + } + + System.out.println("Pushed " + num1 + "%" + num2 + "=" + out + " to stack"); + System.out.println(programStack); + } +} -- 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/Translation.java | 114 +++++++-------------- 1 file changed, 35 insertions(+), 79 deletions(-) (limited to 'code/simpleSableCCCalulator/sableCCCalculator/Translation.java') diff --git a/code/simpleSableCCCalulator/sableCCCalculator/Translation.java b/code/simpleSableCCCalulator/sableCCCalculator/Translation.java index d8fd74d..a673edb 100644 --- a/code/simpleSableCCCalulator/sableCCCalculator/Translation.java +++ b/code/simpleSableCCCalulator/sableCCCalculator/Translation.java @@ -1,22 +1,23 @@ package sableCCCalculator; import sableCCCalculator.analysis.*; +import sableCCCalculator.types.*; import sableCCCalculator.node.*; class Translation extends DepthFirstAdapter { - private ProgramStack programStack = new ProgramStack<>(); + private ProgramStack programStack = new ProgramStack<>(); public void caseTNumber(TNumber node) { System.out.println("Pushing " + Integer.parseInt(node.getText()) + " to stack"); - programStack.push(node); + programStack.push(new Int(node.getText())); System.out.println(programStack); } public void caseTDouble(TDouble node) { System.out.println("Pushing a double: " + Double.parseDouble(node.getText())); - programStack.push(node); + programStack.push(new Decimal(node.getText())); System.out.println(programStack); } @@ -25,108 +26,63 @@ class Translation extends DepthFirstAdapter Double num = Double.parseDouble(programStack.pop().getText()); System.out.println("Popped " + num); Double out = Math.sin(Math.toRadians(num)); - programStack.push(new TDouble(String.format("%f", out))); + programStack.push(new Decimal(out)); System.out.println("Pushed sin(" + num + ") = " + out + " to stack"); System.out.println(programStack); } public void outAPlusExpr(APlusExpr node) { - Double num2 = Double.parseDouble(programStack.pop().getText()); - Double num1 = Double.parseDouble(programStack.pop().getText()); - System.out.println("Popped " + num1 + " and " + num2 + " from stack"); - Double out = num1 + num2; - if ((out % 1) == 0) - { - // the output is an integer, change types to save memory - programStack.push(new TNumber(String.format("%d", out.intValue()))); - } - else - { - programStack.push(new TDouble(String.format("%f", out))); - } - - System.out.println("Pushed " + num1 + "+" + num2 + "=" + out + " to stack"); + Type op2 = programStack.pop(); + Type op1 = programStack.pop(); + System.out.println("Popped " + op1 + " and " + op2 + " from stack"); + Type out = op1.add(op2); + programStack.push(out); + System.out.println("Pushed " + op1 + "+" + op2 + "=" + out + " to stack"); System.out.println(programStack); } public void outAMinusExpr(AMinusExpr node) { - Double num2 = Double.parseDouble(programStack.pop().getText()); - Double num1 = Double.parseDouble(programStack.pop().getText()); - System.out.println("Popped " + num1 + " and " + num2 + " from stack"); - Double out = num1 - num2; - if ((out % 1) == 0) - { - // the output is an integer, change types to save memory - programStack.push(new TNumber(String.format("%d", out.intValue()))); - } - else - { - programStack.push(new TDouble(String.format("%f", out))); - } - - System.out.println("Pushed " + num1 + "-" + num2 + "=" + out + " to stack"); + Type op2 = programStack.pop(); + Type op1 = programStack.pop(); + System.out.println("Popped " + op1 + " and " + op2 + " from stack"); + Type out = op1.sub(op2); + programStack.push(out); + System.out.println("Pushed " + op1 + "-" + op2 + "=" + out + " to stack"); System.out.println(programStack); } public void outAMultFactor(AMultFactor node) { - Double num2 = Double.parseDouble(programStack.pop().getText()); - Double num1 = Double.parseDouble(programStack.pop().getText()); - System.out.println("Popped " + num1 + " and " + num2 + " from stack"); - Double out = num1 * num2; - if ((out % 1) == 0) - { - // the output is an integer, change types to save memory - programStack.push(new TNumber(String.format("%d", out.intValue()))); - } - else - { - programStack.push(new TDouble(String.format("%f", out))); - } - - System.out.println("Pushed " + num1 + "*" + num2 + "=" + out + " to stack"); + Type op2 = programStack.pop(); + Type op1 = programStack.pop(); + System.out.println("Popped " + op1 + " and " + op2 + " from stack"); + Type out = op1.mult(op2); + programStack.push(out); + System.out.println("Pushed " + op1 + "*" + op2 + "=" + out + " to stack"); System.out.println(programStack); } public void outADivFactor(ADivFactor node) { - Double num2 = Double.parseDouble(programStack.pop().getText()); - Double num1 = Double.parseDouble(programStack.pop().getText()); - System.out.println("Popped " + num1 + " and " + num2 + " from stack"); - Double out = num1 / num2; - if ((out % 1) == 0) - { - // the output is an integer, change types to save memory - programStack.push(new TNumber(String.format("%d", out.intValue()))); - } - else - { - programStack.push(new TDouble(String.format("%f", out))); - } - - System.out.println("Pushed " + num1 + "/" + num2 + "=" + out + " to stack"); + Type op2 = programStack.pop(); + Type op1 = programStack.pop(); + System.out.println("Popped " + op1 + " and " + op2 + " from stack"); + Type out = op1.div(op2); + programStack.push(out); + System.out.println("Pushed " + op1 + "/" + op2 + "=" + out + " to stack"); System.out.println(programStack); } public void outAModFactor(AModFactor node) { - Double num2 = Double.parseDouble(programStack.pop().getText()); - Double num1 = Double.parseDouble(programStack.pop().getText()); - System.out.println("Popped " + num1 + " and " + num2 + " from stack"); - Double out = num1 % num2; - if ((out % 1) == 0) - { - // the output is an integer, change types to save memory - programStack.push(new TNumber(String.format("%d", out.intValue()))); - } - else - { - programStack.push(new TDouble(String.format("%f", out))); - } - - System.out.println("Pushed " + num1 + "%" + num2 + "=" + out + " to stack"); + Type op2 = programStack.pop(); + Type op1 = programStack.pop(); + System.out.println("Popped " + op1 + " and " + op2 + " from stack"); + Type out = op1.mod(op2); + programStack.push(out); + System.out.println("Pushed " + op1 + "%" + op2 + "=" + out + " to stack"); System.out.println(programStack); } } -- 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/Translation.java | 58 +++++++++++----------- 1 file changed, 30 insertions(+), 28 deletions(-) (limited to 'code/simpleSableCCCalulator/sableCCCalculator/Translation.java') diff --git a/code/simpleSableCCCalulator/sableCCCalculator/Translation.java b/code/simpleSableCCCalulator/sableCCCalculator/Translation.java index a673edb..737ecbd 100644 --- a/code/simpleSableCCCalulator/sableCCCalculator/Translation.java +++ b/code/simpleSableCCCalulator/sableCCCalculator/Translation.java @@ -1,88 +1,90 @@ package sableCCCalculator; +import sableCCCalculator.SymbolTable.SymbolTableIndex; import sableCCCalculator.analysis.*; import sableCCCalculator.types.*; import sableCCCalculator.node.*; class Translation extends DepthFirstAdapter { - private ProgramStack programStack = new ProgramStack<>(); + private ProgramStack programStack = new ProgramStack(); + private SymbolTable symbolTable = new SymbolTable(); public void caseTNumber(TNumber node) { System.out.println("Pushing " + Integer.parseInt(node.getText()) + " to stack"); - programStack.push(new Int(node.getText())); - System.out.println(programStack); + programStack.push(symbolTable.addConstant(new Int(node.getText()))); + System.out.println(programStack.toString(symbolTable)); } public void caseTDouble(TDouble node) { System.out.println("Pushing a double: " + Double.parseDouble(node.getText())); - programStack.push(new Decimal(node.getText())); - System.out.println(programStack); + programStack.push(symbolTable.addConstant(new Decimal(node.getText()))); + System.out.println(programStack.toString(symbolTable)); } public void outASineTerm(ASineTerm node) { - Double num = Double.parseDouble(programStack.pop().getText()); + Double num = Double.parseDouble(symbolTable.get(programStack.pop()).toString()); System.out.println("Popped " + num); Double out = Math.sin(Math.toRadians(num)); - programStack.push(new Decimal(out)); + programStack.push(symbolTable.addConstant(new Decimal(out))); System.out.println("Pushed sin(" + num + ") = " + out + " to stack"); - System.out.println(programStack); + System.out.println(programStack.toString(symbolTable)); } public void outAPlusExpr(APlusExpr node) { - Type op2 = programStack.pop(); - Type op1 = programStack.pop(); + Type op2 = symbolTable.get(programStack.pop()); + Type op1 = symbolTable.get(programStack.pop()); System.out.println("Popped " + op1 + " and " + op2 + " from stack"); Type out = op1.add(op2); - programStack.push(out); + programStack.push(symbolTable.addConstant(out)); System.out.println("Pushed " + op1 + "+" + op2 + "=" + out + " to stack"); - System.out.println(programStack); + System.out.println(programStack.toString(symbolTable)); } public void outAMinusExpr(AMinusExpr node) { - Type op2 = programStack.pop(); - Type op1 = programStack.pop(); + Type op2 = symbolTable.get(programStack.pop()); + Type op1 = symbolTable.get(programStack.pop()); System.out.println("Popped " + op1 + " and " + op2 + " from stack"); Type out = op1.sub(op2); - programStack.push(out); + programStack.push(symbolTable.addConstant(out)); System.out.println("Pushed " + op1 + "-" + op2 + "=" + out + " to stack"); - System.out.println(programStack); + System.out.println(programStack.toString(symbolTable)); } public void outAMultFactor(AMultFactor node) { - Type op2 = programStack.pop(); - Type op1 = programStack.pop(); + Type op2 = symbolTable.get(programStack.pop()); + Type op1 = symbolTable.get(programStack.pop()); System.out.println("Popped " + op1 + " and " + op2 + " from stack"); Type out = op1.mult(op2); - programStack.push(out); + programStack.push(symbolTable.addConstant(out)); System.out.println("Pushed " + op1 + "*" + op2 + "=" + out + " to stack"); - System.out.println(programStack); + System.out.println(programStack.toString(symbolTable)); } public void outADivFactor(ADivFactor node) { - Type op2 = programStack.pop(); - Type op1 = programStack.pop(); + Type op2 = symbolTable.get(programStack.pop()); + Type op1 = symbolTable.get(programStack.pop()); System.out.println("Popped " + op1 + " and " + op2 + " from stack"); Type out = op1.div(op2); - programStack.push(out); + programStack.push(symbolTable.addConstant(out)); System.out.println("Pushed " + op1 + "/" + op2 + "=" + out + " to stack"); - System.out.println(programStack); + System.out.println(programStack.toString(symbolTable)); } public void outAModFactor(AModFactor node) { - Type op2 = programStack.pop(); - Type op1 = programStack.pop(); + Type op2 = symbolTable.get(programStack.pop()); + Type op1 = symbolTable.get(programStack.pop()); System.out.println("Popped " + op1 + " and " + op2 + " from stack"); Type out = op1.mod(op2); - programStack.push(out); + programStack.push(symbolTable.addConstant(out)); System.out.println("Pushed " + op1 + "%" + op2 + "=" + out + " to stack"); - System.out.println(programStack); + System.out.println(programStack.toString(symbolTable)); } } -- cgit v1.2.3