tests/integration/positive/real numbers.output-desired tests/integration/positive/real numbers.xpl @@ -3,21 +3,21 @@ Builds the Xpl compiler and runs the associated unit and integration tests. </description> - <property name="doc" location="doc" /> - <property name="src" location="src" /> - <property name="src-xpl" location="${src}/xpl" /> - <property name="src-semantic" location="${src}/xpl/semantic" /> - <property name="src-codegen" location="${src}/xpl/codegen" /> - <property name="bin" location="bin" /> - <property name="classes" location="${bin}/classes" /> - <property name="classes-xpl" location="${bin}/classes/xpl" /> - <property name="classes-runtime" location="${bin}/classes/xpl/runtime" /> - <property name="classes-tests" location="${bin}/classes/tests" /> - <property name="tests" location="tests/" /> - <property name="tests-unit" location="tests/unit" /> - <property name="tests-integration" location="tests/integration" /> - <property name="tests-integration-pos" location="tests/integration/positive" /> - <property name="tests-integration-neg" location="tests/integration/negative" /> + <property name="doc" location="doc" /> + <property name="src" location="src" /> + <property name="src-xpl" location="${src}/xpl" /> + <property name="src-semantic" location="${src}/xpl/semantic" /> + <property name="src-codegen" location="${src}/xpl/codegen" /> + <property name="bin" location="bin" /> + <property name="classes" location="${bin}/classes" /> + <property name="classes-xpl" location="${bin}/classes/xpl" /> + <property name="classes-runtime" location="${bin}/classes/xpl/runtime" /> + <property name="classes-tests" location="${bin}/classes/tests" /> + <property name="tests" location="tests/" /> + <property name="tests-unit" location="tests/unit" /> + <property name="tests-integration" location="tests/integration" /> + <property name="tests-integration-pos" location="tests/integration/positive" /> + <property name="tests-integration-neg" location="tests/integration/negative" /> <macrodef name="antlr3"> <attribute name="libdirectory"/> @@ -109,12 +109,50 @@ <sequential> <basename property="@{file}-test-name" file="@{file}" suffix=".xpl" /> - <java jar="${bin}/xpl.jar" fork="true" output="${tests-integration-pos}/${@{file}-test-name}.compilation" failonerror="true"> + <java jar="${bin}/xpl.jar" fork="true" output="${tests-integration-pos}/${@{file}-test-name}.compilation" resultproperty="compilation-succeeded"> <arg value="@{file}" /> <arg value="${tests-integration-pos}/${@{file}-test-name}.class" /> </java> - <java classpath="${tests-integration-pos}:${bin}/runtime.jar" classname="${@{file}-test-name}" fork="true" output="${tests-integration-pos}/${@{file}-test-name}.output-current" outputproperty="run-failure" /> + <if> + <equals arg1="${compilation-succeeded}" arg2="1" /> + <then> + <echo message="Compilation failure: " /> + + <exec executable="cat"> + <arg value="${tests-integration-pos}/${@{file}-test-name}.compilation" /> + </exec> + <fail /> + </then> + </if> + + <java classpath="${tests-integration-pos}:${bin}/runtime.jar" classname="${@{file}-test-name}" fork="true" output="${tests-integration-pos}/${@{file}-test-name}.output-current" resultproperty="run-succeeded" /> + + <if> + <equals arg1="${run-succeeded}" arg2="1" /> + <then> + <echo message="Program run failure: " /> + <echo /> + <echo /> + + <echo message="Compilation message: " /> + <echo /> + + <exec executable="cat"> + <arg value="${tests-integration-pos}/${@{file}-test-name}.compilation" /> + </exec> + + <echo /> + <echo message="Run output: " /> + <echo /> + + <exec executable="cat"> + <arg value="${tests-integration-pos}/${@{file}-test-name}.output-current" /> + </exec> + + <fail /> + </then> + </if> <exec executable="cat" output="${tests-integration-pos}/${@{file}-test-name}.output-diff"> <arg value="${tests-integration-pos}/${@{file}-test-name}.xpl" /> @@ -147,7 +185,6 @@ </sequential> </for> - <junit haltonfailure="yes" haltonerror="yes" showoutput="yes"> <classpath> <pathelement path="${classes-tests}"/> build.xml @@ -2,7 +2,7 @@ grammar Xpl; options { output=AST; ASTLabelType=ASTNode; } -tokens { CALL; CALL_ARGUMENTS; WHILE; IF; METHOD; PROGN; RETURN; STRING_PLUS; TOSTRING; } +tokens { CALL; CALL_ARGUMENTS; WHILE; IF; METHOD; PROGN; RETURN; STRING_PLUS; TOREAL; TOSTRING; } @header { package xpl; @@ -66,13 +66,15 @@ term: factor (('*' | '/')^ factor)*; factor: atom ('%'^ atom)*; -atom: NUMBER | STRING | (IDENTIFIER '(') => call | '('! expression ')'! | IDENTIFIER<IdentifierNode>; +atom: REAL | INTEGER | STRING | (IDENTIFIER '(') => call | '('! expression ')'! | IDENTIFIER<IdentifierNode>; STRING: '\"' (options {greedy=false;}: ('A'..'z') | ' ' | '(' | ')' | ':' | '-')* '\"'; -NUMBER: ('0'..'9')+; +REAL: ('0'..'9')+ '.' ('0'..'9')+; -TYPE: 'int' | 'string' | 'void'; +INTEGER: ('0'..'9')+; + +TYPE: 'int' | 'real' | 'string' | 'void'; IDENTIFIER: ('a'..'z' | '_')+; src/xpl/Xpl.g @@ -39,7 +39,7 @@ public class XplCompiler { parse(); semanticAnalysis(); codeGeneration(); - System.out.println("Compilations was successfull."); + System.out.println("Compilation was successfull."); } catch(SyntacticAnalysisError e) { System.out.println("Syntax errors: "); src/xpl/XplCompiler.java @@ -55,7 +55,7 @@ conditional }; conditional_test[boolean hasElse] -@after { generate.conditional().ifAfterCondition(hasElse); } +@after { System.out.println("hasElse: " + hasElse); generate.conditional().ifAfterCondition(hasElse); } : expression; conditional_true_branch[boolean hasElse] @@ -107,11 +107,11 @@ comparision_expression | binary_expression; binary_expression - : ^('+' a=binary_expression b=binary_expression) { generate.arithmetic().add(); } - | ^('-' a=binary_expression b=binary_expression) { generate.arithmetic().subtract(); } - | ^('*' a=binary_expression b=binary_expression) { generate.arithmetic().multiply(); } - | ^('/' a=binary_expression b=binary_expression) { generate.arithmetic().divide(); } - | ^('%' a=binary_expression b=binary_expression) { generate.arithmetic().mod(); } + : ^('+' a=binary_expression b=binary_expression) { generate.arithmetic().add($start); } + | ^('-' a=binary_expression b=binary_expression) { generate.arithmetic().subtract($start); } + | ^('*' a=binary_expression b=binary_expression) { generate.arithmetic().multiply($start); } + | ^('/' a=binary_expression b=binary_expression) { generate.arithmetic().divide($start); } + | ^('%' a=binary_expression b=binary_expression) { generate.arithmetic().mod($start); } | string_concatenation | atom ; @@ -130,7 +130,8 @@ string_concatenation_arg }; atom - : NUMBER { generate.misc().load(Integer.parseInt($NUMBER.text)); } + : REAL { generate.misc().load($REAL); } + | INTEGER { generate.misc().load($INTEGER); } | IDENTIFIER { generate.misc().loadVariable((IdentifierNode)$IDENTIFIER); } | STRING { generate.string().load(strip($STRING.text)); } | '(' expression ')' @@ -138,7 +139,7 @@ atom ; call -@init { generate.method().prepareCall(); } +@init { generate.method().prepareCall((MethodNode)$start); } : ^(CALL IDENTIFIER call_arguments?) { generate.method().call(((MethodNode)$start)); }; call_arguments src/xpl/codegen/CodeGeneration.g @@ -2,12 +2,49 @@ package xpl.codegen; import org.objectweb.asm.MethodVisitor; +import xpl.semantic.Types; +import xpl.semantic.ast.ASTNode; + public class CodeGeneratorArithmetic extends CodeGeneratorModule { public CodeGeneratorArithmetic(Context context) { super(context); } - public void add() { currentMethod.visitInsn(IADD); } - public void subtract() { currentMethod.visitInsn(ISUB); } - public void multiply() { currentMethod.visitInsn(IMUL); } - public void divide() { currentMethod.visitInsn(IDIV); } - public void mod() { currentMethod.visitInsn(IREM); } + public void add(ASTNode additionNode) { + if(additionNode.getNodeType() == Types.Integer) + currentMethod.visitInsn(IADD); + else + currentMethod.visitInsn(DADD); + } + + public void subtract(ASTNode substractionNode) { + if(substractionNode.getNodeType() == Types.Integer) + currentMethod.visitInsn(ISUB); + else + currentMethod.visitInsn(DSUB); + } + + public void multiply(ASTNode multiplicationNode) { + if(multiplicationNode.getNodeType() == Types.Integer) + currentMethod.visitInsn(IMUL); + else + currentMethod.visitInsn(DMUL); + } + + public void divide(ASTNode divisionNode) { + if(divisionNode.getNodeType() == Types.Integer) + currentMethod.visitInsn(IDIV); + else + currentMethod.visitInsn(DDIV); + } + + public void mod(ASTNode moduloDivisionNode) { + if(moduloDivisionNode.getNodeType() == Types.Integer) + currentMethod.visitInsn(IREM); + else + currentMethod.visitInsn(DREM); + } + + private void promoteType(ASTNode operationNode) { + if(operationNode.getTypeToPromoteTo() != null) + currentMethod.visitInsn(I2D); + } } src/xpl/codegen/CodeGeneratorArithmetic.java @@ -31,30 +31,32 @@ public class CodeGeneratorMethod extends CodeGeneratorModule { public void finish(MethodNode definition) { Method method = definition.getMethod(); - if(method.getReturnType().equals(Types.Integer)) + if(method.getReturnType().equals(Types.Real)) + currentMethod.visitInsn(DRETURN); + else if(method.getReturnType().equals(Types.Integer)) currentMethod.visitInsn(IRETURN); else if(method.getReturnType().equals(Types.String)) currentMethod.visitInsn(ARETURN); else currentMethod.visitInsn(RETURN); - currentMethod.visitMaxs(10, method.getArity() + 1); + currentMethod.visitMaxs(10, method.getLocalsSize()); context.switchMethodVisitor(methods.pop()); } - public void prepareCall() { - currentMethod.visitVarInsn(ALOAD, 0); + public void prepareCall(MethodNode call) { + Method method = call.getMethod(); + + if(!method.isBuiltin()) + currentMethod.visitVarInsn(ALOAD, 0); } public void call(MethodNode call) { Method method = call.getMethod(); String name = method.getName(); - if(method.isBuiltin()) { + if(method.isBuiltin()) currentMethod.visitMethodInsn(INVOKESTATIC, "xpl/runtime/Runtime", name, method.getSignature()); - currentMethod.visitInsn(POP); - } - else { + else currentMethod.visitMethodInsn(INVOKEVIRTUAL, className, name, method.getSignature()); - } } } src/xpl/codegen/CodeGeneratorMethod.java @@ -13,7 +13,14 @@ public class CodeGeneratorMisc extends CodeGeneratorModule { private int stackDepth = 0; public int getStackDepth() { return stackDepth; } - public void load(int number) { stackDepth += 1; currentMethod.visitLdcInsn(number); } + public void load(ASTNode numberNode) { + stackDepth += 1; + if(numberNode.getNodeType() == Types.Integer) + currentMethod.visitLdcInsn(Integer.parseInt(numberNode.getText())); + else + currentMethod.visitLdcInsn(Double.parseDouble(numberNode.getText())); + promoteType(numberNode); + } public void pushThis() { currentMethod.visitVarInsn(ALOAD, 0); @@ -37,6 +44,8 @@ public class CodeGeneratorMisc extends CodeGeneratorModule { Argument arg = (Argument) identifier; if(arg.getType().equals(Types.Integer)) currentMethod.visitVarInsn(ILOAD, arg.getId()); + else if(arg.getType().equals(Types.Real)) + currentMethod.visitVarInsn(DLOAD, arg.getId()); else currentMethod.visitVarInsn(ALOAD, arg.getId()); } @@ -45,6 +54,8 @@ public class CodeGeneratorMisc extends CodeGeneratorModule { currentMethod.visitVarInsn(ALOAD, 0); currentMethod.visitFieldInsn(GETFIELD, className, var.getVariableId(), var.typeSignature()); } + + promoteType(node); } public void finish() { @@ -52,4 +63,9 @@ public class CodeGeneratorMisc extends CodeGeneratorModule { currentMethod.visitMaxs(10, 1); currentMethod.visitEnd(); } + + private void promoteType(ASTNode operationNode) { + if(operationNode.getTypeToPromoteTo() != null) + currentMethod.visitInsn(I2D); + } } src/xpl/codegen/CodeGeneratorMisc.java @@ -9,6 +9,14 @@ public class Runtime { System.out.println(i); } + public static void print(double d) { + System.out.println(d); + } + + public static double sqrt(double x) { + return Math.sqrt(x); + } + public static int power(int n, int pow) { if(pow == 0) return 1; src/xpl/runtime/Runtime.java @@ -28,7 +28,6 @@ options { private void error(TreeNodeStream input, int line, String message) throws RecognitionException { errors.add("Line " + line + ": " + message); - throw new RecognitionException(input); } } @@ -54,13 +53,17 @@ method_header returns [Method method] Type[] argumentTypes = new Type[$args.size()]; TypeNode returnTypeNode = (TypeNode) $return_type; + int argId = 1; + for(int i = 0; i < $args.size(); i++) { ASTNode idNode = (ASTNode) $args.get(i); TypeNode typeNode = (TypeNode) $types.get(i); + Type type = typeNode.getRepresentedType(); - Type type = typeNode.getRepresentedType(); - arguments.add(new Argument(symbolTable.getNextScopeId(), type, idNode.getText(), i+1)); + arguments.add(new Argument(symbolTable.getNextScopeId(), type, idNode.getText(), argId)); argumentTypes[i] = type; + + argId += (type == Types.Real ? 2 : 1); } Method method = new Method(symbolTable.getCurrentScopeId(), returnTypeNode.getRepresentedType(), $name.text, argumentTypes); @@ -73,8 +76,11 @@ method_header returns [Method method] conditional : ^(IF expression ^(PROGN atomic_operation+) (^(PROGN atomic_operation+) { - $conditional.start.hasElse = true; - })?); + System.out.println("Setting hasElse on true"); + $start.hasElse = true; + })?) { + System.out.println("Processing conditional"); + }; loop : ^(WHILE expression ^(PROGN atomic_operation+)); @@ -131,6 +137,10 @@ comparision_expression binary_expression : ^(('-' | '*' | '/' | '%') a=binary_expression b=binary_expression) { TypeChecker.infer($start, $a.start, $b.start); + if($start.isOf(Types.Real) && !$a.start.isOf(Types.Real)) + $a.start.setTypeToPromoteTo(Types.Real); + if($start.isOf(Types.Real) && !$b.start.isOf(Types.Real)) + $b.start.setTypeToPromoteTo(Types.Real); } | addition { $start.setNodeType($addition.start.getNodeType()); @@ -146,6 +156,10 @@ binary_expression addition : ^('+' a=addition_flatten b=addition_flatten) { TypeChecker.infer($start, $a.start, $b.start); + if($start.isOf(Types.Real) && !$a.start.isOf(Types.Real)) + $a.start.setTypeToPromoteTo(Types.Real); + if($start.isOf(Types.Real) && !$b.start.isOf(Types.Real)) + $b.start.setTypeToPromoteTo(Types.Real); } -> {$start.isOf(Types.String)}? ^(STRING_PLUS<ASTNode>[Types.String] addition_flatten+) -> ^('+' addition_flatten+) @@ -161,8 +175,11 @@ addition_flatten ; atom - : NUMBER { - $NUMBER.setNodeType(Types.Integer); + : REAL { + $REAL.setNodeType(Types.Real); + } + | INTEGER { + $INTEGER.setNodeType(Types.Integer); } | STRING { $STRING.setNodeType(Types.String); src/xpl/semantic/SemanticAnalysis.g @@ -22,13 +22,16 @@ public class SymbolTable { public SymbolTable() { enterScope(); + put(new Method(0, Types.Void, "print", new Type[] { Types.Real }, true)); put(new Method(0, Types.Void, "print", new Type[] { Types.String }, true)); put(new Method(0, Types.Void, "print", new Type[] { Types.Integer }, true)); put(new Method(0, Types.Integer, "power", new Type[] { Types.Integer, Types.Integer }, true)); + put(new Method(0, Types.Real, "sqrt", new Type[] { Types.Real }, true)); } /** * Creates a new scope and enters it + * * @param scopeId The id to give to the newly created scope */ public void enterScope() { src/xpl/semantic/SymbolTable.java @@ -13,6 +13,9 @@ public class Type { public String getName() { return name; } public String getSignature() { + if(name.equals("real")) + return "D"; + if(name.equals("integer")) return "I"; src/xpl/semantic/Type.java @@ -5,24 +5,28 @@ import xpl.semantic.ast.*; import java.util.*; public class TypeChecker { - public static void infer(ASTNode deduced, final ASTNode a, final ASTNode b) { - if(a.isOf(Types.String) || b.isOf(Types.String)) - deduced.setNodeType(Types.String); - else - deduced.setNodeType(Types.Integer); - } + public static void infer(ASTNode deduced, final ASTNode a, final ASTNode b) { + if(a.isOf(Types.String) || b.isOf(Types.String)) + deduced.setNodeType(Types.String); + else if(a.isOf(Types.Real) || b.isOf(Types.Real)) + deduced.setNodeType(Types.Real); + else + deduced.setNodeType(Types.Integer); + } - public static void infer(ASTNode deduced, final List<ASTNode> list) { - if(containsString(list)) - deduced.setNodeType(Types.String); - else - deduced.setNodeType(Types.Integer); - } + public static void infer(ASTNode deduced, final List<ASTNode> list) { + if(containsType(list, Types.String)) + deduced.setNodeType(Types.String); + else if(containsType(list, Types.Real)) + deduced.setNodeType(Types.Real); + else + deduced.setNodeType(Types.Integer); + } - private static boolean containsString(final List<ASTNode> astNodes) { - for(ASTNode node : astNodes) - if(node.isOf(Types.String)) - return true; - return false; - } + private static boolean containsType(final List<ASTNode> astNodes, Type type) { + for(ASTNode node : astNodes) + if(node.isOf(type)) + return true; + return false; + } } src/xpl/semantic/TypeChecker.java @@ -1,6 +1,7 @@ package xpl.semantic; public class Types { + public static Type Real = new Type("real"); public static Type Integer = new Type("integer"); public static Type String = new Type("string"); public static Type Void = new Type("void"); src/xpl/semantic/Types.java @@ -27,5 +27,9 @@ public class ASTNode extends CommonTree { public void setNodeType(Type nodeType) { this.nodeType = nodeType; } public boolean isOf(Type nodeType) { return this.nodeType != null && this.nodeType.equals(nodeType); } + private Type typeToPromoteTo; + public void setTypeToPromoteTo(Type type) { this.typeToPromoteTo = type; } + public Type getTypeToPromoteTo() { return typeToPromoteTo; } + public boolean hasElse = false; } src/xpl/semantic/ast/ASTNode.java @@ -10,7 +10,9 @@ public class TypeNode extends ASTNode { public TypeNode(Token tok) { super(tok); - if(tok.getText().equals("int")) + if(tok.getText().equals("real")) + representedType = Types.Real; + else if(tok.getText().equals("int")) representedType = Types.Integer; else if(tok.getText().equals("string")) representedType = Types.String; src/xpl/semantic/ast/TypeNode.java @@ -1,6 +1,7 @@ package xpl.semantic.symbols; import xpl.semantic.Type; +import xpl.semantic.Types; public class Method extends Symbol { public Method(int scopeId, Type returnType, String name, Type[] argumentTypes) { @@ -24,6 +25,17 @@ public class Method extends Symbol { public Type[] getArgumentTypes() { return argumentTypes; } public int getArity() { return argumentTypes.length; } + public int getLocalsSize() { + int localsSize = 1; + for(Type type : argumentTypes) { + if(type == Types.Real) + localsSize += 2; + else + localsSize += 1; + } + return localsSize; + } + public String getArgumentsSignature() { String result = ""; for(Type type : argumentTypes) src/xpl/semantic/symbols/Method.java 5adff71b11c76e9bc1a4f9e7ab177912007548ce sztywny sztywny@gmail.com http://github.com/sztywny/xpl/commit/3ee88c05ff11e2eafbd7941c760b5f46d375f8ff 3ee88c05ff11e2eafbd7941c760b5f46d375f8ff 2008-12-21T13:01:15-08:00 2008-12-21T13:01:15-08:00 Basic real numbers support added. 67493eb4c5e6520be4b1ef5ccf9c188049a05657 sztywny sztywny@gmail.com