summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adam@chlipala.net>2013-12-29 10:29:26 -0500
committerGravatar Adam Chlipala <adam@chlipala.net>2013-12-29 10:29:26 -0500
commit872836350ebef9a155c1cc09d31ffda8851af26a (patch)
tree3fe4c45a9da0f4ab637f13791bebd1afd681a1e9
parent81836c04056a82db22e6068869cd90f50f540dc3 (diff)
Avoid some spurious error messages about link/form incompatibility; change the text of that error message to include RPC handlers
-rw-r--r--src/tag.sml10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tag.sml b/src/tag.sml
index 865e7f53..6fef50d1 100644
--- a/src/tag.sml
+++ b/src/tag.sml
@@ -41,9 +41,9 @@ structure SM = BinaryMapFn(struct
fun kind (k, s) = (k, s)
fun con (c, s) = (c, s)
-fun both (loc, f) = (ErrorMsg.errorAt loc ("Function " ^ f ^ " needed for both a link and a form");
+fun both (loc, f) = (ErrorMsg.errorAt loc ("Function " ^ f ^ " needed for multiple modes (link, form, RPC handler).");
TextIO.output (TextIO.stdErr,
- "Make sure that the signature of the containing module hides any form handlers.\n"))
+ "Make sure that the signature of the containing module hides any form/RPC handlers.\n"))
fun exp env (e, s) =
let
@@ -145,7 +145,7 @@ fun exp env (e, s) =
end
in
case x of
- (CName "Link", _) => tagIt' (Link ReadWrite, "Link")
+ (CName "Link", _) => tagIt' (Link ReadCookieWrite, "Link")
| (CName "Action", _) => tagIt' (Action ReadWrite, "Action")
| _ => ((x, e, t), s)
end)
@@ -180,7 +180,7 @@ fun exp env (e, s) =
| EFfiApp ("Basis", "url", [(e, t)]) =>
let
- val (e, s) = tagIt (e, Link ReadWrite, "Url", s)
+ val (e, s) = tagIt (e, Link ReadCookieWrite, "Url", s)
in
(EFfiApp ("Basis", "url", [(e, t)]), s)
end
@@ -201,7 +201,7 @@ fun exp env (e, s) =
case eo of
SOME (EAbs (_, _, _, (EFfiApp ("Basis", "url", [((ERel 0, _), t)]), _)), _) =>
let
- val (e, s) = tagIt (e', Link ReadWrite, "Url", s)
+ val (e, s) = tagIt (e', Link ReadCookieWrite, "Url", s)
in
(EFfiApp ("Basis", "url", [(e, t)]), s)
end