Merge branch 'master' of github.com:sacode387/FlowRun

sacode387 · Sep 4, 2023 · 83928aa · 83928aa
2 parents 2ed5253 + 46afc6b
commit 83928aa
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 0 deletions.
diff --git a/core/src/main/scala/dev/sacode/flowrun/ast/PredefinedFunction.scala b/core/src/main/scala/dev/sacode/flowrun/ast/PredefinedFunction.scala
@@ -17,6 +17,7 @@ enum PredefinedFunction(val name: String) {
   case CharAt extends PredefinedFunction("charAt")
   // conversions
   case RealToInteger extends PredefinedFunction("real2int")
+  case StringToInteger extends PredefinedFunction("string2int")
 }
 
 object PredefinedFunction {

diff --git a/core/src/main/scala/dev/sacode/flowrun/codegen/CPlusPlusGenerator.scala b/core/src/main/scala/dev/sacode/flowrun/codegen/CPlusPlusGenerator.scala
@@ -150,6 +150,8 @@ class CPlusPlusGenerator(val programAst: Program) extends CodeGenerator {
       case Length        => s"${argOpt(0)}.length()"
       case CharAt        => s"${argOpt(0)}.charAt(${argOpt(1)})"
       case RealToInteger => s"(int)${argOpt(0)}"
+      case StringToInteger =>
+        s"""try { Convert.ToInt32(${argOpt(0)}) } catch (FormatException) { 0 }"""
     }
   }
 

diff --git a/core/src/main/scala/dev/sacode/flowrun/codegen/CSharpGenerator.scala b/core/src/main/scala/dev/sacode/flowrun/codegen/CSharpGenerator.scala
@@ -155,6 +155,7 @@ class CSharpGenerator(val programAst: Program) extends CodeGenerator {
       case Length        => s"${argOpt(0)}.length()"
       case CharAt        => s"${argOpt(0)}.charAt(${argOpt(1)})"
       case RealToInteger => s"(int)${argOpt(0)}"
+      case StringToInteger => s"Convert.ToInt32(${argOpt(0)})"
     }
   }
 

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

diff --git a/core/src/main/scala/dev/sacode/flowrun/codegen/JavaGenerator.scala b/core/src/main/scala/dev/sacode/flowrun/codegen/JavaGenerator.scala
@@ -159,6 +159,8 @@ class JavaGenerator(val programAst: Program) extends CodeGenerator {
       case Length        => s"${argOpt(0)}.length()"
       case CharAt        => s"${argOpt(0)}.charAt(${argOpt(1)})"
       case RealToInteger => s"(int)${argOpt(0)}"
+      case StringToInteger =>
+        s"""Integer.parseInt(${argOpt(0)})"""
     }
   }
 

diff --git a/core/src/main/scala/dev/sacode/flowrun/codegen/JavascriptGenerator.scala b/core/src/main/scala/dev/sacode/flowrun/codegen/JavascriptGenerator.scala
@@ -133,6 +133,7 @@ class JavascriptGenerator(val programAst: Program) extends CodeGenerator {
       case Length        => s"${argOpt(0)}.length"
       case CharAt        => s"${argOpt(0)}.charAt(${argOpt(1)})"
       case RealToInteger => argOpt(0) // ??
+      case StringToInteger => s"parseInt(${argOpt(0)})"
     }
   }
 

diff --git a/core/src/main/scala/dev/sacode/flowrun/codegen/KotlinGenerator.scala b/core/src/main/scala/dev/sacode/flowrun/codegen/KotlinGenerator.scala
@@ -147,6 +147,8 @@ class KotlinGenerator(val programAst: Program) extends CodeGenerator {
       case Length        => s"${argOpt(0)}.length()"
       case CharAt        => s"${argOpt(0)}.charAt(${argOpt(1)})"
       case RealToInteger => s"(int)${argOpt(0)}"
+      case StringToInteger =>
+        s"""try { Integer.parseInt(${argOpt(0)}) } catch (NumberFormatException e) { 0 }"""
     }
   }
 

diff --git a/core/src/main/scala/dev/sacode/flowrun/codegen/PhpGenerator.scala b/core/src/main/scala/dev/sacode/flowrun/codegen/PhpGenerator.scala
@@ -137,6 +137,8 @@ class PhpGenerator(val programAst: Program) extends CodeGenerator {
       case Length        => s"strlen(${argOpt(0)})"
       case CharAt        => s"${argOpt(0)}[${argOpt(1)}]"
       case RealToInteger => argOpt(0) // ??
+      case StringToInteger =>
+        s""" intval(${argOpt(0)}) """.trim
     }
   }
 

diff --git a/core/src/main/scala/dev/sacode/flowrun/codegen/PythonGenerator.scala b/core/src/main/scala/dev/sacode/flowrun/codegen/PythonGenerator.scala
@@ -150,6 +150,7 @@ class PythonGenerator(val programAst: Program) extends CodeGenerator {
       case Length        => s"len(${argOpt(0)})"
       case CharAt        => s"${argOpt(0)}[${argOpt(1)}]"
       case RealToInteger => s"int(${argOpt(0)})"
+      case StringToInteger => s"int(${argOpt(0)})"
     }
   }
 

diff --git a/core/src/main/scala/dev/sacode/flowrun/codegen/RubyGenerator.scala b/core/src/main/scala/dev/sacode/flowrun/codegen/RubyGenerator.scala
@@ -139,6 +139,7 @@ class RubyGenerator(val programAst: Program) extends CodeGenerator {
       case Length        => s"${argOpt(0)}.length"
       case CharAt        => s"${argOpt(0)}.charAt(${argOpt(1)})"
       case RealToInteger => s"${argOpt(0)}.toInt"
+      case StringToInteger => s"${argOpt(0)}.to_i"
     }
   }
 

diff --git a/core/src/main/scala/dev/sacode/flowrun/codegen/ScalaGenerator.scala b/core/src/main/scala/dev/sacode/flowrun/codegen/ScalaGenerator.scala
@@ -156,6 +156,7 @@ class ScalaGenerator(val programAst: Program) extends CodeGenerator {
       case Length        => s"${argOpt(0)}.length"
       case CharAt        => s"${argOpt(0)}.charAt(${argOpt(1)})"
       case RealToInteger => s"${argOpt(0)}.toInt"
+      case StringToInteger => s"${argOpt(0)}.toInt"
     }
   }
 

diff --git a/core/src/main/scala/dev/sacode/flowrun/codegen/SwiftGenerator.scala b/core/src/main/scala/dev/sacode/flowrun/codegen/SwiftGenerator.scala
@@ -137,6 +137,10 @@ class SwiftGenerator(val programAst: Program) extends CodeGenerator {
       case Length        => s"${argOpt(0)}.length"
       case CharAt        => s"${argOpt(0)}.charAt(${argOpt(1)})"
       case RealToInteger => s"${argOpt(0)}.toInt"
+      case StringToInteger =>
+        s"""try Int(${argOpt(0)})! catch {
+           |  case _: NumberFormatException => 0
+           |}""".stripMargin
     }
   }
 

diff --git a/core/src/main/scala/dev/sacode/flowrun/eval/Interpreter.scala b/core/src/main/scala/dev/sacode/flowrun/eval/Interpreter.scala
@@ -573,6 +573,13 @@ final class Interpreter(programModel: ProgramModel, flowrunChannel: Channel[Flow
         args.head match
           case n: RealVal => Future(IntegerVal(n.value.toInt))
           case _          => throw EvalException(s"Expected a Real argument in function ${func.name}", id)
+
+          // conversions
+      case func @ StringToInteger =>
+        validateArgsNumber(id, func.name, 1, args.size)
+        args.head match
+          case n: StringVal => Future(IntegerVal(n.value.toInt))
+          case _          => throw EvalException(s"Expected a String argument in function ${func.name}", id)
     }
 
   private def validateArgsNumber(id: String, funName: String, expected: Int, got: Int): Unit =