Skip to content

Commit ddeab06

Browse files
committed
Notation ;; should be right associative
1 parent 0b0c82b commit ddeab06

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

.circleci/config.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ version: 2.1
22

33
defaults: &defaults
44
environment:
5+
OPAMBESTEFFORT: true
6+
OPAMJOBS: 2
57
OPAMVERBOSE: 1
68
OPAMWITHTEST: true
79
OPAMYES: true
810
TERM: xterm
11+
resource_class: medium
912

1013
commands:
1114
startup:
@@ -44,17 +47,17 @@ commands:
4447
command: opam uninstall .
4548
- run:
4649
name: Build and test locally
47-
command: make
50+
command: make -j`nproc`
4851
- run:
4952
name: Cleanup local directory
5053
command: |
51-
make clean
54+
make -j`nproc` clean
5255
ls -AGR
5356
deploy:
5457
steps:
5558
- run:
5659
name: Build Documentation
57-
command: make html
60+
command: make -j`nproc` html
5861
- run:
5962
name: Configure Git
6063
command: |

scratch/notation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ Module | Notation | Definition | Level | Associativity
44
`FunctorNotation` | `f <$> x` | `fmap f x` | 52 | left
55
`ApplicativeNotation` | `f <*> x` | `ap f x` | 52 | left
66
`MonadPlusNotation` | `x <+> y` | `mplus x y` | 54 | left
7+
`MonadNotation` | `c >>= f` | `bind c f` | 58 | left
78
`MonadNotation` | `f =<< c` | `bind c f` | 61 | right
89
`MonadNotation` | `f >=> g` | `mcompose f g` | 61 | right
910
`MonadNotation` | `x <- c1 ;; c2` | `bind c1 (fun x => c2)` | 61 | right
1011
`MonadNotation` | `' pat <- c1 ;; c2` | `bind c1 (fun x => match x with pat => c2)` | 61 | right
11-
`MonadNotation` | `c >>= f` | `bind c f` | 62 | left
12-
`MonadNotation` | `e1 ;; e2` | `_ <- e1 ;; e2` | 62 | left
12+
`MonadNotation` | `e1 ;; e2` | `_ <- e1 ;; e2` | 61 | right
1313
`FunNotation` | `f $ x` | `f x` | 99 | right

theories/Structures/Monad.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ Module MonadNotation.
5353

5454
Delimit Scope monad_scope with monad.
5555

56-
Notation "c >>= f" := (@bind _ _ _ _ c f) (at level 62, left associativity) : monad_scope.
56+
Notation "c >>= f" := (@bind _ _ _ _ c f) (at level 58, left associativity) : monad_scope.
5757
Notation "f =<< c" := (@bind _ _ _ _ c f) (at level 61, right associativity) : monad_scope.
5858
Notation "f >=> g" := (@mcompose _ _ _ _ _ f g) (at level 61, right associativity) : monad_scope.
5959

6060
Notation "x <- c1 ;; c2" := (@bind _ _ _ _ c1 (fun x => c2))
6161
(at level 61, c1 at next level, right associativity) : monad_scope.
6262

6363
Notation "e1 ;; e2" := (_ <- e1%monad ;; e2%monad)%monad
64-
(at level 62, left associativity) : monad_scope.
64+
(at level 61, right associativity) : monad_scope.
6565

6666
Notation "' pat <- c1 ;; c2" :=
6767
(@bind _ _ _ _ c1 (fun x => match x with pat => c2 end))

0 commit comments

Comments
 (0)