Skip to content

Commit

Permalink
- Fix cross-version conflict errors in the "docs" subproject.
Browse files Browse the repository at this point in the history
- Ensure the `docs/mdoc` sbt command runs successfully.
  • Loading branch information
iswoqqe committed Feb 4, 2025
1 parent dfb9377 commit e78c351
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
6 changes: 4 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ git.useGitDescribe := true

organization := "ch.epfl.lara"

scalaVersion := "3.5.2"
val inoxScalaVersion = "3.5.2"
scalaVersion := inoxScalaVersion

scalacOptions ++= Seq(
"-deprecation",
Expand Down Expand Up @@ -132,7 +133,8 @@ lazy val docs = project
mdocIn := file("src/main/doc"),
mdocOut := file("doc"),
mdocExtraArguments := Seq("--no-link-hygiene"),
scalaVersion := "3.0.2",
scalaVersion := inoxScalaVersion,
excludeDependencies := Seq("org.scala-lang.modules" % "scala-parser-combinators_2.13"),
)
.enablePlugins(MdocPlugin)

Expand Down
10 changes: 5 additions & 5 deletions doc/interpolations.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ It is also possible to embed types and expressions:
```scala
e"let x: $tpe = $expr in !x"
// res0: Expr = val x: Boolean = 1 + 1 == 2
// ¬x
// !x
```

<a name="syntax"></a>
Expand Down Expand Up @@ -192,19 +192,19 @@ e"lambda x. x * 0.5"

```scala
e"forall x: Int. x > 0"
// res16: Expr = x: Int. (x > 0)
// res16: Expr = forall((x: Int) => (x > 0))
e"∀x. x || true"
// res17: Expr = x: Boolean. (x || true)
// res17: Expr = forall((x: Boolean) => (x || true))
```

<a name="existential-quantifiers"></a>
### Existential Quantifier

```scala
e"exists x: BigInt. x < 0"
// res18: Expr = ¬∀x: BigInt. ¬(x < 0)
// res18: Expr = !forall((x: BigInt) => !(x < 0))
e"∃x, y. x + y == 0"
// res19: Expr = ¬∀x: BigInt, y: BigInt. (x + y ≠ 0)
// res19: Expr = !forall((x: BigInt, y: BigInt) => (x + y != 0))
```

<a name="choose"></a>
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.24")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.3")

addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")

Expand Down

0 comments on commit e78c351

Please sign in to comment.