Commit 29d7141e authored by Vladislav Zavialov's avatar Vladislav Zavialov Committed by Andreas Klebinger

Whitespace forward compatibility follow-up

Required due to an amendment that disallows as-patterns with leading
whitespace:

  f x@ pat = rhs  -- now disallowed
parent 0bbfd768
......@@ -295,16 +295,16 @@ avBelowEQrep (Rep2 lf1 mf1 hfs1) (Rep2 lf2 mf2 hfs2)
--
(\/) :: Route -> Route -> Route
p@ Zero \/ q = q
p@ One \/ q = p
p@Zero \/ q = q
p@One \/ q = p
p@ Stop1 \/ q = q
p@Stop1 \/ q = q
p@(Up1 rs1) \/ Stop1 = p
p@(Up1 rs1) \/ Up1 rs2 = Up1 (myZipWith2 (\/) rs1 rs2)
p@ Stop2 \/ q = q
p@ Up2 \/ Stop2 = p
p@ Up2 \/ q = q
p@Stop2 \/ q = q
p@Up2 \/ Stop2 = p
p@Up2 \/ q = q
p@(UpUp2 rs1) \/ UpUp2 rs2 = UpUp2 (myZipWith2 (\/) rs1 rs2)
p@(UpUp2 rs1) \/ q = p
......@@ -361,16 +361,16 @@ avLUBmax0frontier f0a f0b
--
(/\) :: Route -> Route -> Route
p@ Zero /\ q = p
p@ One /\ q = q
p@Zero /\ q = p
p@One /\ q = q
p@ Stop1 /\ q = p
p@Stop1 /\ q = p
p@(Up1 rs1) /\ (Up1 rs2) = Up1 (myZipWith2 (/\) rs1 rs2)
p@(Up1 rs1) /\ q = q
p@ Stop2 /\ q = p
p@ Up2 /\ q@ Stop2 = q
p@ Up2 /\ q = p
p@Stop2 /\ q = p
p@Up2 /\ q@Stop2 = q
p@Up2 /\ q = p
p@(UpUp2 rs1) /\ q@(UpUp2 rs2) = UpUp2 (myZipWith2 (/\) rs1 rs2)
p@(UpUp2 rs1) /\ q = q
......
......@@ -23,10 +23,10 @@ infix 9 %%
bmNorm :: Domain -> Route -> Route
bmNorm Two r = r
bmNorm (Lift1 ds) r@ Stop1 = r
bmNorm (Lift1 ds) r@Stop1 = r
bmNorm (Lift1 ds) (Up1 rs) = Up1 (myZipWith2 bmNorm ds rs)
bmNorm (Lift2 ds) r@ Stop2 = r
bmNorm (Lift2 ds) r@ Up2 = r
bmNorm (Lift2 ds) r@Stop2 = r
bmNorm (Lift2 ds) r@Up2 = r
bmNorm (Lift2 ds) (UpUp2 rs) = UpUp2 (myZipWith2 bmNorm ds rs)
bmNorm d (Rep rep) = Rep (bmNorm_rep d rep)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment