New J2K: Add more elements to code builder

2018-05-31 20:32:21 +03:00
parent a9ff38f1fa
commit 986cb5be27
1 changed files with 18 additions and 0 deletions
@@ -85,11 +85,29 @@ class NewCodeBuilder {
            ktFunction.returnType.accept(this, data)
            if (ktFunction.block !== JKBodyStub) {
                printer.printlnWithNoIndent("{")
+                printer.pushIndent()
                ktFunction.block.accept(this, data)
+                printer.popIndent()
                printer.printWithNoIndent("}")
            }
        }

+        override fun visitBlock(block: JKBlock, data: Unit) {
+            block.acceptChildren(this, data)
+        }
+
+        override fun visitExpressionStatement(expressionStatement: JKExpressionStatement, data: Unit) {
+            printer.printIndent()
+            expressionStatement.expression.accept(this, data)
+            printer.printlnWithNoIndent()
+        }
+
+        override fun visitReturnStatement(returnStatement: JKReturnStatement, data: Unit) {
+            printer.print("return ")
+            returnStatement.expression.accept(this, data)
+            printer.printlnWithNoIndent()
+        }
+
        override fun visitKtProperty(ktProperty: JKKtProperty, data: Unit) {
            // TODO: Fix this
            if (ktProperty.modifierList.modifiers.any { (it as? JKJavaModifier)?.type == JKJavaModifier.JavaModifierType.FINAL }) {