Variables and basic data types implemented

Author: pritansh

Compiler/Demo.j

@@ -4,10 +4,21 @@
 .method static public main([Ljava/lang/String;)V
 .limit stack 100
 .limit locals 100
-ldc 5
-istore 0
+ldc 4.3
+fstore 0
+ldc 4.3
+ldc 4.5
+fstore 1
+ldc 4.5
+ldc 4
+i2f
+fstore 2
 getstatic java/lang/System/out Ljava/io/PrintStream;
-iload 0
-invokevirtual java/io/PrintStream/print(I)V
+fload 0
+fload 1
+fadd
+fload 2
+fadd
+invokevirtual java/io/PrintStream/println(F)V
 return
 .end method

Compiler/code.pc

@@ -1,2 +1,2 @@
-a=5
-print(a)
+a=4.3,b=4.5,c=4
+println(a+b+c)

Compiler/src/pc/compiler/Compiler.java

@@ -27,7 +27,8 @@ public class Compiler extends PCBaseVisitor<String>{
 
 	private File file = null;
 	private FileWriter fw = null;
-	private String type;
+	private String type, prevType;
+	private boolean floatBool = false;
 	private HashMap<String,SymbolTableNode> symbolTable = new HashMap<>();
 	private int lineNumber = 1;
 	String begPrint = "\ngetstatic java/lang/System/out Ljava/io/PrintStream;"; 
@@ -100,12 +101,17 @@ public String visitDivide(DivideContext ctx) {
 	}
 
 	public String visitDigit(DigitContext ctx) {
-		type = "i";
 		appendToFile("\nldc " + ctx.digit.getText());
+		if(type!=null && type.equals("f"))
+			appendToFile("\ni2f");
+		else
+			type = "i";
 		return null;
 	}
 
 	public String visitDecimal(DecimalContext ctx) {
+		if(type!=null && type.equals("i"))
+			appendToFile("\ni2f");
 		type = "f";
 		appendToFile("\nldc " + ctx.decimal.getText());
 		return null;
@@ -115,7 +121,16 @@ public String visitVariable(VariableContext ctx) {
 		if(symbolTable.get(ctx.var.getText())!=null) {
 			SymbolTableNode tmp = symbolTable.get(ctx.var.getText());
 			type = tmp.getType();
+			if(!floatBool && type.equals("f") && prevType!=null && prevType.equals("i"))
+				appendToFile("\ni2f");
+			if(type.equals("f"))
+				floatBool = true;
 			appendToFile("\n" + type.toLowerCase() + "load " + tmp);
+			prevType = type;
+			if(type!=null && type.equals("i") && floatBool) {
+				appendToFile("\ni2f");
+				type = "f";
+			}
 		}
 		else 
 			throw new VariableNotDefined(ctx.getText(), ctx.var.getText(), lineNumber);
@@ -125,10 +140,19 @@ public String visitVariable(VariableContext ctx) {
 	public String visitLine(LineContext ctx) {
 		lineNumber++;
 		type = null;
+		prevType = null;
+		floatBool = false;
 		return null;
 	}
 
 	public String visitMultipleVariable(MultipleVariableContext ctx) {
+		visit(ctx.exp);
+		if(symbolTable.get(ctx.var.getText())==null) 
+			symbolTable.put(ctx.var.getText(), new SymbolTableNode(ctx.var.getText(), type, symbolTable.size()));
+		else
+			throw new VariableAlreadyDefined(ctx.getText(), ctx.var.getText(), lineNumber);
+		appendToFile("\n" + type.toLowerCase() + "store " + symbolTable.get(ctx.var.getText()));
+		visitChildren(ctx);
 		return null;
 	}
 

Compiler/src/pc/compiler/Main.java

@@ -32,7 +32,7 @@ public static void main(String[] args) throws IOException {
 		CommonTokenStream tokens = new  CommonTokenStream(lexer);
 		PCParser parser = new PCParser(tokens);
 		ParseTree tree = parser.program();
-		showTree(parser, tree);
+		//showTree(parser, tree);
 		new Compiler("Demo.j").visit(tree);    //Begins the creation of .j File
 		runProcess(compile);
 		runProcess(run);