---

yaml
---
r: 1278
b: refs/heads/master
c: 7672813
h: refs/heads/master
v: v3

Author: cixtor

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51542b279fcae0f740a76b631ce0fbcdf4c7cf5e
+refs/heads/master: 76728137089ddb174d18accd7024a6187148104d

trunk/src/Makefile

@@ -456,7 +456,6 @@ TEST_XFAILS_RUSTC := $(filter-out \
                         large-records.rs \
                         lazy-init.rs \
                         lazy-and-or.rs \
-                        linear-for-loop.rs \
                         multiline-comment.rs \
                         obj-drop.rs \
                         obj-recursion.rs \

trunk/src/boot/me/effect.ml

@@ -179,7 +179,8 @@ let effect_checking_visitor
               then Ast.EFF_pure
               else Stack.top auth_stack
             in
-              Stack.push e auth_stack;
+            let next = lower_effect_of e curr in
+              Stack.push next auth_stack;
               iflog cx
                 begin
                   fun _ ->
@@ -188,62 +189,40 @@ let effect_checking_visitor
                         "entering '%a', adjusting auth effect: '%a' -> '%a'"
                         Ast.sprintf_name name
                         Ast.sprintf_effect curr
-                        Ast.sprintf_effect e
+                        Ast.sprintf_effect next
                 end
     end;
-    let report_mismatch declared_effect calculated_effect =
-      let name = Hashtbl.find cx.ctxt_all_item_names i.id in
-        err (Some i.id)
-          "%a claims effect '%a' but calculated effect is '%a'%s"
-          Ast.sprintf_name name
-          Ast.sprintf_effect declared_effect
-          Ast.sprintf_effect calculated_effect
-          begin
-            if Stack.is_empty auth_stack
-            then ""
-            else
-              Printf.sprintf " (auth effects are '%s')"
-                (stk_fold
-                   auth_stack
-                   (fun e s ->
-                      if s = ""
-                      then
-                        Printf.sprintf "%a"
-                          Ast.sprintf_effect e
-                      else
-                        Printf.sprintf "%s, %a" s
-                          Ast.sprintf_effect e) "")
-          end
-    in
     begin
       match i.node.Ast.decl_item with
           Ast.MOD_ITEM_fn f
             when htab_search cx.ctxt_required_items i.id = None ->
-            let calculated_effect =
+            let e =
               match htab_search item_effect i.id with
                 None -> Ast.EFF_pure
               | Some e -> e
             in
-            let declared_effect = f.Ast.fn_aux.Ast.fn_effect in
-              if calculated_effect <> declared_effect
+            let fe = f.Ast.fn_aux.Ast.fn_effect in
+            let ae =
+              if Stack.is_empty auth_stack
+              then None
+              else Some (Stack.top auth_stack)
+            in
+              if e <> fe && (ae <> (Some e))
               then
-                (* Something's fishy in this case. If the calculated effect
-                 * is equal to one auth'ed by an enclosing scope -- not just
-                 * a lower one -- we accept this mismatch; otherwise we
-                 * complain.
-                 * 
-                 * FIXME: this choice of "what constitutes an error" in
-                 * auth/effect mismatches is subjective and could do
-                 * with some discussion.  *)
                 begin
-                  match
-                    stk_search auth_stack
-                      (fun e ->
-                         if e = calculated_effect then Some e else None)
-                  with
-                      Some _ -> ()
-                    | None ->
-                        report_mismatch declared_effect calculated_effect
+                  let name = Hashtbl.find cx.ctxt_all_item_names i.id in
+                    err (Some i.id)
+                      "%a claims effect '%a' but calculated effect is '%a'%s"
+                      Ast.sprintf_name name
+                      Ast.sprintf_effect fe
+                      Ast.sprintf_effect e
+                      begin
+                        match ae with
+                            Some ae when ae <> fe ->
+                              Printf.sprintf " (auth effect is '%a')"
+                                Ast.sprintf_effect ae
+                          | _ -> ""
+                      end
                 end
         | _ -> ()
     end;
@@ -260,16 +239,16 @@ let effect_checking_visitor
             then Ast.EFF_pure
             else Stack.top auth_stack
           in
-            iflog cx
-              begin
-                fun _ ->
-                  let name = Hashtbl.find cx.ctxt_all_item_names i.id in
-                    log cx
-                      "leaving '%a', restoring auth effect: '%a' -> '%a'"
-                      Ast.sprintf_name name
-                      Ast.sprintf_effect curr
-                      Ast.sprintf_effect next
-              end
+          iflog cx
+            begin
+              fun _ ->
+                let name = Hashtbl.find cx.ctxt_all_item_names i.id in
+                  log cx
+                    "leaving '%a', restoring auth effect: '%a' -> '%a'"
+                    Ast.sprintf_name name
+                    Ast.sprintf_effect curr
+                    Ast.sprintf_effect next
+            end
   in
     { inner with
         Walk.visit_mod_item_pre = visit_mod_item_pre;