diff --git a/compiler/src/prog8/compiler/Compiler.kt b/compiler/src/prog8/compiler/Compiler.kt index 41a5f602f..0195577f8 100644 --- a/compiler/src/prog8/compiler/Compiler.kt +++ b/compiler/src/prog8/compiler/Compiler.kt @@ -1,7 +1,7 @@ package prog8.compiler import com.github.michaelbull.result.* -import prog8.ast.AstToSourceCode +import prog8.ast.AstToSourceTextConverter import prog8.ast.IBuiltinFunctions import prog8.ast.IMemSizer import prog8.ast.Program @@ -378,7 +378,7 @@ private fun writeAssembly(programAst: Program, fun printAst(programAst: Program) { println() - val printer = AstToSourceCode(::print, programAst) + val printer = AstToSourceTextConverter(::print, programAst) printer.visit(programAst) println() } diff --git a/compilerAst/src/prog8/ast/AstToSourceCode.kt b/compilerAst/src/prog8/ast/AstToSourceTextConverter.kt similarity index 98% rename from compilerAst/src/prog8/ast/AstToSourceCode.kt rename to compilerAst/src/prog8/ast/AstToSourceTextConverter.kt index bae8e0b67..585b3beb4 100644 --- a/compilerAst/src/prog8/ast/AstToSourceCode.kt +++ b/compilerAst/src/prog8/ast/AstToSourceTextConverter.kt @@ -12,9 +12,8 @@ import prog8.ast.walk.IAstVisitor /** * Produces Prog8 source text from a [Program] (AST node), * passing it as a String to the specified receiver function. - * TODO: rename/refactor to make proper sense in the presence of class [prog8.parser.SourceCode] */ -class AstToSourceCode(val output: (text: String) -> Unit, val program: Program): IAstVisitor { +class AstToSourceTextConverter(val output: (text: String) -> Unit, val program: Program): IAstVisitor { private var scopelevel = 0 private fun indent(s: String) = " ".repeat(scopelevel) + s diff --git a/compilerAst/test/TestAstToSourceCode.kt b/compilerAst/test/TestAstToSourceText.kt similarity index 95% rename from compilerAst/test/TestAstToSourceCode.kt rename to compilerAst/test/TestAstToSourceText.kt index 82fa0384b..7532dd315 100644 --- a/compilerAst/test/TestAstToSourceCode.kt +++ b/compilerAst/test/TestAstToSourceText.kt @@ -2,7 +2,7 @@ package prog8tests import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance -import prog8.ast.AstToSourceCode +import prog8.ast.AstToSourceTextConverter import prog8.ast.Module import prog8.ast.Program import prog8.ast.internedStringsModuleName @@ -15,14 +15,14 @@ import kotlin.test.assertContains @TestInstance(TestInstance.Lifecycle.PER_CLASS) -class TestAstToSourceCode { +class TestAstToSourceText { private fun generateP8(module: Module) : String { val program = Program("test", DummyFunctions, DummyMemsizer) .addModule(module) var generatedText = "" - val it = AstToSourceCode({ str -> generatedText += str }, program) + val it = AstToSourceTextConverter({ str -> generatedText += str }, program) it.visit(program) return generatedText