aboutsummaryrefslogtreecommitdiff
path: root/src/boot/fe
diff options
context:
space:
mode:
authorLindsey Kuper <[email protected]>2011-03-18 12:32:54 -0700
committerLindsey Kuper <[email protected]>2011-03-18 12:32:54 -0700
commit6dee1ac161a22a4bc1e49c5dac3c7bbba1ff97f0 (patch)
treef423d576e977e7a258f09e50e5a51702525782e2 /src/boot/fe
parentIgnore emacs autosave files. (diff)
parentrustc: Add a span_unimpl() for debugging (diff)
downloadrust-6dee1ac161a22a4bc1e49c5dac3c7bbba1ff97f0.tar.xz
rust-6dee1ac161a22a4bc1e49c5dac3c7bbba1ff97f0.zip
Merge branch 'master' of git://github.com/graydon/rust
Diffstat (limited to 'src/boot/fe')
-rw-r--r--src/boot/fe/pexp.ml16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/boot/fe/pexp.ml b/src/boot/fe/pexp.ml
index a5f3759a..c4dcfe1d 100644
--- a/src/boot/fe/pexp.ml
+++ b/src/boot/fe/pexp.ml
@@ -159,7 +159,14 @@ and parse_effect (ps:pstate) : Ast.effect =
and parse_mutability (ps:pstate) : Ast.mutability =
match peek ps with
- MUTABLE -> bump ps; Ast.MUT_mutable
+ MUTABLE ->
+ begin
+ (* HACK: ignore "mutable?" *)
+ bump ps;
+ match peek ps with
+ QUES -> bump ps; Ast.MUT_immutable
+ | _ -> Ast.MUT_mutable
+ end
| _ -> Ast.MUT_immutable
and parse_ty_fn
@@ -310,7 +317,12 @@ and parse_atomic_ty (ps:pstate) : Ast.ty =
| MUTABLE ->
bump ps;
- Ast.TY_mutable (parse_ty ps)
+ begin
+ (* HACK: ignore "mutable?" *)
+ match peek ps with
+ QUES -> bump ps; parse_ty ps
+ | _ -> Ast.TY_mutable (parse_ty ps)
+ end
| LPAREN ->
begin