Skip to content

Commit 485e8b0

Browse files
committed
[ fix ] Make ALS compatible with Agda-2.7.0
1 parent 26def0e commit 485e8b0

File tree

4 files changed

+17
-4
lines changed

4 files changed

+17
-4
lines changed

src/Render/Common.hs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import Agda.Utils.Functor ((<&>))
2828

2929
import Render.Class
3030
import Render.RichText
31+
import qualified Agda.Utils.List1 as List1
3132

3233
--------------------------------------------------------------------------------
3334

@@ -131,6 +132,9 @@ instance (Render p, Render e) => Render (RewriteEqn' qn nm p e) where
131132
render = \case
132133
Rewrite es -> prefixedThings (text "rewrite") (render . snd <$> toList es)
133134
Invert _ pes -> prefixedThings (text "invert") (toList pes <&> (\ (p, e) -> render p <+> "<-" <+> render e) . namedThing)
135+
#if MIN_VERSION_Agda(2,7,0)
136+
LeftLet pes -> prefixedThings (text "using") [render p <+> "<-" <+> render e | (p, e) <- List1.toList pes]
137+
#endif
134138

135139
prefixedThings :: Inlines -> [Inlines] -> Inlines
136140
prefixedThings kw = \case

src/Render/Interaction.hs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ instance (Render a, Render b) => Render (OutputConstraint a b) where
9898
, "Candidate:"
9999
, vcat exprs'
100100
]
101+
#if MIN_VERSION_Agda(2,7,0)
102+
render (ResolveInstanceOF q) = "Resolve output type of instance" <?> render q
103+
#endif
101104
render (PTSInstance name1 name2) =
102105
"PTS instance for (" <> render name1 <> ", " <> render name2 <> ")"
103106
render (PostponedCheckFunDef name expr _err) =

src/Render/RichText.hs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ module Render.RichText
1616
icon,
1717
-- combinators
1818
(<+>),
19+
(<?>),
1920
punctuate,
2021
braces,
2122
braces',
@@ -132,6 +133,11 @@ x <+> y
132133
| null y = x
133134
| otherwise = x <> " " <> y
134135

136+
infixl 6 <?>
137+
-- | A synonym for '<+>' at the moment
138+
(<?>) :: Inlines -> Inlines -> Inlines
139+
(<?>) = (<+>)
140+
135141
-- | Whitespace
136142
space :: Inlines
137143
space = " "

stack.yaml.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
packages:
77
- completed:
8-
hackage: Agda-2.6.4.3@sha256:a8066d4b15827534d118846e98fd47bb9aadeb75e3d3b1f2c3bda8f5885c3f7c,29246
8+
hackage: Agda-2.7.0.1@sha256:37d363f323c1229f9ae16b4e0b2120d713b793a012847158fe6df736ec7736ec,30433
99
pantry-tree:
10-
sha256: 8ec7c974decac30ceb45e9d728cf8b70b6da671dd80fe362e7e1fd4f0fcae77d
11-
size: 42904
10+
sha256: c0324b33036f03017fd8b57188137d0ede9b8fbacc76876c67dd9b8b607873c7
11+
size: 43358
1212
original:
13-
hackage: Agda-2.6.4.3
13+
hackage: Agda-2.7.0.1
1414
- completed:
1515
hackage: lsp-2.7.0.0@sha256:2a64b40a69fd9638056ca552d5660203019473061cff1d09dccc0c94e40a275c,3834
1616
pantry-tree:

0 commit comments

Comments
 (0)