Some more work on relooper

jtransc-core/src/com/jtransc/ast/AstTransformer.kt

@@ -45,6 +45,7 @@ open class AstTransformer {
 			is AstStm.IF -> transform(stm)
 			is AstStm.IF_ELSE -> transform(stm)
 			is AstStm.WHILE -> transform(stm)
+			is AstStm.DO_WHILE -> transform(stm)
 			is AstStm.RETURN -> transform(stm)
 			is AstStm.RETURN_VOID -> transform(stm)
 			is AstStm.THROW -> transform(stm)
@@ -203,6 +204,12 @@ open class AstTransformer {
 		return stm
 	}
 
+	open fun transform(stm: AstStm.DO_WHILE): AstStm {
+		transform(stm.iter)
+		transform(stm.cond)
+		return stm
+	}
+
 	open fun transform(stm: AstStm.RETURN): AstStm {
 		transform(stm.retval)
 		return stm

jtransc-core/src/com/jtransc/ast/AstVisitor.kt

@@ -60,6 +60,7 @@ open class AstVisitor {
 			is AstStm.IF -> visit(stm)
 			is AstStm.IF_ELSE -> visit(stm)
 			is AstStm.WHILE -> visit(stm)
+			is AstStm.DO_WHILE -> visit(stm)
 			is AstStm.RETURN -> visit(stm)
 			is AstStm.RETURN_VOID -> visit(stm)
 			is AstStm.THROW -> visit(stm)
@@ -206,6 +207,11 @@ open class AstVisitor {
 		visit(stm.iter)
 	}
 
+	open fun visit(stm: AstStm.DO_WHILE) {
+		visit(stm.iter)
+		visit(stm.cond)
+	}
+
 	open fun visit(stm: AstStm.RETURN) {
 		visit(stm.retval)
 	}

jtransc-core/src/com/jtransc/ast/feature/method/GotosFeature.kt

@@ -25,7 +25,8 @@ import com.jtransc.graph.RelooperException
 // @TODO: Use AstBuilder to make it more readable
 class GotosFeature : AstMethodFeature() {
 	override fun remove(method: AstMethod, body: AstBody, settings: AstBuildSettings, types: AstTypes): AstBody {
-		if (method.relooperEnabled ?: settings.relooper) {
+		//if (method.relooperEnabled ?: settings.relooper) {
+		if (method.relooperEnabled ?: false) {
 			try {
 				return removeRelooper(method, body, settings, types) ?: removeMachineState(body, types)
 			} catch (t: Throwable) {

jtransc-core/src/com/jtransc/gen/common/CommonGenerator.kt

@@ -176,6 +176,7 @@ abstract class CommonGenerator(val injector: Injector) : IProgramTemplate {
 
 	open fun writeClasses(output: SyncVfsFile) {
 		if (SINGLE_FILE) {
+			output.removeIfExists()
 			if (ADD_UTF8_BOM) {
 				output[outputFileBaseName] = byteArrayOf(0xEF.toByte(), 0xBB.toByte(), 0xBF.toByte()) + genSingleFileClasses(output).toString().toByteArray()
 			} else {
@@ -441,6 +442,7 @@ abstract class CommonGenerator(val injector: Injector) : IProgramTemplate {
 			is AstStm.SWITCH_GOTO -> genStmSwitchGoto(stm)
 			is AstStm.NOP -> genStmNop(stm)
 			is AstStm.WHILE -> genStmWhile(stm)
+			is AstStm.DO_WHILE -> genStmDoWhile(stm)
 			is AstStm.IF -> genStmIf(stm)
 			is AstStm.IF_ELSE -> genStmIfElse(stm)
 			is AstStm.RETURN_VOID -> genStmReturnVoid(stm, last)
@@ -1346,6 +1348,13 @@ abstract class CommonGenerator(val injector: Injector) : IProgramTemplate {
 			}
 		}
 	}
+	fun genStmDoWhile(stm: AstStm.DO_WHILE) = indent {
+		flowBlock(FlowKind.WHILE) {
+			line("do", after2 = " while (${stm.cond.genExpr()});") {
+				line(stm.iter.genStm())
+			}
+		}
+	}
 
 	open fun genStmIf(stm: AstStm.IF) = indent {
 		line("if (${stm.cond.genExpr()})") { line(stm.strue.genStm()) }

jtransc-core/src/com/jtransc/graph/Relooper.kt

@@ -8,7 +8,6 @@ import java.util.*
 import kotlin.collections.LinkedHashSet
 
 class Relooper(val types: AstTypes, val name: String = "unknown", val debug: Boolean = false) {
-	class Graph
 	class Node(val types: AstTypes, val index: Int, val body: List<AstStm>) {
 		//var next: Node? = null
 		val srcEdges = arrayListOf<Edge>()
@@ -17,6 +16,7 @@ class Relooper(val types: AstTypes, val name: String = "unknown", val debug: Boo
 		val possibleNextNodes: List<Node> get() = dstEdges.map { it.dst }
 
 		val next get() = dstEdges.firstOrNull { it.cond == null }?.dst
+		val nextEdge get() = dstEdges.firstOrNull { it.cond == null }
 
 		override fun toString(): String = "L$index: " + dump(types, body.stm()).toString().replace('\n', ' ').trim() + " EDGES: $dstEdges. SRC_EDGES: ${srcEdges.size}"
 	}
@@ -63,7 +63,10 @@ class Relooper(val types: AstTypes, val name: String = "unknown", val debug: Boo
 		for (n in g.nodes) {
 			trace { "* $n" }
 		}
-		return renderComponents(g.tarjanStronglyConnectedComponentsAlgorithm(), entry)
+		println("Relooping '$name'...")
+		val result = renderComponents(g.tarjanStronglyConnectedComponentsAlgorithm(), entry)
+		println("Relooping '$name'...OK")
+		return result
 	}
 
 	class RenderContext(val graph: Digraph<Node>) {
@@ -137,11 +140,12 @@ class Relooper(val types: AstTypes, val name: String = "unknown", val debug: Boo
 
 			// Loop
 			if (isMultiNodeLoop || isSingleNodeLoop) {
-				trace { "$indent- Detected node loop csize=${component.size} : $node" }
+				trace { "$indent- LOOP csize=${component.size} : $node" }
 				val outs = component.getExternalOutputsNodes()
 				val outsNotInContext = outs.filter { it !in ctx.loopStarts && it !in ctx.loopEnds }
+				//val outsNotInContext = outs.filter { it !in ctx.loopStarts }
 				if (outsNotInContext.size != 1) {
-					trace { "ASSERTION FAILED! outsNotInContext.size != 1 (${outsNotInContext.size}) : $node" }
+					trace { "$indent- ASSERTION FAILED! outsNotInContext.size != 1 (${outsNotInContext.size}) : $node" }
 					invalidOp("ERROR When Relooping $name (ASSERTION FAILED)")
 				}
 
@@ -150,20 +154,22 @@ class Relooper(val types: AstTypes, val name: String = "unknown", val debug: Boo
 
 				val loopName = ctx.allocName()
 
-				trace { "$indent:: ${entryNode.index} - ${exitNode.index}" }
-				trace { "$indent:: ${component}" }
+				//trace { "$indent:: ${entryNode.index} - ${exitNode.index}" }
+				//trace { "$indent:: ${component}" }
 
 				ctx.loopStarts[entryNode] = loopName
 				ctx.loopEnds[exitNode] = loopName
 
 				out += AstStm.DO_WHILE(
 					loopName,
 					if (isSingleNodeLoop) {
+						trace { "$indent- render single node: renderNoLoops" }
 						val out2 = arrayListOf<AstStm>()
 						renderNoLoops(g, out2, node, exitNode, ctx, level)
 						//Stm(node.body) // @TODO: Here we should add ifs with breaks, and then convert put the condition there if possible
 						out2.stmsWoNops
 					} else {
+						trace { "$indent- render multi node: renderComponents" }
 						renderComponents(component.split(entryNode, exitNode), entryNode, exitNode, ctx, level = level + 1)
 					}
 					,
@@ -187,8 +193,20 @@ class Relooper(val types: AstTypes, val name: String = "unknown", val debug: Boo
 
 	fun renderNoLoops(g: StrongComponentGraph<Node>, out: ArrayList<AstStm>, node: Node, exit: Node?, ctx: RenderContext, level: Int): Node? {
 		val indent = INDENTS[level]
-		trace { "$indent- Detected no loop : $node" }
+		trace { "$indent- renderNoLoops: Detected no loop : $node" }
 		out += node.body.stmsWoNops
+
+		fun getNodeContinueOrBreak(node: Relooper.Node?): AstStm? {
+			val loopStart = ctx.loopStarts[node]
+			val loopEnd = ctx.loopEnds[node]
+			return when {
+				loopStart != null -> AstStm.CONTINUE(loopStart)
+				loopEnd != null -> AstStm.BREAK(loopEnd)
+				else -> null
+			}
+
+		}
+
 		when (node.dstEdges.size) {
 			0, 1 -> {
 				if (node.dstEdges.size == 0) {
@@ -199,44 +217,56 @@ class Relooper(val types: AstTypes, val name: String = "unknown", val debug: Boo
 				if (node.dstEdges.size == 0) return null
 			}
 			2 -> {
-				trace { "$indent- Node IF (and else?)" }
-				val ifBody = node.next!!
-				val endOfIf = node.dstEdgesButNext.firstOrNull() ?: invalidOp("Expected conditional!")
-				val endOfIfNode = endOfIf.dst
-				val common = ctx.findCommonSuccessorNotRendered(ifBody, endOfIfNode, exit)
-
-				// IF
-				if (common == endOfIfNode) {
-					out += AstStm.IF(
-						endOfIf.cond!!.not(),
-						renderComponents(g, ifBody, endOfIfNode, ctx, level = level + 1)
-					)
-				}
-				// IF+ELSE
-				else {
-					out += AstStm.IF_ELSE(
-						endOfIf.cond!!,
-						renderComponents(g, endOfIfNode, common, ctx, level = level + 1),
-						renderComponents(g, ifBody, common, ctx, level = level + 1)
-					)
-				}
-				return common
+
 			}
 			else -> {
 				//TODO()
 			}
 		}
 
+		var ifsAdded = 0
 		for (e in node.dstEdgesButNext) {
-			val loopStart = ctx.loopStarts[e.dst]
-			val loopEnd = ctx.loopEnds[e.dst]
-			when {
-				loopStart != null -> out += AstStm.IF(e.cond!!, AstStm.CONTINUE(loopStart))
-				loopEnd != null -> out += AstStm.IF(e.cond!!, AstStm.BREAK(loopEnd))
-				else -> TODO()
+			val breakOrContinue = getNodeContinueOrBreak(e.dst) ?: break
+			out += AstStm.IF(e.cond!!, breakOrContinue)
+			ifsAdded++
+		}
+
+		if (ifsAdded == node.dstEdgesButNext.size) {
+			val breakOrContinue = getNodeContinueOrBreak(node.next)
+			if (breakOrContinue != null) {
+				out += breakOrContinue
 			}
+			return node.next
+		}
+
+		if (node.dstEdges.size != 2) {
+			TODO()
+		}
+
+		trace { "$indent- Node IF (and else?)" }
+		val ifBody = node.next!!
+		val endOfIf = node.dstEdgesButNext.firstOrNull() ?: invalidOp("Expected conditional!")
+		val endOfIfNode = endOfIf.dst
+		val common = ctx.findCommonSuccessorNotRendered(ifBody, endOfIfNode, exit)
+
+		// IF
+		if (common == endOfIfNode) {
+			out += AstStm.IF(
+				endOfIf.cond!!.not(),
+				renderComponents(g, ifBody, endOfIfNode, ctx, level = level + 1)
+			)
+		}
+		// IF+ELSE
+		else {
+			out += AstStm.IF_ELSE(
+				endOfIf.cond!!,
+				renderComponents(g, endOfIfNode, common, ctx, level = level + 1),
+				renderComponents(g, ifBody, common, ctx, level = level + 1)
+			)
 		}
-		return node.next
+		return common
+
+
 	}
 
 	fun StrongComponent<Node>.isMultiNodeLoop(): Boolean = (size > 1)

jtransc-core/test/com/jtransc/graph/RelooperTest.kt

@@ -132,6 +132,7 @@ class RelooperTest {
 						if (condLoopOutBreak) {
 							break;
 						}
+						break;
 					} while (true);
 					D = 1;
 					if (condLoopOutContinue) {
@@ -140,6 +141,7 @@ class RelooperTest {
 					if (condLoopOutBreak) {
 						break;
 					}
+					break;
 				} while (true);
 			}
 			E = 1;

jtransc-gen-js/src/com/jtransc/gen/js/JsTarget.kt

@@ -131,6 +131,8 @@ class JsGenerator(injector: Injector) : CommonGenerator(injector) {
 
 	@Suppress("UNCHECKED_CAST")
 	override fun writeClasses(output: SyncVfsFile) {
+		output[outputFileBaseName] = ""
+		output["$outputFileBaseName.map"] = ""
 		val concatFilesTrans = copyFiles(output)
 
 		val classesIndenter = arrayListOf<Indenter>()
@@ -228,13 +230,13 @@ class JsGenerator(injector: Injector) : CommonGenerator(injector) {
 		// Generate source
 		//println("outputFileBaseName:$outputFileBaseName")
 		output[outputFileBaseName] = byteArrayOf(0xEF.toByte(), 0xBB.toByte(), 0xBF.toByte()) + source.toByteArray(Charsets.UTF_8)
-		if (sourceMap != null) output[outputFileBaseName + ".map"] = sourceMap
+		if (sourceMap != null) output["$outputFileBaseName.map"] = sourceMap
 
 		injector.mapInstance(ConfigJavascriptOutput(output[outputFile]))
 	}
 
 	override fun genSICall(it: AstClass): String {
-		return "$AWAIT " + "${it.name.targetNameForStatic}" + access("SI", static = true, field = false) + "($JC);"
+		return "$AWAIT ${it.name.targetNameForStatic}" + access("SI", static = true, field = false) + "($JC);"
 	}
 
 	override fun genStmTryCatch(stm: AstStm.TRY_CATCH) = indent {