fluencelabs/aqua
1
0
Fork 0
mirror of https://github.com/fluencelabs/aqua.git synced 2024-12-04 14:40:17 +00:00
Code Issues Projects Releases Wiki Activity

add scalafmt, use only one nil

Browse Source
This commit is contained in:
DieMyst 2023-10-30 17:50:57 +07:00
parent bd0ca60fdc
commit 6da87e3478
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.scalafmt.conf
View File

@ -62,9 +62,9 @@ runner {
} }
} }
rewrite { rewrite.rules = [Imports]
rules = [ rewrite.imports.sort = ascii
SortImports rewrite.imports.groups = [
] ["aqua\\..*"]
} ]
#runner.dialect = scala3 #runner.dialect = scala3

1
model/raw/src/main/scala/aqua/raw/value/ValueRaw.scala
View File

@ -34,7 +34,6 @@ object ValueRaw {
val ParticleTimestamp: LiteralRaw = LiteralRaw("%timestamp%", ScalarType.u64) val ParticleTimestamp: LiteralRaw = LiteralRaw("%timestamp%", ScalarType.u64)
val Nil: LiteralRaw = LiteralRaw("[]", StreamType(BottomType)) val Nil: LiteralRaw = LiteralRaw("[]", StreamType(BottomType))
val VarNil: VarRaw = VarRaw("nil", StreamType(BottomType))
/** /**
* Type of error value * Type of error value

3
semantics/src/main/scala/aqua/semantics/rules/ValuesAlgebra.scala
View File

@ -78,6 +78,9 @@ class ValuesAlgebra[S[_], Alg[_]: Monad](using
case l @ LiteralToken(_, t) => case l @ LiteralToken(_, t) =>
LiteralRaw(l.value, t).some.pure[Alg] LiteralRaw(l.value, t).some.pure[Alg]
case VarToken(name) if name.value == ValueRaw.Nil.value =>
ValueRaw.Nil.some.pure[Alg]
case VarToken(name) => case VarToken(name) =>
N.read(name, mustBeDefined = false).flatMap { N.read(name, mustBeDefined = false).flatMap {
case Some(t) => case Some(t) =>

2
semantics/src/main/scala/aqua/semantics/rules/names/NamesInterpreter.scala
View File

@ -134,7 +134,7 @@ class NamesInterpreter[S[_], X](using
override def assign(name: Name[S], value: ValueRaw): SX[Boolean] = override def assign(name: Name[S], value: ValueRaw): SX[Boolean] =
value match { value match {
case ValueRaw.Nil | ValueRaw.VarNil => case ValueRaw.Nil =>
report report
.error( .error(
name, name,

2
semantics/src/test/scala/aqua/semantics/AssignmentSemSpec.scala
View File

@ -15,7 +15,7 @@ import org.scalatest.matchers.should.Matchers
class AssignmentSemSpec extends AnyFlatSpec with Matchers with Inside { class AssignmentSemSpec extends AnyFlatSpec with Matchers with Inside {
import Utils.{*, given} import Utils.{given, *}
val program: Prog[State[CompilerState[cats.Id], *], Raw] = { val program: Prog[State[CompilerState[cats.Id], *], Raw] = {
val expr = ClosureExpr(Name[Id]("closure"), None) val expr = ClosureExpr(Name[Id]("closure"), None)