Skip to content
Browse files

Fix typing of "WHILE_LWT" + error in 4.00 branch

  • Loading branch information...
1 parent 24d28a2 commit 66b058475d5b59daa61a6ee8ba05f7520092215e @def-lkb def-lkb committed
Showing with 11 additions and 5 deletions.
  1. +1 −1 src/ocaml_400.git
  2. +4 −1 src/ocaml_400/chunk_parser.mly
  3. +1 −1 src/ocaml_400/typing/typecore.ml
  4. +1 −1 src/ocaml_401.git
  5. +4 −1 src/ocaml_401/chunk_parser.mly
2 src/ocaml_400.git
@@ -1 +1 @@
-Subproject commit b83cccd63dd2ac4d22b2260b6147716f447b19aa
+Subproject commit aefa7d146a8cb09c171ddbedcc7da07175dda5d4
View
5 src/ocaml_400/chunk_parser.mly
@@ -1189,7 +1189,10 @@ expr:
| WHILE seq_expr DO seq_expr DONE
{ mkexp $startpos $endpos (Pexp_while($2, $4)) }
| WHILE_LWT seq_expr DO seq_expr DONE
- { mkexp $startpos $endpos (Pexp_while(Fake.(app Lwt.un_lwt $2), Fake.(app Lwt.unit_lwt $4))) }
+ { let expr =
+ mkexp $startpos $endpos (Pexp_while($2, Fake.(app Lwt.un_lwt $4)))
+ in
+ Fake.(app Lwt.to_lwt expr) }
| FOR val_ident EQUAL seq_expr direction_flag seq_expr DO seq_expr DONE
{ mkexp $startpos $endpos (Pexp_for(mkrhs $startpos($2) $endpos($2) $2, $4, $6, $5, $8)) }
| FOR_LWT val_ident EQUAL seq_expr direction_flag seq_expr DO seq_expr DONE
View
2 src/ocaml_400/typing/typecore.ml
@@ -2571,7 +2571,7 @@ and type_application env funct sargs =
| _ -> true
in
if ty_fun.level >= t1.level && not_identity funct.exp_desc
- && not (Merlin_types.erroneous_expr_check funct.exp_type) then
+ && not (Merlin_types.erroneous_expr_check funct) then
Location.prerr_warning sarg1.pexp_loc Warnings.Unused_argument;
unify env ty_fun (newty (Tarrow(l1,t1,t2,Clink(ref Cunknown))));
(t1, t2)
2 src/ocaml_401.git
@@ -1 +1 @@
-Subproject commit 3401ffed66c323751dc2a8489f26c609bcdae8bb
+Subproject commit 0bbbb14b62fcff1f09605a84c72ffa522c3d05df
View
5 src/ocaml_401/chunk_parser.mly
@@ -1196,7 +1196,10 @@ expr:
| WHILE seq_expr DO seq_expr DONE
{ mkexp $startpos $endpos (Pexp_while($2, $4)) }
| WHILE_LWT seq_expr DO seq_expr DONE
- { mkexp $startpos $endpos (Pexp_while(Fake.(app Lwt.un_lwt $2), Fake.(app Lwt.unit_lwt $4))) }
+ { let expr =
+ mkexp $startpos $endpos (Pexp_while($2, Fake.(app Lwt.un_lwt $4)))
+ in
+ Fake.(app Lwt.to_lwt expr) }
| FOR val_ident EQUAL seq_expr direction_flag seq_expr DO seq_expr DONE
{ mkexp $startpos $endpos (Pexp_for(mkrhs $startpos($2) $endpos($2) $2, $4, $6, $5, $8)) }
| FOR_LWT val_ident EQUAL seq_expr direction_flag seq_expr DO seq_expr DONE

0 comments on commit 66b0584

Please sign in to comment.
Something went wrong with that request. Please try again.