From 1165c9a8fc4084f8ce0208ceb7ab8c1a8301c7a4 Mon Sep 17 00:00:00 2001
From: alari <name.alari@gmail.com>
Date: Sat, 8 Sep 2018 14:40:32 +0200
Subject: [PATCH] FuncDef with simple body

---
 .../scala/fluence/hackethberlin/Expr.scala    | 19 +++++++++++++++++--
 .../scala/fluence/hackethberlin/FuncDef.scala | 15 ++++++++-------
 .../fluence/hackethberlin/MakeVyperApp.scala  | 13 ++++---------
 .../hackethberlin/types/StructType.scala      |  8 +++++---
 4 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/src/main/scala/fluence/hackethberlin/Expr.scala b/src/main/scala/fluence/hackethberlin/Expr.scala
index 81c2ccc..5001888 100644
--- a/src/main/scala/fluence/hackethberlin/Expr.scala
+++ b/src/main/scala/fluence/hackethberlin/Expr.scala
@@ -2,11 +2,26 @@ package fluence.hackethberlin
 
 sealed trait Expr[T <: types.Type] {
   def toVyper(depth: Int): String
+
+  protected def spaces(depth: Int): String = "  " * depth
+}
+
+sealed trait InlineExpr[T <: types.Type] extends Expr[T]{
+  override def toVyper(depth: Int): String = spaces(depth) + toInlineVyper
+
+  def toInlineVyper: String
+
+  def toReturn: Expr.Return[T] = Expr.Return[T](this)
 }
 
 object Expr {
-  case class Ref[T <: types.Type](name: String) extends Expr[T] {
+  case class Ref[T <: types.Type](name: String) extends InlineExpr[T] {
+    override def toInlineVyper: String = name
+  }
+
+  case class Return[T <: types.Type](ret: InlineExpr[T]) extends Expr[T] {
     override def toVyper(depth: Int): String =
-      ("  " * depth) + name
+      spaces(depth) + "return "+ret.toInlineVyper
+
   }
 }
diff --git a/src/main/scala/fluence/hackethberlin/FuncDef.scala b/src/main/scala/fluence/hackethberlin/FuncDef.scala
index 999ac5a..1c9fb04 100644
--- a/src/main/scala/fluence/hackethberlin/FuncDef.scala
+++ b/src/main/scala/fluence/hackethberlin/FuncDef.scala
@@ -1,21 +1,22 @@
 package fluence.hackethberlin
 
-import fluence.hackethberlin.types.DataVyper
+import fluence.hackethberlin.types.{DataVyper, StructType}
 import shapeless._
 
 class FuncDef[Args <: HList: DataVyper, Ret <: types.Type](
   name: String,
   argsDef: Args,
   ret: Option[Ret],
+  body: StructType[Args] ⇒ Expr[Ret],
   decorators: Set[Decorator] = Set.empty
 ) {
 
   def toVyper: String =
     s"${decorators.map(_.toVyper).mkString("\n")}\ndef $name(${DataVyper[Args]
-      .mkString(argsDef, ", ")})${ret.fold("")(" -> " + _.toVyper)}:\n   body;\n"
+      .mkString(argsDef, ", ")})${ret.fold("")(" -> " + _.toVyper)}:\n${body(new StructType[Args](argsDef)).toVyper(1)};\n"
 
   def @:(decorator: Decorator): FuncDef[Args, Ret] =
-    new FuncDef[Args, Ret](name, argsDef, ret, decorators + decorator)
+    new FuncDef[Args, Ret](name, argsDef, ret, body, decorators + decorator)
 }
 
 object FuncDef {
@@ -24,13 +25,13 @@ object FuncDef {
     name: String,
     argsDef: Args,
     ret: Ret
-  ): FuncDef[Args, Ret] =
-    new FuncDef(name, argsDef, Some(ret))
+  )(body: StructType[Args] ⇒ Expr.Return[Ret]): FuncDef[Args, Ret] =
+    new FuncDef(name, argsDef, Some(ret), body)
 
   def apply[Args <: HList: DataVyper](
     name: String,
     argsDef: Args
-  ): FuncDef[Args, types.Void] =
-    new FuncDef(name, argsDef, None)
+  )(body: StructType[Args] ⇒ Expr[types.Void]): FuncDef[Args, types.Void] =
+    new FuncDef(name, argsDef, None, body)
 
 }
diff --git a/src/main/scala/fluence/hackethberlin/MakeVyperApp.scala b/src/main/scala/fluence/hackethberlin/MakeVyperApp.scala
index 854a207..9e93e15 100644
--- a/src/main/scala/fluence/hackethberlin/MakeVyperApp.scala
+++ b/src/main/scala/fluence/hackethberlin/MakeVyperApp.scala
@@ -2,9 +2,7 @@ package fluence.hackethberlin
 
 import shapeless._
 import types._
-import record._
 import Decorator._
-import shapeless.labelled.FieldType
 import syntax.singleton._
 
 object MakeVyperApp extends App {
@@ -27,18 +25,15 @@ object MakeVyperApp extends App {
 
   val func = FuncDef(
     "myFunc",
-    ('address ->> address) :: HNil,
-    uint256
-  )
-
-
-  val strDataDef = ('address ->> address) :: HNil
+    ('addr ->> address) :: HNil,
+    address
+  )(args ⇒ args.ref('addr).toReturn)
 
   val recordStruct = new StructType(
     ('record_address ->> address) :: ('other_some ->> uint256) :: HNil
   )
 
-  println(Console.RED + recordStruct.get('other_some) + Console.RESET)
+  println(Console.RED + recordStruct.ref('other_some) + Console.RESET)
 
   println(recordStruct.toVyper)
 
diff --git a/src/main/scala/fluence/hackethberlin/types/StructType.scala b/src/main/scala/fluence/hackethberlin/types/StructType.scala
index 6dbf6eb..d528c46 100644
--- a/src/main/scala/fluence/hackethberlin/types/StructType.scala
+++ b/src/main/scala/fluence/hackethberlin/types/StructType.scala
@@ -5,8 +5,10 @@ import shapeless.{HList, Witness}
 import shapeless.ops.record.Selector
 
 class StructType[D <: HList](dataDef: D)(implicit dv: DataVyper[D]) extends Type {
-  def get(k: Witness)(implicit selector : Selector[D, k.T], ev: k.T <:< Type): Expr.Ref[k.T] =
-    Expr.Ref[k.T]("field should be there")
 
-  override def toVyper: String = s"{${dv.toVyperDefinitions(dataDef).mkString(", ")}}"
+  def ref[T <: Symbol, V <: Type](k: Witness.Aux[T])(implicit selector : Selector.Aux[D, T, V]): Expr.Ref[V] =
+    Expr.Ref[V](k.value.name)
+
+  override def toVyper: String =
+    s"{${dv.toVyperDefinitions(dataDef).mkString(", ")}}"
 }