diff options
Diffstat (limited to 'src/main/java/org/zwobble/couscous/backends/python')
4 files changed, 90 insertions, 2 deletions
diff --git a/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java b/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java index fb1851c..75b9350 100644 --- a/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java +++ b/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; + import org.zwobble.couscous.ast.AssignmentNode; import org.zwobble.couscous.ast.ClassNode; import org.zwobble.couscous.ast.ConstructorCallNode; @@ -13,6 +14,7 @@ import org.zwobble.couscous.ast.ConstructorNode; import org.zwobble.couscous.ast.ExpressionNode; import org.zwobble.couscous.ast.ExpressionStatementNode; import org.zwobble.couscous.ast.FieldAccessNode; +import org.zwobble.couscous.ast.IfStatementNode; import org.zwobble.couscous.ast.LiteralNode; import org.zwobble.couscous.ast.LocalVariableDeclarationNode; import org.zwobble.couscous.ast.MethodCallNode; @@ -45,11 +47,13 @@ import org.zwobble.couscous.values.PrimitiveValue; import org.zwobble.couscous.values.PrimitiveValueVisitor; import org.zwobble.couscous.values.StringValue; import org.zwobble.couscous.values.UnitValue; + import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; + import static com.google.common.collect.Iterators.singletonIterator; import static java.util.Arrays.asList; import static org.zwobble.couscous.backends.python.ast.PythonAssignmentNode.pythonAssignment; @@ -59,6 +63,7 @@ import static org.zwobble.couscous.backends.python.ast.PythonCallNode.pythonCall import static org.zwobble.couscous.backends.python.ast.PythonClassNode.pythonClass; import static org.zwobble.couscous.backends.python.ast.PythonConditionalExpressionNode.pythonConditionalExpression; import static org.zwobble.couscous.backends.python.ast.PythonFunctionDefinitionNode.pythonFunctionDefinition; +import static org.zwobble.couscous.backends.python.ast.PythonIfStatementNode.pythonIfStatement; import static org.zwobble.couscous.backends.python.ast.PythonImportAliasNode.pythonImportAlias; import static org.zwobble.couscous.backends.python.ast.PythonImportNode.pythonImport; import static org.zwobble.couscous.backends.python.ast.PythonIntegerLiteralNode.pythonIntegerLiteral; @@ -117,7 +122,6 @@ public class PythonCodeGenerator { private static Set<TypeName> findReferencedClasses(ClassNode classNode) { ImmutableSet.Builder<TypeName> imports = ImmutableSet.builder(); NodeVisitors.visitAll(classNode, new NodeVisitorWithEmptyDefaults(){ - @Override public void visit(StaticMethodCallNode staticMethodCall) { imports.add(staticMethodCall.getClassName()); @@ -168,10 +172,16 @@ public class PythonCodeGenerator { Iterable<String> argumentNames = Iterables.concat( method.isStatic() ? Collections.<String>emptyList() : asList("self"), explicitArgumentNames); - List<PythonStatementNode> pythonBody = method.getBody().stream().map(PythonCodeGenerator::generateStatement).collect(Collectors.toList()); + List<PythonStatementNode> pythonBody = generateStatements(method.getBody()); return pythonFunctionDefinition(method.getName(), ImmutableList.copyOf(argumentNames), new PythonBlock(pythonBody)); } + private static List<PythonStatementNode> generateStatements(List<StatementNode> statements) { + return statements.stream() + .map(PythonCodeGenerator::generateStatement) + .collect(Collectors.toList()); + } + private static PythonStatementNode generateStatement(StatementNode statement) { return statement.accept(new StatementGenerator()); } @@ -196,6 +206,14 @@ public class PythonCodeGenerator { public PythonStatementNode visit(LocalVariableDeclarationNode declaration) { return pythonAssignment(pythonVariableReference(declaration.getDeclaration().getName()), generateExpression(declaration.getInitialValue())); } + + @Override + public PythonStatementNode visit(IfStatementNode ifStatement) { + return pythonIfStatement( + generateExpression(ifStatement.getCondition()), + generateStatements(ifStatement.getTrueBranch()), + generateStatements(ifStatement.getFalseBranch())); + } } private static PythonExpressionNode generateExpression(ExpressionNode expression) { diff --git a/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java b/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java index 2fb341f..4eea760 100644 --- a/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java +++ b/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java @@ -13,6 +13,7 @@ import org.zwobble.couscous.backends.python.ast.PythonConditionalExpressionNode; import org.zwobble.couscous.backends.python.ast.PythonExpressionNode; import org.zwobble.couscous.backends.python.ast.PythonFunctionDefinitionNode; import org.zwobble.couscous.backends.python.ast.PythonGetSliceNode; +import org.zwobble.couscous.backends.python.ast.PythonIfStatementNode; import org.zwobble.couscous.backends.python.ast.PythonImportNode; import org.zwobble.couscous.backends.python.ast.PythonIntegerLiteralNode; import org.zwobble.couscous.backends.python.ast.PythonModuleNode; @@ -192,6 +193,20 @@ public class PythonSerializer implements PythonNodeVisitor { }); }); } + + @Override + public void visit(PythonIfStatementNode ifStatement) { + writer.writeStatement(() -> { + writer.writeKeyword("if"); + writer.writeSpace(); + write(ifStatement.getCondition()); + writeBlock(ifStatement.getTrueBranch()); + }); + writer.writeStatement(() -> { + writer.writeKeyword("else"); + writeBlock(ifStatement.getFalseBranch()); + }); + } private void writeParenthesised(PythonExpressionNode expression) { writer.writeSymbol("("); diff --git a/src/main/java/org/zwobble/couscous/backends/python/ast/PythonIfStatementNode.java b/src/main/java/org/zwobble/couscous/backends/python/ast/PythonIfStatementNode.java new file mode 100644 index 0000000..313f722 --- /dev/null +++ b/src/main/java/org/zwobble/couscous/backends/python/ast/PythonIfStatementNode.java @@ -0,0 +1,53 @@ +package org.zwobble.couscous.backends.python.ast; + +import java.util.List; + +import org.zwobble.couscous.backends.python.ast.visitors.PythonNodeVisitor; + +public class PythonIfStatementNode implements PythonStatementNode { + public static PythonIfStatementNode pythonIfStatement( + PythonExpressionNode condition, + List<PythonStatementNode> trueBranch, + List<PythonStatementNode> falseBranch) { + return new PythonIfStatementNode( + condition, + new PythonBlock(trueBranch), + new PythonBlock(falseBranch)); + } + + private final PythonExpressionNode condition; + private final PythonBlock trueBranch; + private final PythonBlock falseBranch; + + private PythonIfStatementNode( + PythonExpressionNode condition, + PythonBlock trueBranch, + PythonBlock falseBranch) { + this.condition = condition; + this.trueBranch = trueBranch; + this.falseBranch = falseBranch; + } + + public PythonExpressionNode getCondition() { + return condition; + } + + public PythonBlock getTrueBranch() { + return trueBranch; + } + + public PythonBlock getFalseBranch() { + return falseBranch; + } + + @Override + public String toString() { + return "PythonIfStatementNode(condition=" + condition + ", trueBranch=" + + trueBranch + ", falseBranch=" + falseBranch + ")"; + } + + @Override + public void accept(PythonNodeVisitor visitor) { + visitor.visit(this); + } +} diff --git a/src/main/java/org/zwobble/couscous/backends/python/ast/visitors/PythonNodeVisitor.java b/src/main/java/org/zwobble/couscous/backends/python/ast/visitors/PythonNodeVisitor.java index a1ed7d5..fb8fa71 100644 --- a/src/main/java/org/zwobble/couscous/backends/python/ast/visitors/PythonNodeVisitor.java +++ b/src/main/java/org/zwobble/couscous/backends/python/ast/visitors/PythonNodeVisitor.java @@ -9,6 +9,7 @@ import org.zwobble.couscous.backends.python.ast.PythonClassNode; import org.zwobble.couscous.backends.python.ast.PythonConditionalExpressionNode; import org.zwobble.couscous.backends.python.ast.PythonFunctionDefinitionNode; import org.zwobble.couscous.backends.python.ast.PythonGetSliceNode; +import org.zwobble.couscous.backends.python.ast.PythonIfStatementNode; import org.zwobble.couscous.backends.python.ast.PythonImportNode; import org.zwobble.couscous.backends.python.ast.PythonIntegerLiteralNode; import org.zwobble.couscous.backends.python.ast.PythonModuleNode; @@ -36,6 +37,7 @@ public interface PythonNodeVisitor { void visit(PythonFunctionDefinitionNode functionDefinition); void visit(PythonAssignmentNode assignment); void visit(PythonImportNode importNode); + void visit(PythonIfStatementNode ifStatement); void visit(PythonModuleNode module); |