Add clearOutput() function

sake92 · sake92 · commit be233aca2018 · 2025-02-09T10:22:43.000+01:00
diff --git a/FlowRun_Exprs_Grammar.md b/FlowRun_Exprs_Grammar.md
@@ -1,6 +1,6 @@
 
 GRAMMAR:
-```ebnf
+```
 expression          -> boolOrComparison ("||"  boolOrComparison)* ;
 boolOrComparison    -> boolAndComparison ("&&"  boolAndComparison)* ;
 boolAndComparison   -> numComparison (("!=" | "==" ) numComparison)* ;
@@ -9,7 +9,12 @@ term                -> factor (("+" | "-") factor)* ;
 factor              -> unary (("*" |  "/" | "%") unary)* ;
 unary               -> ("!" | "-") unary
                     | atom ;
-atom                -> NUMBER | STRING | "true" | "false"
+atom                -> NUMBER
+                    | STRING
+                    | "true"
+                    | "false"
+                    | ID[intExpression]
+                    | ID[intExpression][intExpression]
                     | ID
                     | ID "(" expression? ( "," expression)* ")"
                     | "(" expression ")" ;
diff --git a/TODO.md b/TODO.md
@@ -5,9 +5,8 @@
 ##
 
 
-- fix step-by-step on loops
 
 - trim long text with ...
-- disable zoom config
+
 
 
diff --git a/editor/src/main/scala/dev/sacode/flowrun/FlowRunEditor.scala b/editor/src/main/scala/dev/sacode/flowrun/FlowRunEditor.scala
@@ -229,6 +229,8 @@ class FlowRunEditor(
       flowchartPresenter.highlightExecuting(interpreter.nextExecStatementId)
       functionSelector.loadFunctions()
       flowchartPresenter.loadCurrentFunction()
+    case ClearOutput() =>
+      outputArea.clearRuntime()
     case SymbolTableUpdated =>
       debugArea.showVariables()
     case FunctionUpdated =>
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/FlowRun.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/FlowRun.scala
@@ -10,6 +10,7 @@ object FlowRun:
     case EvalError(nodeId: String, msg: String, funId: String)
     case EvalOutput(msg: String, newline: Boolean)
     case EvalInput(nodeId: String, name: String, prompt: Option[String])
+    case ClearOutput()
     case EvalFunctionStarted
     case EvalFunctionFinished
     case SyntaxSuccess
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/ast/PredefinedFunction.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/ast/PredefinedFunction.scala
@@ -31,6 +31,7 @@ enum PredefinedFunction(val name: String) {
   case StringToInteger extends PredefinedFunction("string2int")
   // misc
   case ReadInput extends PredefinedFunction("readInput")
+  case ClearOutput extends PredefinedFunction("clearOutput")
 }
 
 object PredefinedFunction:
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/CGenerator.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/CGenerator.scala
@@ -252,6 +252,7 @@ class CGenerator(val programAst: Program) extends CodeGenerator {
       case RealToInteger   => s"(int)${argOpt(0)}"
       case StringToInteger => s"atoi(${argOpt(0)})"
       case ReadInput       => s"""scanf("%s", ${argOpt(0)})"""
+      case ClearOutput     => "printf(\"\\e[1;1H\\e[2J\")"
       case NumRows         => s"sizeof(${argOpt(0)}) / sizeof(${argOpt(0)}[0])"
       case NumCols =>
         val arr = argOpt(0)
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/CPlusPlusGenerator.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/CPlusPlusGenerator.scala
@@ -247,6 +247,7 @@ class CPlusPlusGenerator(val programAst: Program) extends CodeGenerator {
       case RealToInteger   => s"(int)${argOpt(0)}"
       case StringToInteger => s"atoi(${argOpt(0)})"
       case ReadInput       => s"""scanf("%s", ${argOpt(0)})"""
+      case ClearOutput     => "printf(\"\\e[1;1H\\e[2J\")"
       case NumRows         => s"sizeof(${argOpt(0)}) / sizeof(${argOpt(0)}[0])"
       case NumCols =>
         val arr = argOpt(0)
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/CSharpGenerator.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/CSharpGenerator.scala
@@ -210,6 +210,7 @@ class CSharpGenerator(val programAst: Program) extends CodeGenerator {
       case RealToInteger   => s"(int)${argOpt(0)}"
       case StringToInteger => s"Convert.ToInt32(${argOpt(0)})"
       case ReadInput       => "Console.ReadLine()"
+      case ClearOutput     => "Console.Clear()"
       case NumRows         => s"${argOpt(0)}.GetLength(0)"
       case NumCols         => s"${argOpt(0)}.GetLength(1)"
     }
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/JavaGenerator.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/JavaGenerator.scala
@@ -220,8 +220,10 @@ class JavaGenerator(val programAst: Program) extends CodeGenerator {
       case RealToInteger   => s"(int)${argOpt(0)}"
       case StringToInteger => s"""Integer.parseInt(${argOpt(0)})"""
       case ReadInput       => "scanner.nextLine()"
-      case NumRows         => s"${argOpt(0)}.length"
-      case NumCols         => s"${argOpt(0)}[0].length"
+      case ClearOutput => """|System.out.print("\u001b[H\u001b[2J");
+                             |System.out.flush();""".stripMargin
+      case NumRows => s"${argOpt(0)}.length"
+      case NumCols => s"${argOpt(0)}[0].length"
     }
   }
 
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/JavascriptGenerator.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/JavascriptGenerator.scala
@@ -181,6 +181,7 @@ class JavascriptGenerator(val programAst: Program) extends CodeGenerator {
       case RealToInteger   => argOpt(0) // ??
       case StringToInteger => s"parseInt(${argOpt(0)})"
       case ReadInput       => "prompt()"
+      case ClearOutput     => "console.clear()"
       case NumRows         => s"${argOpt(0)}.length"
       case NumCols         => s"${argOpt(0)}[0].length"
     }
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/KotlinGenerator.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/KotlinGenerator.scala
@@ -198,9 +198,10 @@ class KotlinGenerator(val programAst: Program) extends CodeGenerator {
       case RealToInteger => s"(int)${argOpt(0)}"
       case StringToInteger =>
         s"""try { Integer.parseInt(${argOpt(0)}) } catch (NumberFormatException e) { 0 }"""
-      case ReadInput => "readLine()"
-      case NumRows   => s"${argOpt(0)}.size"
-      case NumCols   => s"${argOpt(0)}(1).size"
+      case ReadInput   => "readLine()"
+      case ClearOutput => """print("\u001b[H\u001b[2J")"""
+      case NumRows     => s"${argOpt(0)}.size"
+      case NumCols     => s"${argOpt(0)}(1).size"
     }
   }
 
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/Language.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/Language.scala
@@ -19,10 +19,8 @@ enum Language(val name: String, val prism: String):
 // unknown
 //case rust extends Language("rust", "rust")
 
+// issues: async input handling
 //case nodejs extends Language("nodejs", "javascript")
 
 // complex? variable declarations
 // case pascal extends Language("pascal", "pascal")
-
-// complex string handling..
-// case c extends Language("c", "c")
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/NodeJsGenerator.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/NodeJsGenerator.scala
@@ -8,7 +8,7 @@ import dev.sacode.flowrun.eval.SymbolTable
 import dev.sacode.flowrun.eval.SymbolKey
 import dev.sacode.flowrun.eval.Symbol
 
-class NodeJsGenerator(override val programAst: Program) extends JavascriptGenerator(programAst) {
+class NodeJsGenerator(override val programAst: Program) extends CodeGenerator {
 
   override def generate: Try[CodeGenRes] = Try {
 
@@ -166,4 +166,36 @@ class NodeJsGenerator(override val programAst: Program) extends JavascriptGenera
         case Type.Boolean => "line"
         case _            => "line"
 
+  import PredefinedFunction.*
+
+  override def predefFun(name: String, genArgs: List[String]): String = {
+    def argOpt(idx: Int) = genArgs.lift(idx).getOrElse("")
+
+    PredefinedFunction.withName(name).get match {
+      case Abs             => s"Math.abs(${argOpt(0)})"
+      case Floor           => s"Math.floor(${argOpt(0)})"
+      case Ceil            => s"Math.ceil(${argOpt(0)})"
+      case RandomInteger   => s"Math.floor(Math.random()*${argOpt(0)})"
+      case Sin             => s"Math.sin(${argOpt(0)})"
+      case Cos             => s"Math.cos(${argOpt(0)})"
+      case Tan             => s"Math.tan(${argOpt(0)})"
+      case Ln              => s"Math.log(${argOpt(0)})"
+      case Log10           => s"Math.log10(${argOpt(0)})"
+      case Log2            => s"Math.log2(${argOpt(0)})"
+      case Sqrt            => s"Math.sqrt(${argOpt(0)})"
+      case Pow             => s"Math.pow(${argOpt(0)}, ${argOpt(1)})"
+      case Length          => s"${argOpt(0)}.length"
+      case CharAt          => s"${argOpt(0)}.charAt(${argOpt(1)})"
+      case RealToInteger   => argOpt(0) // ??
+      case StringToInteger => s"parseInt(${argOpt(0)})"
+      case ReadInput       => "line"
+      case ClearOutput     => "process.stdout.write('\\x1Bc')"
+      case NumRows         => s"${argOpt(0)}.length"
+      case NumCols         => s"${argOpt(0)}[0].length"
+    }
+  }
+
+  override def funCall(name: String, genArgs: List[String]): String =
+    s""" $name(${genArgs.mkString(", ")}) """.trim
+
 }
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/PhpGenerator.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/PhpGenerator.scala
@@ -156,6 +156,7 @@ class PhpGenerator(val programAst: Program) extends CodeGenerator {
       case RealToInteger   => argOpt(0)
       case StringToInteger => s""" intval(${argOpt(0)}) """.trim
       case ReadInput       => "readline()"
+      case ClearOutput     => s""" echo chr(27).chr(91).'H'.chr(27).chr(91).'J'; """
       case NumRows         => s"count(${argOpt(0)})"
       case NumCols         => s"count(${argOpt(0)}[0])"
     }
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/PythonGenerator.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/PythonGenerator.scala
@@ -21,9 +21,9 @@ class PythonGenerator(val programAst: Program) extends CodeGenerator {
   }
 
   def generate: Try[CodeGenRes] = Try {
-    // TODO optionally import
     addLine("import math", "")
-    addLine("from random import randrange", "")
+    val usesRandom = programAst.usesFunction(PredefinedFunction.RandomInteger)
+    if usesRandom then addLine("from random import randrange", "")
 
     programAst.functions.foreach(genFunction)
     addEmptyLine()
@@ -198,6 +198,7 @@ class PythonGenerator(val programAst: Program) extends CodeGenerator {
       case RealToInteger   => s"int(${argOpt(0)})"
       case StringToInteger => s"int(${argOpt(0)})"
       case ReadInput       => "input()"
+      case ClearOutput     => """ print("\033[H\033[J", end="") """.trim
       case NumRows         => s"len(${argOpt(0)})"
       case NumCols         => s"len(${argOpt(0)}[0])"
     }
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/RubyGenerator.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/RubyGenerator.scala
@@ -196,6 +196,7 @@ class RubyGenerator(val programAst: Program) extends CodeGenerator {
       case RealToInteger   => s"${argOpt(0)}.toInt"
       case StringToInteger => s"${argOpt(0)}.to_i"
       case ReadInput       => "$stdin.read"
+      case ClearOutput     => s""" system "clear" || system "cls" """
       case NumRows         => s"${argOpt(0)}.length"
       case NumCols         => s"${argOpt(0)}[0].length"
     }
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/ScalaGenerator.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/ScalaGenerator.scala
@@ -212,6 +212,7 @@ class ScalaGenerator(val programAst: Program) extends CodeGenerator {
       case RealToInteger   => s"${argOpt(0)}.toInt"
       case StringToInteger => s"${argOpt(0)}.toInt"
       case ReadInput       => "StdIn.readLine()"
+      case ClearOutput     => """print("\u001b[H\u001b[2J")"""
       case NumRows         => s"${argOpt(0)}.length"
       case NumCols         => s"${argOpt(0)}(0).length"
     }
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/SwiftGenerator.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/SwiftGenerator.scala
@@ -187,9 +187,10 @@ class SwiftGenerator(val programAst: Program) extends CodeGenerator {
         s"""try Int(${argOpt(0)})! catch {
            |  case _: NumberFormatException => 0
            |}""".stripMargin
-      case ReadInput => "readLine()!"
-      case NumRows   => s"${argOpt(0)}.count"
-      case NumCols   => s"${argOpt(0)}[0].count"
+      case ReadInput   => "readLine()!"
+      case ClearOutput => """print("\u{001B}[2J")"""
+      case NumRows     => s"${argOpt(0)}.count"
+      case NumCols     => s"${argOpt(0)}[0].count"
     }
   }
 
diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/eval/Interpreter.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/eval/Interpreter.scala
@@ -1377,6 +1377,9 @@ final class Interpreter(
         waitForContinue().map(_ =>
           lastReadInput.getOrElse(throw EvalException(s"readInput() did not get any input", id))
         )
+      case ClearOutput =>
+        flowrunChannel := FlowRun.Event.ClearOutput()
+        Future.successful(NoVal)
     }
 
   private def validateArgsNumber(id: String, funName: String, expected: Int, got: Int): Unit =

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ enum PredefinedFunction(val name: String) {`
`31`	`31`	`case StringToInteger extends PredefinedFunction("string2int")`
`32`	`32`	`// misc`
`33`	`33`	`case ReadInput extends PredefinedFunction("readInput")`
	`34`	`+ case ClearOutput extends PredefinedFunction("clearOutput")`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`object PredefinedFunction:`
Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,7 @@ class CSharpGenerator(val programAst: Program) extends CodeGenerator {`
`210`	`210`	`case RealToInteger => s"(int)${argOpt(0)}"`
`211`	`211`	`case StringToInteger => s"Convert.ToInt32(${argOpt(0)})"`
`212`	`212`	`case ReadInput => "Console.ReadLine()"`
	`213`	`+ case ClearOutput => "Console.Clear()"`
`213`	`214`	`case NumRows => s"${argOpt(0)}.GetLength(0)"`
`214`	`215`	`case NumCols => s"${argOpt(0)}.GetLength(1)"`
`215`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -220,8 +220,10 @@ class JavaGenerator(val programAst: Program) extends CodeGenerator {`
`220`	`220`	`case RealToInteger => s"(int)${argOpt(0)}"`
`221`	`221`	`case StringToInteger => s"""Integer.parseInt(${argOpt(0)})"""`
`222`	`222`	`case ReadInput => "scanner.nextLine()"`
`223`		`- case NumRows => s"${argOpt(0)}.length"`
`224`		`- case NumCols => s"${argOpt(0)}[0].length"`
	`223`	`+ case ClearOutput => """\|System.out.print("\u001b[H\u001b[2J");`
	`224`	`+ \|System.out.flush();""".stripMargin`
	`225`	`+ case NumRows => s"${argOpt(0)}.length"`
	`226`	`+ case NumCols => s"${argOpt(0)}[0].length"`
`225`	`227`	`}`
`226`	`228`	`}`
`227`	`229`
Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,7 @@ class JavascriptGenerator(val programAst: Program) extends CodeGenerator {`
`181`	`181`	`case RealToInteger => argOpt(0) // ??`
`182`	`182`	`case StringToInteger => s"parseInt(${argOpt(0)})"`
`183`	`183`	`case ReadInput => "prompt()"`
	`184`	`+ case ClearOutput => "console.clear()"`
`184`	`185`	`case NumRows => s"${argOpt(0)}.length"`
`185`	`186`	`case NumCols => s"${argOpt(0)}[0].length"`
`186`	`187`	`}`