Fix: resolve function return name (#154)

fluencelabs · Jun 4, 2021 · 15f582e · 15f582e
1 parent 0e2ea88
commit 15f582e
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 24 deletions.
diff --git a/aqua-src/demo.aqua b/aqua-src/demo.aqua
@@ -1,4 +1,10 @@
-service Demo("demo"):
-	get4() -> u64
-	get5(arg: u32)
-	get6(a: string) -> bool
+service OpH("op"):
+  puk(s: string) -> string
+
+func a(b: string) -> string:
+  c <- OpH.puk(b)
+  <- c
+
+func d(e: string) -> string:
+  f <- a(e)
+  <- f
diff --git a/aqua-src/error.aqua → aqua/error.aqua b/aqua-src/error.aqua → aqua/error.aqua
diff --git a/build.sbt b/build.sbt
@@ -19,6 +19,8 @@ val slf4jV = "1.7.30"
 val declineV = "2.0.0-RC1" // Scala3 issue: https://github.com/bkirwi/decline/issues/260
 val declineEnumV = "1.3.0"
 
+val airframeLog = "org.wvlet.airframe" %% "airframe-log" % airframeLogV
+
 name := "aqua-hll"
 
 val commons = Seq(
@@ -41,16 +43,16 @@ lazy val cli = project
     assembly / mainClass       := Some("aqua.AquaCli"),
     assembly / assemblyJarName := "aqua-cli-" + version.value + ".jar",
     libraryDependencies ++= Seq(
-      "com.monovore"       %% "decline"            % declineV,
-      "com.monovore"       %% "decline-effect"     % declineV,
-      "org.typelevel"      %% "cats-effect"        % catsEffectV,
-      "co.fs2"             %% "fs2-core"           % fs2V,
-      "co.fs2"             %% "fs2-io"             % fs2V,
-      "org.typelevel"      %% "log4cats-slf4j"     % log4catsV,
-      "org.wvlet.airframe" %% "airframe-log"       % airframeLogV,
-      "com.beachape"       %% "enumeratum"         % enumeratumV,
-      "org.slf4j"           % "slf4j-jdk14"        % slf4jV,
-      "com.monovore"       %% "decline-enumeratum" % declineEnumV
+      "com.monovore"  %% "decline"        % declineV,
+      "com.monovore"  %% "decline-effect" % declineV,
+      "org.typelevel" %% "cats-effect"    % catsEffectV,
+      "co.fs2"        %% "fs2-core"       % fs2V,
+      "co.fs2"        %% "fs2-io"         % fs2V,
+      "org.typelevel" %% "log4cats-slf4j" % log4catsV,
+      airframeLog,
+      "com.beachape" %% "enumeratum"         % enumeratumV,
+      "org.slf4j"     % "slf4j-jdk14"        % slf4jV,
+      "com.monovore" %% "decline-enumeratum" % declineEnumV
     )
   )
   .dependsOn(semantics, `backend-air`, `backend-ts`, linker)
@@ -86,6 +88,7 @@ lazy val model = project
   .settings(commons: _*)
   .settings(
     libraryDependencies ++= Seq(
+      airframeLog,
       "org.typelevel" %% "cats-free" % catsV
     )
   )

diff --git a/model/src/main/scala/aqua/model/func/FuncCallable.scala b/model/src/main/scala/aqua/model/func/FuncCallable.scala
@@ -2,10 +2,11 @@ package aqua.model.func
 
 import aqua.model.func.body.{CallArrowTag, FuncOp, OpTag}
 import aqua.model.{ValueModel, VarModel}
-import aqua.types.{ArrowType, DataType, Type}
+import aqua.types.{ArrowType, Type}
 import cats.Eval
 import cats.data.Chain
 import cats.free.Cofree
+import wvlet.log.Logger
 
 case class FuncCallable(
   funcName: String,
@@ -16,6 +17,9 @@ case class FuncCallable(
   capturedValues: Map[String, ValueModel]
 ) {
 
+  private val logger = Logger.of[FuncCallable]
+  import logger._
+
   def arrowType: ArrowType =
     ArrowType(
       args.types,
@@ -38,6 +42,8 @@ case class FuncCallable(
     forbiddenNames: Set[String]
   ): Eval[(FuncOp, Option[ValueModel])] = {
 
+    debug("Call: " + call)
+
     // Collect all arguments: what names are used inside the function, what values are received
     val argsFull = args.call(call)
     // DataType arguments
@@ -99,9 +105,7 @@ case class FuncCallable(
         case (acc @ (_, resolvedExports), tag) =>
           tag match {
             case CallArrowTag(fn, _) if !allArrows.contains(fn) =>
-              println(
-                Console.RED + s"UNRESOLVED $fn in $funcName, skipping, will become (null) in AIR!" + Console.RESET
-              )
+              error(s"UNRESOLVED $fn in $funcName, skipping, will become (null) in AIR!")
             case _ =>
           }
 

diff --git a/model/src/main/scala/aqua/model/transform/ResolveFunc.scala b/model/src/main/scala/aqua/model/transform/ResolveFunc.scala
@@ -1,11 +1,13 @@
 package aqua.model.transform
 
-import aqua.model.VarModel
+import aqua.model.{ValueModel, VarModel}
 import aqua.model.func.{ArgDef, ArgsCall, ArgsDef, Call, FuncCallable}
 import aqua.model.func.body.{FuncOp, FuncOps}
 import aqua.types.ArrowType
 import cats.Eval
 import cats.syntax.apply._
+import cats.syntax.functor._
+import wvlet.log.Logger
 
 case class ResolveFunc(
   transform: FuncOp => FuncOp,
@@ -15,15 +17,17 @@ case class ResolveFunc(
   arrowCallbackPrefix: String = "init_peer_callable_"
 ) {
 
-  def returnCallback(func: FuncCallable): Option[FuncOp] = func.ret.map { case (retModel, _) =>
+  private val logger = Logger.of[ResolveFunc]
+  import logger._
+
+  def returnCallback(retModel: ValueModel): FuncOp =
     callback(
       respFuncName,
       Call(
         retModel :: Nil,
         None
       )
     )
-  }
 
   def arrowToCallback(name: String, arrowType: ArrowType): FuncCallable = {
     val (args, call, ret) = ArgsCall.arrowToArgsCallRet(arrowType)
@@ -47,10 +51,14 @@ case class ResolveFunc(
               func.funcName,
               Call(
                 func.args.toCallArgs,
-                None
+                func.ret.map(rmv => Call.Export("-return-", rmv._1.lastType))
               )
             ) ::
-            returnCallback(func).toList: _*
+            func.ret
+              .map(_._1)
+              .map(rmv => VarModel("-return-", rmv.lastType))
+              .map(returnCallback)
+              .toList: _*
         )
       ),
       ArgsDef(ArgDef.Arrow(func.funcName, func.arrowType) :: Nil),
@@ -61,7 +69,10 @@ case class ResolveFunc(
       Map.empty
     )
 
-  def resolve(func: FuncCallable, funcArgName: String = "_func"): Eval[FuncOp] =
+  def resolve(
+    func: FuncCallable,
+    funcArgName: String = "_func"
+  ): Eval[FuncOp] =
     wrap(func)
       .resolve(
         Call(VarModel(funcArgName, func.arrowType) :: Nil, None),