Skip to content

Commit ce6f229

Browse files
committed
using the newest version of odin
1 parent 5215d25 commit ce6f229

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ libraryDependencies ++= Seq(
1010
"com.monovore" %% "decline-effect" % "2.2.0",
1111
"co.fs2" %% "fs2-core" % "3.2.7",
1212
"co.fs2" %% "fs2-io" % "3.2.7",
13-
"org.polystat.odin" %% "analysis" % "0.3.3",
13+
"org.polystat.odin" %% "analysis" % "0.4.0",
1414
"is.cir" %% "ciris" % "2.3.2",
1515
"lt.dvim.ciris-hocon" %% "ciris-hocon" % "1.0.1",
1616
"org.http4s" %% "http4s-ember-client" % "1.0.0-M32",

src/main/scala/org/polystat/Main.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ import org.polystat.odin.analysis.EOOdinAnalyzer
1515
import org.polystat.odin.analysis.EOOdinAnalyzer.OdinAnalysisResult
1616
import org.polystat.odin.parser.EoParser.sourceCodeEoParser
1717

18-
import EOOdinAnalyzer.{
19-
advancedMutualRecursionAnalyzer,
20-
unjustifiedAssumptionAnalyzer,
21-
}
2218
import PolystatConfig.*
2319
import IncludeExclude.*
2420
import InputUtils.*
@@ -33,8 +29,10 @@ object Main extends IOApp:
3329
val analyzers: List[(String, ASTAnalyzer[IO])] =
3430
// TODO: In Odin, change analyzer names to shorter ones.
3531
List(
36-
("mutualrec", advancedMutualRecursionAnalyzer),
37-
("unjustified", unjustifiedAssumptionAnalyzer),
32+
("mutualrec", EOOdinAnalyzer.advancedMutualRecursionAnalyzer),
33+
("unjustified", EOOdinAnalyzer.unjustifiedAssumptionAnalyzer),
34+
("liskov", EOOdinAnalyzer.liskovPrincipleViolationAnalyzer),
35+
("directAccess", EOOdinAnalyzer.directStateAccessAnalyzer),
3836
)
3937

4038
def filterAnalyzers(

src/main/scala/org/polystat/Sarif.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import io.circe.Encoder
66
import io.circe.Json
77
import io.circe.syntax.*
88
import org.polystat.odin.analysis.EOOdinAnalyzer.OdinAnalysisResult
9+
import cats.syntax.foldable.*
910

1011
import scala.CanEqual.derived
1112

@@ -44,7 +45,7 @@ final case class SarifOutput(errors: List[OdinAnalysisResult]):
4445
),
4546
executionSuccessful = false,
4647
)
47-
case DefectDetected(ruleId, _) =>
48+
case DefectsDetected(ruleId, _) =>
4849
SarifInvocation(
4950
toolExecutionNotifications = Seq(
5051
SarifNotification(
@@ -76,13 +77,13 @@ final case class SarifOutput(errors: List[OdinAnalysisResult]):
7677
private def sarifResult(error: OdinAnalysisResult): Option[SarifResult] =
7778
error match
7879
case AnalyzerFailure(_, _) => None
79-
case DefectDetected(ruleId, message) =>
80+
case DefectsDetected(ruleId, message) =>
8081
Some(
8182
SarifResult(
8283
ruleId = ruleId,
8384
level = SarifLevel.ERROR,
8485
kind = SarifKind.FAIL,
85-
message = SarifMessage(message),
86+
message = SarifMessage(message.mkString_("\n")),
8687
)
8788
)
8889
case Ok(ruleId) =>

0 commit comments

Comments
 (0)