Skip to content

Commit 5cfcf8c

Browse files
authored
Merge branch 'dev' into devcontainer
2 parents 012b134 + eb3b116 commit 5cfcf8c

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ jobs:
214214
shell: pwsh
215215

216216
- name: Create GitHub Release
217-
uses: softprops/action-gh-release@v1
217+
uses: softprops/action-gh-release@v2
218218
with:
219219
files: Website.zip
220220
body_path: ${{ github.workspace }}/release-notes-${{ steps.setup-bumpver.outputs.current-version }}.md

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.5.0
3+
rev: v4.6.0
44
hooks:
55
- id: check-added-large-files
66
- id: check-case-conflict

package-lock.json

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"browser-sync": "^3.0.2",
44
"html-validate": "^8.11.1",
55
"html-minifier": "^4.0.0",
6-
"sass": "^1.71.1"
6+
"sass": "^1.75.0"
77
}
88
}

src/plfa/part3/Compositional.lagda.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ We proceed by induction on the semantics.
257257
`v′ → v ⊑ v′ → v₁`.
258258

259259

260-
The forward direction is proved by cases on the premise `(ℰ L ● ℰ M) γ v`.
260+
The backward direction is proved by cases on the premise `(ℰ L ● ℰ M) γ v`.
261261
In case `v ⊑ ⊥`, we obtain `Γ ⊢ L · M ↓ ⊥` by rule `⊥-intro`.
262262
Otherwise, we conclude immediately by rule `↦-elim`.
263263

src/plfa/part3/Soundness.lagda.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ about `M` and can therefore use `⊥` for the value of `M`.
234234

235235
Previously we showed that renaming variables preserves meaning. Now
236236
we prove the opposite, that it reflects meaning. That is,
237-
if `δ ⊢ rename ρ M ↓ v`, then `γ ⊢ M ↓ v`, where `(δ ∘ ρ) `⊑ γ`.
237+
if `δ ⊢ rename ρ M ↓ v`, then `γ ⊢ M ↓ v`, where ``(δ ∘ ρ) `⊑ γ``.
238238

239239
First, we need a variant of a lemma given earlier.
240240
```agda
@@ -355,7 +355,7 @@ same-const-env : ∀{Γ} {x : Γ ∋ ★} {v} → (const-env x v) x ≡ v
355355
same-const-env {x = x} rewrite var≟-refl x = refl
356356
```
357357

358-
and `const-env x v` maps `y` to `⊥, so long as `x ≢ y`.
358+
and `const-env x v` maps `y` to ``, so long as `x ≢ y`.
359359

360360
```agda
361361
diff-const-env : ∀{Γ} {x y : Γ ∋ ★} {v}
@@ -378,7 +378,7 @@ Now to finish the two cases of the proof.
378378

379379
* In the case where `x ≡ y`, we need to show
380380
that `γ ⊢ σ y ↓ v`, but that's just our premise.
381-
* In the case where `x ≢ y,` we need to show
381+
* In the case where `x ≢ y`, we need to show
382382
that `γ ⊢ σ y ↓ ⊥`, which we do via rule `⊥-intro`.
383383

384384
Thus, we have completed the variable case of the proof that
@@ -500,7 +500,7 @@ subst-reflect (sub d lt) eq
500500
... | ⟨ δ , ⟨ subst-δ , m ⟩ ⟩ = ⟨ δ , ⟨ subst-δ , sub m lt ⟩ ⟩
501501
```
502502

503-
* Case `var`: We have subst `σ M ≡ y`, so `M` must also be a variable, say `x`.
503+
* Case `var`: We have `subst σ M ≡ y`, so `M` must also be a variable, say `x`.
504504
We apply the lemma `subst-reflect-var` to conclude.
505505

506506
* Case `↦-elim`: We have `subst σ M ≡ L₁ · L₂`. We proceed by cases on `M`.

0 commit comments

Comments
 (0)