From d0431b9abbf914affe37a47f5f2a4338a5f8a595 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 5 Oct 2015 17:22:51 +0100 Subject: Fix package of PythonWriter --- .../couscous/backends/python/PythonSerializer.java | 1 - .../couscous/backends/python/PythonWriter.java | 60 ++++++++++++++++++++++ .../couscous/backends/python/ast/PythonWriter.java | 60 ---------------------- 3 files changed, 60 insertions(+), 61 deletions(-) create mode 100644 src/main/java/org/zwobble/couscous/backends/python/PythonWriter.java delete mode 100644 src/main/java/org/zwobble/couscous/backends/python/ast/PythonWriter.java (limited to 'src/main/java') 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 728b71a..af3b542 100644 --- a/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java +++ b/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java @@ -14,7 +14,6 @@ import org.zwobble.couscous.backends.python.ast.PythonPassNode; import org.zwobble.couscous.backends.python.ast.PythonReturnNode; import org.zwobble.couscous.backends.python.ast.PythonStringLiteralNode; import org.zwobble.couscous.backends.python.ast.PythonVariableReferenceNode; -import org.zwobble.couscous.backends.python.ast.PythonWriter; import org.zwobble.couscous.backends.python.ast.visitors.PythonNodeVisitor; import static com.google.common.collect.Iterables.skip; diff --git a/src/main/java/org/zwobble/couscous/backends/python/PythonWriter.java b/src/main/java/org/zwobble/couscous/backends/python/PythonWriter.java new file mode 100644 index 0000000..2551700 --- /dev/null +++ b/src/main/java/org/zwobble/couscous/backends/python/PythonWriter.java @@ -0,0 +1,60 @@ +package org.zwobble.couscous.backends.python; + +import com.google.common.base.Strings; + +public class PythonWriter { + private static final int SPACES_PER_INDENT = 4; + private final StringBuilder builder = new StringBuilder(); + private int depth = 0; + + public String asString() { + return builder.toString(); + } + + public void writeInteger(int value) { + builder.append(value); + } + + public void writeStringLiteral(String value) { + builder.append("\""); + builder.append(value); + builder.append("\""); + } + + public void writeKeyword(String keyword) { + builder.append(keyword); + } + + public void writeSpace() { + builder.append(" "); + } + + public void writeIdentifier(String name) { + builder.append(name); + } + + public void writeSymbol(String symbol) { + builder.append(symbol); + } + + public void startBlock() { + depth++; + writeSymbol(":"); + builder.append("\n"); + } + + public void endBlock() { + depth--; + } + + public void startStatement() { + builder.append(Strings.repeat(" ", depth * SPACES_PER_INDENT)); + } + + public void endStatement() { + if (builder.charAt(builder.length() - 1) != '\n') { + builder.append("\n"); + } + } + +} diff --git a/src/main/java/org/zwobble/couscous/backends/python/ast/PythonWriter.java b/src/main/java/org/zwobble/couscous/backends/python/ast/PythonWriter.java deleted file mode 100644 index 4ab04c6..0000000 --- a/src/main/java/org/zwobble/couscous/backends/python/ast/PythonWriter.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.zwobble.couscous.backends.python.ast; - -import com.google.common.base.Strings; - -public class PythonWriter { - private static final int SPACES_PER_INDENT = 4; - private final StringBuilder builder = new StringBuilder(); - private int depth = 0; - - public String asString() { - return builder.toString(); - } - - public void writeInteger(int value) { - builder.append(value); - } - - public void writeStringLiteral(String value) { - builder.append("\""); - builder.append(value); - builder.append("\""); - } - - public void writeKeyword(String keyword) { - builder.append(keyword); - } - - public void writeSpace() { - builder.append(" "); - } - - public void writeIdentifier(String name) { - builder.append(name); - } - - public void writeSymbol(String symbol) { - builder.append(symbol); - } - - public void startBlock() { - depth++; - writeSymbol(":"); - builder.append("\n"); - } - - public void endBlock() { - depth--; - } - - public void startStatement() { - builder.append(Strings.repeat(" ", depth * SPACES_PER_INDENT)); - } - - public void endStatement() { - if (builder.charAt(builder.length() - 1) != '\n') { - builder.append("\n"); - } - } - -} -- cgit v1.2.3