Update generators

sacode387 · Apr 15, 2024 · 3173410 · 3173410
1 parent c0eeaa7
commit 3173410
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 2 deletions.
diff --git a/editor/src/main/scala/dev/sacode/flowrun/package.scala b/editor/src/main/scala/dev/sacode/flowrun/package.scala
@@ -1,5 +1,6 @@
 package dev.sacode.flowrun
 
+import scala.util.boundary, boundary.break
 import scala.util.Try
 import scala.util.Success
 import scala.util.Failure
@@ -47,7 +48,8 @@ object DomUtils {
   def isTouchDevice: Boolean =
     dom.window.matchMedia("(pointer: coarse)").matches
 
-  def getNearestSvgNode(event: dom.MouseEvent): (String, dom.svg.G) = {
+  def getNearestSvgNode(event: dom.MouseEvent): (String, dom.svg.G) = boundary {
+
     getSvgNode(event.target).getOrElse {
       for (i <- 1 to 48) { // search around mouse click for nearby edges
         val nearNodes = List(
@@ -57,7 +59,7 @@ object DomUtils {
           dom.document.elementFromPoint(event.clientX, event.clientY - i)
         ).flatMap(getSvgNode)
         val maybeNode = nearNodes.headOption
-        if maybeNode.isDefined && maybeNode.get._1 == "EDGE" then return maybeNode.get
+        if maybeNode.isDefined && maybeNode.get._1 == "EDGE" then break(maybeNode.get)
       }
       ("", null)
     }

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
@@ -156,6 +156,7 @@ class CPlusPlusGenerator(val programAst: Program) extends CodeGenerator {
       case RealToInteger => s"(int)${argOpt(0)}"
       case StringToInteger =>
         s"""try { Convert.ToInt32(${argOpt(0)}) } catch (FormatException) { 0 }"""
+      case ReadInput => "cin >> dummy"
     }
   }
 

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
@@ -161,6 +161,7 @@ class CSharpGenerator(val programAst: Program) extends CodeGenerator {
       case CharAt          => s"${argOpt(0)}.charAt(${argOpt(1)})"
       case RealToInteger   => s"(int)${argOpt(0)}"
       case StringToInteger => s"Convert.ToInt32(${argOpt(0)})"
+      case ReadInput       => "Console.ReadLine()"
     }
   }
 

diff --git a/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/GolangGenerator.scala b/interpreter/shared/src/main/scala/dev/sacode/flowrun/codegen/GolangGenerator.scala
@@ -161,6 +161,7 @@ class GolangGenerator(val programAst: Program) extends CodeGenerator {
       case CharAt          => s"${argOpt(0)}.charAt(${argOpt(1)})"
       case RealToInteger   => s"${argOpt(0)}.toInt"
       case StringToInteger => s"strconv.Itoa(${argOpt(0)})"
+      case ReadInput       => "Console.ReadLine()"
     }
   }
 

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
@@ -166,6 +166,7 @@ class JavaGenerator(val programAst: Program) extends CodeGenerator {
       case RealToInteger => s"(int)${argOpt(0)}"
       case StringToInteger =>
         s"""Integer.parseInt(${argOpt(0)})"""
+      case ReadInput       => "Console.ReadLine()"
     }
   }
 

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
@@ -139,6 +139,7 @@ class JavascriptGenerator(val programAst: Program) extends CodeGenerator {
       case CharAt          => s"${argOpt(0)}.charAt(${argOpt(1)})"
       case RealToInteger   => argOpt(0) // ??
       case StringToInteger => s"parseInt(${argOpt(0)})"
+      case ReadInput       => "Console.ReadLine()"
     }
   }
 

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
@@ -154,6 +154,7 @@ 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       => "Console.ReadLine()"
     }
   }
 

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
@@ -144,6 +144,7 @@ class PhpGenerator(val programAst: Program) extends CodeGenerator {
       case RealToInteger => argOpt(0) // ??
       case StringToInteger =>
         s""" intval(${argOpt(0)}) """.trim
+      case ReadInput       => "Console.ReadLine()"
     }
   }
 

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
@@ -156,6 +156,7 @@ class PythonGenerator(val programAst: Program) extends CodeGenerator {
       case CharAt          => s"${argOpt(0)}[${argOpt(1)}]"
       case RealToInteger   => s"int(${argOpt(0)})"
       case StringToInteger => s"int(${argOpt(0)})"
+      case ReadInput       => "Console.ReadLine()"
     }
   }
 

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
@@ -150,6 +150,7 @@ class RubyGenerator(val programAst: Program) extends CodeGenerator {
       case CharAt          => s"${argOpt(0)}.charAt(${argOpt(1)})"
       case RealToInteger   => s"${argOpt(0)}.toInt"
       case StringToInteger => s"${argOpt(0)}.to_i"
+      case ReadInput       => "Console.ReadLine()"
     }
   }
 

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
@@ -162,6 +162,7 @@ class ScalaGenerator(val programAst: Program) extends CodeGenerator {
       case CharAt          => s"${argOpt(0)}.charAt(${argOpt(1)})"
       case RealToInteger   => s"${argOpt(0)}.toInt"
       case StringToInteger => s"${argOpt(0)}.toInt"
+      case ReadInput => "StdIn.readLine()"
     }
   }
 

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
@@ -146,6 +146,8 @@ class SwiftGenerator(val programAst: Program) extends CodeGenerator {
         s"""try Int(${argOpt(0)})! catch {
            |  case _: NumberFormatException => 0
            |}""".stripMargin
+      case ReadInput => "Console.ReadLine()"
+
     }
   }