From 54587bdccb7b6771cfc704a30fc0ef2c65824a15 Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Wed, 16 Mar 2011 14:58:02 -0700 Subject: Switch all vases of vec += elt to vec += vec. Prohibit former in rustboot. Tweak std lib vec fns in process. --- src/boot/me/type.ml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/boot') diff --git a/src/boot/me/type.ml b/src/boot/me/type.ml index 87e8e4c1..72bdd404 100644 --- a/src/boot/me/type.ml +++ b/src/boot/me/type.ml @@ -993,8 +993,7 @@ let check_block (cx:Semant.ctxt) : (fn_ctx -> Ast.block -> unit) = let src_ty = check_atom ~deref:true src in let dst_ty = check_lval dst in match fundamental_ty dst_ty, fundamental_ty src_ty with - Ast.TY_vec elt1, Ast.TY_vec elt2 - | Ast.TY_vec elt1, elt2 -> + Ast.TY_vec elt1, Ast.TY_vec elt2 -> if elt1 = elt2 then () else @@ -1002,7 +1001,6 @@ let check_block (cx:Semant.ctxt) : (fn_ctx -> Ast.block -> unit) = "mismatched types in vec-append: %s += %s" (pretty_ty_str dst_ty) (pretty_ty_str src_ty) - | Ast.TY_str, (Ast.TY_mach Common.TY_u8) | Ast.TY_str, Ast.TY_str -> () | _ -> infer_lval src_ty dst; -- cgit v1.2.3 From 949ba9ca460779ee75386b6dcec6b4f7d1774363 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Fri, 18 Mar 2011 12:05:04 -0700 Subject: rustboot: Parse, and ignore, "mutable?" --- src/boot/fe/pexp.ml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src/boot') 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 -- cgit v1.2.3