Merge branch 'master' of git://github.com/graydon/rust

Conflicts:
	src/boot/fe/ast.ml

2 files changed, 29 insertions, 26 deletions

diff --git a/src/boot/fe/item.ml b/src/boot/fe/item.ml
index 69fe5fc2..82ec2faf 100644
--- a/src/boot/fe/item.ml
+++ b/src/boot/fe/item.ml
@@ -253,7 +253,10 @@ and parse_stmts (ps:pstate) : Ast.stmt array =
                             let lv = name_to_lval apos bpos name in
                               Ast.PAT_tag (lv, paren_comma_list parse_pat ps)
 
-                      | LIT_INT _ | LIT_CHAR _ | LIT_BOOL _ ->
+                      | LIT_INT _
+                      | LIT_UINT _
+                      | LIT_CHAR _
+                      | LIT_BOOL _ ->
                           Ast.PAT_lit (Pexp.parse_lit ps)
 
                       | UNDERSCORE -> bump ps; Ast.PAT_wild
diff --git a/src/boot/fe/pexp.ml b/src/boot/fe/pexp.ml
index fb2d91a0..3e17e0e4 100644
--- a/src/boot/fe/pexp.ml
+++ b/src/boot/fe/pexp.ml
@@ -817,11 +817,33 @@ and parse_or_pexp (ps:pstate) : pexp =
     step lhs
 
 
+and parse_as_pexp (ps:pstate) : pexp =
+  let apos = lexpos ps in
+  let pexp = ctxt "as pexp" parse_or_pexp ps in
+  let rec step accum =
+    match peek ps with
+        AS ->
+          bump ps;
+          let tapos = lexpos ps in
+          let t = parse_ty ps in
+          let bpos = lexpos ps in
+          let t = span ps tapos bpos t in
+          let node =
+            span ps apos bpos
+              (PEXP_unop ((Ast.UNOP_cast t), accum))
+          in
+            step node
+
+      | _ -> accum
+  in
+    step pexp
+
+
 and parse_relational_pexp (ps:pstate) : pexp =
   let name = "relational pexp" in
   let apos = lexpos ps in
-  let lhs = ctxt (name ^ " lhs") parse_or_pexp ps in
-  let build = binop_build ps name apos parse_or_pexp in
+  let lhs = ctxt (name ^ " lhs") parse_as_pexp ps in
+  let build = binop_build ps name apos parse_as_pexp in
   let rec step accum =
     match peek ps with
         LT -> build accum step Ast.BINOP_lt
@@ -883,30 +905,8 @@ and parse_oror_pexp (ps:pstate) : pexp =
     step lhs
 
 
-and parse_as_pexp (ps:pstate) : pexp =
-  let apos = lexpos ps in
-  let pexp = ctxt "as pexp" parse_oror_pexp ps in
-  let rec step accum =
-    match peek ps with
-        AS ->
-          bump ps;
-          let tapos = lexpos ps in
-          let t = parse_ty ps in
-          let bpos = lexpos ps in
-          let t = span ps tapos bpos t in
-          let node =
-            span ps apos bpos
-              (PEXP_unop ((Ast.UNOP_cast t), accum))
-          in
-            step node
-
-      | _ -> accum
-  in
-    step pexp
-
-
 and parse_pexp (ps:pstate) : pexp =
-  parse_as_pexp ps
+  parse_oror_pexp ps
 
 and parse_mutable_and_pexp (ps:pstate) : (Ast.mutability * pexp) =
   let mutability = parse_mutability ps in