From 934ce737484d9401843e36d75b2aa4ad8209c252 Mon Sep 17 00:00:00 2001 From: DieMyst Date: Tue, 25 Jul 2023 14:09:59 +0200 Subject: [PATCH 1/3] restrict export functions that return arrow types or ability types --- aqua-src/antithesis.aqua | 51 +++---------------- .../src/main/scala/aqua/lsp/LspContext.scala | 7 ++- .../aqua/semantics/header/HeaderHandler.scala | 28 ++++++---- .../scala/aqua/semantics/header/Picker.scala | 19 +++++-- .../rules/names/NamesInterpreter.scala | 9 ++-- 5 files changed, 47 insertions(+), 67 deletions(-) diff --git a/aqua-src/antithesis.aqua b/aqua-src/antithesis.aqua index f46c55fb1..8aa4d593d 100644 --- a/aqua-src/antithesis.aqua +++ b/aqua-src/antithesis.aqua @@ -1,50 +1,11 @@ aqua Main -use DECLARE_CONST, decl_bar from "declare.aqua" as Declare +export a -export handleAb +alias CL: string -> () -service SomeService("wed"): - getStr(s: string) -> string +func a(cl: string -> ()) -> CL: + <- cl -ability SomeAb: - someArrow(s: string) -> string, string - str: string - -ability SecondAb: - arrow(s: string) -> string - num: u32 - -func funcStr(s: string) -> string, string: - strInFunc <- SomeService.getStr(Declare.DECLARE_CONST) - -- SomeService.getStr(s) - <- strInFunc, s - --- --- func diffFunc(s: string) -> string: --- differentStr <- SomeService.different(s) --- <- differentStr --- --- func unit(): --- funcStr("") - --- func bbbbbbb() --- --- func aaaaaa(): --- closure = (a: string) -> string: --- <- SomeService.str() - -func handleSecAb {SomeAb, SecondAb}() -> string, string: - SomeAb.someArrow("eferfrfrf") - b, c <- SomeAb.someArrow("efre") - <- b, c - -func returnAb(s: string) -> SomeAb: - SomeAb = SomeAb(someArrow = funcStr, str = s) - <- SomeAb - -func handleAb(fff: string) -> string, string: - SomeAb = returnAb(fff) - SecondAb = SecondAb(arrow = funcStr, num = 12) - d, g <- handleSecAb{SomeAb, SecondAb}() - <- d, g +func b(c: u32, d: u32) -> u32: + <- c + d \ No newline at end of file diff --git a/language-server/language-server-api/src/main/scala/aqua/lsp/LspContext.scala b/language-server/language-server-api/src/main/scala/aqua/lsp/LspContext.scala index 8f06a7202..72b002729 100644 --- a/language-server/language-server-api/src/main/scala/aqua/lsp/LspContext.scala +++ b/language-server/language-server-api/src/main/scala/aqua/lsp/LspContext.scala @@ -56,6 +56,9 @@ object LspContext { override def blank: LspContext[S] = LspContext[S](Picker[RawContext].blank, Map.empty) override def exports(ctx: LspContext[S]): Option[Map[String, Option[String]]] = ops(ctx).exports + + override def funcReturnAbilityOrArrow(name: String, ctx: LspContext[S]): Boolean = + ops(ctx).funcReturnAbilityOrArrow(name) override def funcNames(ctx: LspContext[S]): List[String] = ops(ctx).funcNames override def addPart(ctx: LspContext[S], part: (LspContext[S], RawPart)): LspContext[S] = @@ -104,7 +107,6 @@ object LspContext { } }.getOrElse(ctx.tokens) - ops(ctx) .pick(name, rename, declared) .map(rc => @@ -124,6 +126,7 @@ object LspContext { override def pickDeclared( ctx: LspContext[S] - )(implicit semi: Semigroup[LspContext[S]]): LspContext[S] = ctx.copy(raw = ops(ctx).pickDeclared) + )(implicit semi: Semigroup[LspContext[S]]): LspContext[S] = + ctx.copy(raw = ops(ctx).pickDeclared) } } diff --git a/semantics/src/main/scala/aqua/semantics/header/HeaderHandler.scala b/semantics/src/main/scala/aqua/semantics/header/HeaderHandler.scala index d57aa7d02..c615b3a63 100644 --- a/semantics/src/main/scala/aqua/semantics/header/HeaderHandler.scala +++ b/semantics/src/main/scala/aqua/semantics/header/HeaderHandler.scala @@ -173,17 +173,25 @@ class HeaderHandler[S[_]: Comonad, C](implicit ) ) .map { case (token, name, rename) => - (initCtx |+| ctx) - .pick(name, rename, declared = false) - .map(_ => Map(name -> rename)) - .map(validNec) - .getOrElse( - error( - token, - s"File has no $name declaration or import, cannot export, available funcs: ${(initCtx |+| ctx).funcNames - .mkString(", ")}" - ) + val sumCtx = initCtx |+| ctx + + if (sumCtx.funcReturnAbilityOrArrow(name)) + error( + token, + s"The function '$name' cannot be exported, because it returns arrow type or ability type" ) + else + sumCtx + .pick(name, rename, declared = false) + .map(_ => Map(name -> rename)) + .map(validNec) + .getOrElse( + error( + token, + s"File has no $name declaration or import, cannot export, available funcs: ${sumCtx.funcNames + .mkString(", ")}" + ) + ) } .foldLeft[ResT[S, Map[String, Option[String]]]]( validNec(ctx.exports.getOrElse(Map.empty)) diff --git a/semantics/src/main/scala/aqua/semantics/header/Picker.scala b/semantics/src/main/scala/aqua/semantics/header/Picker.scala index 636f5a8c4..7f9121bae 100644 --- a/semantics/src/main/scala/aqua/semantics/header/Picker.scala +++ b/semantics/src/main/scala/aqua/semantics/header/Picker.scala @@ -1,11 +1,8 @@ package aqua.semantics.header import aqua.raw.{RawContext, RawPart} -import aqua.semantics.CompilerState -import aqua.semantics.rules.abilities.AbilitiesState -import aqua.semantics.rules.names.NamesState -import aqua.semantics.rules.types.TypesState -import cats.{Comonad, Semigroup} +import aqua.types.{AbilityType, ArrowType} +import cats.Semigroup import cats.syntax.semigroup.* // Able to pick info from different contexts @@ -19,6 +16,7 @@ trait Picker[A] { def pickHeader(ctx: A): A def module(ctx: A): Option[String] def exports(ctx: A): Option[Map[String, Option[String]]] + def funcReturnAbilityOrArrow(name: String, ctx: A): Boolean def declares(ctx: A): Set[String] def setAbility(ctx: A, name: String, ctxAb: A): A def setModule(ctx: A, name: Option[String], declares: Set[String]): A @@ -39,6 +37,7 @@ final class PickerOps[A: Picker](p: A) { def pickHeader: A = Picker[A].pickHeader(p) def module: Option[String] = Picker[A].module(p) def exports: Option[Map[String, Option[String]]] = Picker[A].exports(p) + def funcReturnAbilityOrArrow(name: String): Boolean = Picker[A].funcReturnAbilityOrArrow(name, p) def declares: Set[String] = Picker[A].declares(p) def setAbility(name: String, ctx: A): A = Picker[A].setAbility(p, name, ctx) def setInit(ctx: Option[A]): A = Picker[A].setInit(p, ctx) @@ -56,6 +55,14 @@ final class PickerOps[A: Picker](p: A) { object Picker { + def typeContainsAbilityOrArrow(arrowType: ArrowType): Boolean = { + arrowType.codomain.toList.exists { + case _: AbilityType => true + case _: ArrowType => true + case _ => false + } + } + implicit final def apply[A](implicit ev: Picker[A]): Picker[A] = ev implicit final def syntaxPicker[A: Picker](a: A): PickerOps[A] = @@ -65,6 +72,8 @@ object Picker { override def blank: RawContext = RawContext.blank override def exports(ctx: RawContext): Option[Map[String, Option[String]]] = ctx.exports + override def funcReturnAbilityOrArrow(name: String, ctx: RawContext): Boolean = + ctx.funcs.get(name).map(_.arrow.`type`).exists(typeContainsAbilityOrArrow) override def funcNames(ctx: RawContext): List[String] = ctx.funcs.keys.toList override def addPart(ctx: RawContext, part: (RawContext, RawPart)): RawContext = diff --git a/semantics/src/main/scala/aqua/semantics/rules/names/NamesInterpreter.scala b/semantics/src/main/scala/aqua/semantics/rules/names/NamesInterpreter.scala index 164782d86..0d6b8e6d5 100644 --- a/semantics/src/main/scala/aqua/semantics/rules/names/NamesInterpreter.scala +++ b/semantics/src/main/scala/aqua/semantics/rules/names/NamesInterpreter.scala @@ -2,14 +2,13 @@ package aqua.semantics.rules.names import aqua.parser.lexer.{Name, Token} import aqua.semantics.Levenshtein -import aqua.semantics.rules.locations.LocationsAlgebra import aqua.semantics.rules.StackInterpreter import aqua.semantics.rules.errors.ReportErrors -import aqua.types.{ArrowType, StreamType, Type} +import aqua.semantics.rules.locations.LocationsAlgebra +import aqua.types.{AbilityType, ArrowType, StreamType, Type} import cats.data.{OptionT, State} import cats.syntax.flatMap.* import cats.syntax.functor.* -import cats.~> import monocle.Lens import monocle.macros.GenLens @@ -142,7 +141,7 @@ class NamesInterpreter[S[_], X](implicit if (isRoot) modify(st => st.copy( - rootArrows = st.rootArrows.updated(name.value, gen), + rootArrows = st.rootArrows.updated(name.value, arrowType), definitions = st.definitions.updated(name.value, name) ) ) @@ -150,7 +149,7 @@ class NamesInterpreter[S[_], X](implicit else report(name, "Cannot define a variable in the root scope") .as(false) - )(fr => fr.addArrow(name, gen) -> true) + )(fr => fr.addArrow(name, arrowType) -> true) }.flatTap(_ => locations.addToken(name.value, name)) override def streamsDefinedWithinScope(): SX[Map[String, StreamType]] = From 8199d74bc99084b9a8b310b95be05c6ec2ba6f22 Mon Sep 17 00:00:00 2001 From: DieMyst Date: Tue, 25 Jul 2023 15:38:23 +0200 Subject: [PATCH 2/3] add test --- .../scala/aqua/compiler/CompilerAPI.scala | 14 +----- .../aqua/semantics/header/HeaderSem.scala | 23 +++++++++ .../rules/names/NamesInterpreter.scala | 2 +- .../scala/aqua/semantics/HeaderSpec.scala | 50 +++++++++++++++++++ .../main/scala/aqua/logging/LogLevels.scala | 5 +- 5 files changed, 77 insertions(+), 17 deletions(-) create mode 100644 semantics/src/test/scala/aqua/semantics/HeaderSpec.scala diff --git a/compiler/src/main/scala/aqua/compiler/CompilerAPI.scala b/compiler/src/main/scala/aqua/compiler/CompilerAPI.scala index cab1bb886..6b91fd389 100644 --- a/compiler/src/main/scala/aqua/compiler/CompilerAPI.scala +++ b/compiler/src/main/scala/aqua/compiler/CompilerAPI.scala @@ -63,19 +63,7 @@ object CompilerAPI extends Logging { ) .rawContextMonoid - implicit val headerSemMonoid: Monoid[HeaderSem[S, RawContext]] = - new Monoid[HeaderSem[S, RawContext]] { - override def empty: HeaderSem[S, RawContext] = HeaderSem(rc.empty, (c, _) => validNec(c)) - - override def combine( - a: HeaderSem[S, RawContext], - b: HeaderSem[S, RawContext] - ): HeaderSem[S, RawContext] = - HeaderSem( - a.initCtx |+| b.initCtx, - (c, i) => a.finInitCtx(c, i).andThen(b.finInitCtx(_, i)) - ) - } + implicit val headerSemMonoid: Monoid[HeaderSem[S, RawContext]] = HeaderSem.headerSemMonoid[S] val semantics = new RawSemantics[S]() diff --git a/semantics/src/main/scala/aqua/semantics/header/HeaderSem.scala b/semantics/src/main/scala/aqua/semantics/header/HeaderSem.scala index 732591967..15e9887a4 100644 --- a/semantics/src/main/scala/aqua/semantics/header/HeaderSem.scala +++ b/semantics/src/main/scala/aqua/semantics/header/HeaderSem.scala @@ -1,7 +1,11 @@ package aqua.semantics.header +import aqua.raw.RawContext import aqua.semantics.SemanticError +import cats.{Comonad, Monoid} import cats.data.* +import cats.syntax.monoid.* +import cats.data.Validated.validNec case class HeaderSem[S[_], C]( initCtx: C, @@ -11,3 +15,22 @@ case class HeaderSem[S[_], C]( def finCtx: C => ValidatedNec[SemanticError[S], C] = finInitCtx(_, initCtx) } + +object HeaderSem { + + implicit def headerSemMonoid[S[_]: Comonad](implicit + rc: Monoid[RawContext] + ): Monoid[HeaderSem[S, RawContext]] = + new Monoid[HeaderSem[S, RawContext]] { + override def empty: HeaderSem[S, RawContext] = HeaderSem(rc.empty, (c, _) => validNec(c)) + + override def combine( + a: HeaderSem[S, RawContext], + b: HeaderSem[S, RawContext] + ): HeaderSem[S, RawContext] = + HeaderSem( + a.initCtx |+| b.initCtx, + (c, i) => a.finInitCtx(c, i).andThen(b.finInitCtx(_, i)) + ) + } +} diff --git a/semantics/src/main/scala/aqua/semantics/rules/names/NamesInterpreter.scala b/semantics/src/main/scala/aqua/semantics/rules/names/NamesInterpreter.scala index 0d6b8e6d5..b8976c247 100644 --- a/semantics/src/main/scala/aqua/semantics/rules/names/NamesInterpreter.scala +++ b/semantics/src/main/scala/aqua/semantics/rules/names/NamesInterpreter.scala @@ -128,7 +128,7 @@ class NamesInterpreter[S[_], X](implicit ).as(true) }.flatTap(_ => locations.addToken(name.value, name)) - override def defineArrow(name: Name[S], gen: ArrowType, isRoot: Boolean): SX[Boolean] = + override def defineArrow(name: Name[S], arrowType: ArrowType, isRoot: Boolean): SX[Boolean] = readName(name.value).flatMap { case Some(_) => getState.map(_.definitions.get(name.value).exists(_ == name)).flatMap { diff --git a/semantics/src/test/scala/aqua/semantics/HeaderSpec.scala b/semantics/src/test/scala/aqua/semantics/HeaderSpec.scala new file mode 100644 index 000000000..57a7557ad --- /dev/null +++ b/semantics/src/test/scala/aqua/semantics/HeaderSpec.scala @@ -0,0 +1,50 @@ +package aqua.semantics + +import aqua.parser.head.{ExportExpr, FromExpr, HeaderExpr} +import aqua.parser.lexer.Name +import aqua.raw.RawContext +import aqua.raw.arrow.{ArrowRaw, FuncRaw} +import aqua.raw.ops.RawTag +import aqua.raw.value.VarRaw +import aqua.semantics.header.{HeaderHandler, HeaderSem} +import aqua.types.{ArrowType, NilType, ProductType} +import cats.data.{Chain, NonEmptyList} +import cats.free.Cofree +import cats.{Eval, Id, Monoid} +import org.scalatest.flatspec.AnyFlatSpec +import org.scalatest.matchers.should.Matchers + +class HeaderSpec extends AnyFlatSpec with Matchers { + + "header handler" should "generate an error on exported function that returns arrow or ability" in { + implicit val rc: Monoid[RawContext] = RawContext.implicits(RawContext.blank).rawContextMonoid + + implicit val headerSemMonoid: Monoid[HeaderSem[Id, RawContext]] = HeaderSem.headerSemMonoid + + val handler = new HeaderHandler[Id, RawContext]() + + val funcName = "funcName" + + val exp: FromExpr.NameOrAbAs[Id] = Left((Name[Id](funcName), None)) + val ast = + Cofree[Chain, HeaderExpr[Id]](ExportExpr[Id](NonEmptyList.of(exp)), Eval.now(Chain.empty)) + + val retArrowType = ArrowType(NilType, NilType) + val arrowType = ArrowType(NilType, ProductType.apply(retArrowType :: Nil)) + + val initCtx = RawContext(parts = + Chain.one( + ( + RawContext.blank, + FuncRaw(funcName, ArrowRaw(arrowType, VarRaw("", retArrowType) :: Nil, RawTag.empty)) + ) + ) + ) + + val result = handler.sem(Map.empty, ast).andThen(_.finCtx(initCtx)) + result.isInvalid shouldBe true + + val error = result.toEither.left.get.head + error shouldBe a [HeaderError[Id]] + } +} diff --git a/utils/logging/src/main/scala/aqua/logging/LogLevels.scala b/utils/logging/src/main/scala/aqua/logging/LogLevels.scala index e80d4e427..9f045fa3b 100644 --- a/utils/logging/src/main/scala/aqua/logging/LogLevels.scala +++ b/utils/logging/src/main/scala/aqua/logging/LogLevels.scala @@ -1,9 +1,8 @@ package aqua.logging +import cats.data.Validated.{invalidNel, validNel} +import cats.data.{NonEmptyList, Validated, ValidatedNel} import scribe.Level -import cats.data.Validated.{invalid, invalidNec, invalidNel, valid, validNec, validNel} -import cats.data.{Validated, ValidatedNel} -import cats.data.NonEmptyList case class LogLevels( compiler: Level = Level.Error, From 3ff39722fbc704432cd7903f30328c2d2b07c6bd Mon Sep 17 00:00:00 2001 From: DieMyst Date: Wed, 26 Jul 2023 10:57:12 +0200 Subject: [PATCH 3/3] fix PR comments --- .../scala/aqua/compiler/CompilerAPI.scala | 12 ++++----- .../src/main/scala/aqua/lsp/LspContext.scala | 4 +-- .../aqua/semantics/header/HeaderHandler.scala | 15 ++++++----- .../aqua/semantics/header/HeaderSem.scala | 25 +++++++++---------- .../scala/aqua/semantics/header/Picker.scala | 10 ++++---- .../scala/aqua/semantics/HeaderSpec.scala | 16 ++++++------ 6 files changed, 39 insertions(+), 43 deletions(-) diff --git a/compiler/src/main/scala/aqua/compiler/CompilerAPI.scala b/compiler/src/main/scala/aqua/compiler/CompilerAPI.scala index 6b91fd389..979d25695 100644 --- a/compiler/src/main/scala/aqua/compiler/CompilerAPI.scala +++ b/compiler/src/main/scala/aqua/compiler/CompilerAPI.scala @@ -8,19 +8,19 @@ import aqua.parser.{Ast, ParserError} import aqua.raw.RawPart.Parts import aqua.raw.{RawContext, RawPart} import aqua.res.AquaRes -import aqua.semantics.{CompilerState, RawSemantics, Semantics} import aqua.semantics.header.{HeaderHandler, HeaderSem} +import aqua.semantics.{CompilerState, RawSemantics, Semantics} import cats.data.* -import cats.data.Validated.{invalid, validNec, Invalid, Valid} +import cats.data.Validated.{Invalid, Valid, invalid, validNec} import cats.parse.Parser0 import cats.syntax.applicative.* import cats.syntax.flatMap.* +import cats.syntax.foldable.* import cats.syntax.functor.* import cats.syntax.monoid.* -import cats.syntax.traverse.* import cats.syntax.semigroup.* -import cats.syntax.foldable.* -import cats.{~>, Comonad, Monad, Monoid, Order} +import cats.syntax.traverse.* +import cats.{Comonad, Monad, Monoid, Order, ~>} import scribe.Logging import scala.collection.MapView @@ -63,8 +63,6 @@ object CompilerAPI extends Logging { ) .rawContextMonoid - implicit val headerSemMonoid: Monoid[HeaderSem[S, RawContext]] = HeaderSem.headerSemMonoid[S] - val semantics = new RawSemantics[S]() new AquaCompiler[F, E, I, S, RawContext](new HeaderHandler[S, RawContext](), semantics) diff --git a/language-server/language-server-api/src/main/scala/aqua/lsp/LspContext.scala b/language-server/language-server-api/src/main/scala/aqua/lsp/LspContext.scala index 72b002729..ad0303ad7 100644 --- a/language-server/language-server-api/src/main/scala/aqua/lsp/LspContext.scala +++ b/language-server/language-server-api/src/main/scala/aqua/lsp/LspContext.scala @@ -57,7 +57,7 @@ object LspContext { override def blank: LspContext[S] = LspContext[S](Picker[RawContext].blank, Map.empty) override def exports(ctx: LspContext[S]): Option[Map[String, Option[String]]] = ops(ctx).exports - override def funcReturnAbilityOrArrow(name: String, ctx: LspContext[S]): Boolean = + override def funcReturnAbilityOrArrow(ctx: LspContext[S], name: String): Boolean = ops(ctx).funcReturnAbilityOrArrow(name) override def funcNames(ctx: LspContext[S]): List[String] = ops(ctx).funcNames @@ -126,7 +126,7 @@ object LspContext { override def pickDeclared( ctx: LspContext[S] - )(implicit semi: Semigroup[LspContext[S]]): LspContext[S] = + )(using Semigroup[LspContext[S]]): LspContext[S] = ctx.copy(raw = ops(ctx).pickDeclared) } } diff --git a/semantics/src/main/scala/aqua/semantics/header/HeaderHandler.scala b/semantics/src/main/scala/aqua/semantics/header/HeaderHandler.scala index c615b3a63..f58d367e2 100644 --- a/semantics/src/main/scala/aqua/semantics/header/HeaderHandler.scala +++ b/semantics/src/main/scala/aqua/semantics/header/HeaderHandler.scala @@ -3,18 +3,18 @@ package aqua.semantics.header import aqua.parser.Ast import aqua.parser.head.* import aqua.parser.lexer.{Ability, Token} -import aqua.raw.RawContext import aqua.semantics.header.Picker.* import aqua.semantics.{HeaderError, SemanticError} -import cats.data.Validated.{invalidNec, validNec, Invalid, Valid} import cats.data.* +import cats.data.Validated.{invalidNec, validNec} import cats.free.Cofree import cats.instances.list.* import cats.instances.option.* import cats.kernel.Semigroup import cats.syntax.foldable.* -import cats.syntax.monoid +import cats.syntax.functor.* import cats.syntax.semigroup.* +import cats.syntax.validated.* import cats.{Comonad, Eval, Monoid} class HeaderHandler[S[_]: Comonad, C](implicit @@ -115,15 +115,15 @@ class HeaderHandler[S[_]: Comonad, C](implicit ctx .pick(n, None, ctx.module.nonEmpty) // We just validate, nothing more - .map(_ => validNec(1)) + .as(validNec(1)) .getOrElse( error( t, - s"`${n}` is expected to be declared, but declaration is not found in the file" + s"`$n` is expected to be declared, but declaration is not found in the file" ) ) }.combineAll - .map(_ => + .as( // TODO: why module name and declares is lost? where is it lost? ctx.setModule(name.value, declares = shouldDeclare) ) @@ -183,8 +183,7 @@ class HeaderHandler[S[_]: Comonad, C](implicit else sumCtx .pick(name, rename, declared = false) - .map(_ => Map(name -> rename)) - .map(validNec) + .as(Map(name -> rename).validNec) .getOrElse( error( token, diff --git a/semantics/src/main/scala/aqua/semantics/header/HeaderSem.scala b/semantics/src/main/scala/aqua/semantics/header/HeaderSem.scala index 15e9887a4..1343b45a7 100644 --- a/semantics/src/main/scala/aqua/semantics/header/HeaderSem.scala +++ b/semantics/src/main/scala/aqua/semantics/header/HeaderSem.scala @@ -18,19 +18,18 @@ case class HeaderSem[S[_], C]( object HeaderSem { - implicit def headerSemMonoid[S[_]: Comonad](implicit + given [S[_]: Comonad](using rc: Monoid[RawContext] - ): Monoid[HeaderSem[S, RawContext]] = - new Monoid[HeaderSem[S, RawContext]] { - override def empty: HeaderSem[S, RawContext] = HeaderSem(rc.empty, (c, _) => validNec(c)) + ): Monoid[HeaderSem[S, RawContext]] with { + override def empty: HeaderSem[S, RawContext] = HeaderSem(rc.empty, (c, _) => validNec(c)) - override def combine( - a: HeaderSem[S, RawContext], - b: HeaderSem[S, RawContext] - ): HeaderSem[S, RawContext] = - HeaderSem( - a.initCtx |+| b.initCtx, - (c, i) => a.finInitCtx(c, i).andThen(b.finInitCtx(_, i)) - ) - } + override def combine( + a: HeaderSem[S, RawContext], + b: HeaderSem[S, RawContext] + ): HeaderSem[S, RawContext] = + HeaderSem( + a.initCtx |+| b.initCtx, + (c, i) => a.finInitCtx(c, i).andThen(b.finInitCtx(_, i)) + ) + } } diff --git a/semantics/src/main/scala/aqua/semantics/header/Picker.scala b/semantics/src/main/scala/aqua/semantics/header/Picker.scala index 7f9121bae..d7a8e557b 100644 --- a/semantics/src/main/scala/aqua/semantics/header/Picker.scala +++ b/semantics/src/main/scala/aqua/semantics/header/Picker.scala @@ -16,7 +16,7 @@ trait Picker[A] { def pickHeader(ctx: A): A def module(ctx: A): Option[String] def exports(ctx: A): Option[Map[String, Option[String]]] - def funcReturnAbilityOrArrow(name: String, ctx: A): Boolean + def funcReturnAbilityOrArrow(ctx: A, name: String): Boolean def declares(ctx: A): Set[String] def setAbility(ctx: A, name: String, ctxAb: A): A def setModule(ctx: A, name: Option[String], declares: Set[String]): A @@ -37,7 +37,7 @@ final class PickerOps[A: Picker](p: A) { def pickHeader: A = Picker[A].pickHeader(p) def module: Option[String] = Picker[A].module(p) def exports: Option[Map[String, Option[String]]] = Picker[A].exports(p) - def funcReturnAbilityOrArrow(name: String): Boolean = Picker[A].funcReturnAbilityOrArrow(name, p) + def funcReturnAbilityOrArrow(name: String): Boolean = Picker[A].funcReturnAbilityOrArrow(p, name) def declares: Set[String] = Picker[A].declares(p) def setAbility(name: String, ctx: A): A = Picker[A].setAbility(p, name, ctx) def setInit(ctx: Option[A]): A = Picker[A].setInit(p, ctx) @@ -55,7 +55,7 @@ final class PickerOps[A: Picker](p: A) { object Picker { - def typeContainsAbilityOrArrow(arrowType: ArrowType): Boolean = { + def returnsAbilityOrArrow(arrowType: ArrowType): Boolean = { arrowType.codomain.toList.exists { case _: AbilityType => true case _: ArrowType => true @@ -72,8 +72,8 @@ object Picker { override def blank: RawContext = RawContext.blank override def exports(ctx: RawContext): Option[Map[String, Option[String]]] = ctx.exports - override def funcReturnAbilityOrArrow(name: String, ctx: RawContext): Boolean = - ctx.funcs.get(name).map(_.arrow.`type`).exists(typeContainsAbilityOrArrow) + override def funcReturnAbilityOrArrow(ctx: RawContext, name: String): Boolean = + ctx.funcs.get(name).map(_.arrow.`type`).exists(returnsAbilityOrArrow) override def funcNames(ctx: RawContext): List[String] = ctx.funcs.keys.toList override def addPart(ctx: RawContext, part: (RawContext, RawPart)): RawContext = diff --git a/semantics/src/test/scala/aqua/semantics/HeaderSpec.scala b/semantics/src/test/scala/aqua/semantics/HeaderSpec.scala index 57a7557ad..6852c6cf5 100644 --- a/semantics/src/test/scala/aqua/semantics/HeaderSpec.scala +++ b/semantics/src/test/scala/aqua/semantics/HeaderSpec.scala @@ -8,19 +8,18 @@ import aqua.raw.ops.RawTag import aqua.raw.value.VarRaw import aqua.semantics.header.{HeaderHandler, HeaderSem} import aqua.types.{ArrowType, NilType, ProductType} -import cats.data.{Chain, NonEmptyList} +import cats.data.{Chain, NonEmptyList, Validated} import cats.free.Cofree import cats.{Eval, Id, Monoid} +import org.scalatest.Inside import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers -class HeaderSpec extends AnyFlatSpec with Matchers { +class HeaderSpec extends AnyFlatSpec with Matchers with Inside { "header handler" should "generate an error on exported function that returns arrow or ability" in { implicit val rc: Monoid[RawContext] = RawContext.implicits(RawContext.blank).rawContextMonoid - implicit val headerSemMonoid: Monoid[HeaderSem[Id, RawContext]] = HeaderSem.headerSemMonoid - val handler = new HeaderHandler[Id, RawContext]() val funcName = "funcName" @@ -42,9 +41,10 @@ class HeaderSpec extends AnyFlatSpec with Matchers { ) val result = handler.sem(Map.empty, ast).andThen(_.finCtx(initCtx)) - result.isInvalid shouldBe true - - val error = result.toEither.left.get.head - error shouldBe a [HeaderError[Id]] + + inside(result) { + case Validated.Invalid(errors) => + errors.head shouldBe a [HeaderError[Id]] + } } }