From 8bc3f6c194058e96dcbe58a0a81dc564d962607d Mon Sep 17 00:00:00 2001 From: alari Date: Sat, 8 Sep 2018 19:25:38 +0200 Subject: [PATCH] Formatting --- .../main/scala/fluence/hackethberlin/Contract.scala | 1 + .../fluence/hackethberlin/types/DataVyper.scala | 5 +++-- src/main/scala/fluence/MakeVyperApp.scala | 12 ++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/core/src/main/scala/fluence/hackethberlin/Contract.scala b/core/src/main/scala/fluence/hackethberlin/Contract.scala index 773c490..45d34f8 100644 --- a/core/src/main/scala/fluence/hackethberlin/Contract.scala +++ b/core/src/main/scala/fluence/hackethberlin/Contract.scala @@ -4,6 +4,7 @@ import fluence.hackethberlin.types.DataVyper import shapeless.HList class Contract[D <: HList](instructions: D)(implicit dv: DataVyper[D]) { + def toVyper: String = dv.toVyperDefinitions(instructions).mkString("\n") } diff --git a/core/src/main/scala/fluence/hackethberlin/types/DataVyper.scala b/core/src/main/scala/fluence/hackethberlin/types/DataVyper.scala index 5dfe66b..7dcb83d 100644 --- a/core/src/main/scala/fluence/hackethberlin/types/DataVyper.scala +++ b/core/src/main/scala/fluence/hackethberlin/types/DataVyper.scala @@ -1,6 +1,6 @@ package fluence.hackethberlin.types -import fluence.hackethberlin.{FuncDef, types} +import fluence.hackethberlin.{types, FuncDef} import shapeless._ import shapeless.labelled.FieldType import shapeless.tag._ @@ -36,7 +36,8 @@ sealed trait LowPriorityDataVyperImplicits { data.toDataVyper :: Nil } - implicit def funcDefDataVyper[Args <: HList, Ret <: types.Type, Params <: HList]: DataVyper[FuncDef[Args, Ret, Params]] = + implicit def funcDefDataVyper[Args <: HList, Ret <: types.Type, Params <: HList] + : DataVyper[FuncDef[Args, Ret, Params]] = new DataVyper[FuncDef[Args, Ret, Params]] { override def toVyperDefinitions(func: FuncDef[Args, Ret, Params]): List[String] = func.toVyper :: Nil diff --git a/src/main/scala/fluence/MakeVyperApp.scala b/src/main/scala/fluence/MakeVyperApp.scala index bc599e8..392451d 100644 --- a/src/main/scala/fluence/MakeVyperApp.scala +++ b/src/main/scala/fluence/MakeVyperApp.scala @@ -48,12 +48,12 @@ object MakeVyperApp extends App { val f = `@public` @: sumArgs.funcDef("sum", uint256) { args ⇒ - for { - c ← 'c :=: `++`(args.ref('a), args.ref('b)) - d ← 'd :=: `++`(args.ref('b), c) - sum ← `++`(args.ref('a), d).toReturn - } yield sum - } + for { + c ← 'c :=: `++`(args.ref('a), args.ref('b)) + d ← 'd :=: `++`(args.ref('b), c) + sum ← `++`(args.ref('a), d).toReturn + } yield sum + } val all = recordStruct :: data :: func :: f :: HNil