---

yaml
---
r: 4532
b: refs/heads/master
c: 7d5092e
h: refs/heads/master
v: v3

Author: msullivan

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b084e4e366cacaf63036667dc4c378ce653324b
+refs/heads/master: 7d5092ee7b549edeb8a2fc6af4c81c8efa29b85c

trunk/src/comp/middle/typeck.rs

@@ -1226,14 +1226,14 @@ fn gather_locals(ccx: &@crate_ctxt, f: &ast::_fn, id: &ast::node_id,
     };
     let tcx = ccx.tcx;
 
-    let next_var_id = lambda(nvi: @mutable int) -> int {
+    let next_var_id = lambda() -> int {
         let rv = *nvi;
         *nvi += 1;
         ret rv;
     };
     let assign = lambda(nid: ast::node_id, ident: &ast::ident,
                         ty_opt: option::t[ty::t]) {
-        let var_id = next_var_id(nvi);
+        let var_id = next_var_id();
         locals.insert(nid, var_id);
         local_names.insert(nid, ident);
         alt ty_opt {
@@ -2027,7 +2027,7 @@ fn check_expr(fcx: &@fn_ctxt, expr: &@ast::expr) -> bool {
       ast::expr_alt(expr, arms) {
         bot = check_expr(fcx, expr);
         // Typecheck the patterns first, so that we get types for all the
-       // bindings.
+        // bindings.
 
         let pattern_ty = ty::expr_ty(tcx, expr);
         for arm: ast::arm  in arms {

trunk/src/comp/syntax/ast.rs

@@ -42,17 +42,13 @@ tag def {
     def_arg(def_id);
     def_local(def_id);
     def_variant(def_id, /* tag */def_id);
-
-
     /* variant */
     def_ty(def_id);
     def_ty_arg(uint, kind);
     def_binding(def_id);
     def_use(def_id);
     def_native_ty(def_id);
     def_native_fn(def_id);
-
-
     /* A "fake" def for upvars. This never appears in the def_map, but
      * freevars::def_lookup will return it for a def that is an upvar.
      * It contains the actual def. */
@@ -256,8 +252,6 @@ type stmt = spanned[stmt_];
 tag stmt_ {
     stmt_decl(@decl, node_id);
     stmt_expr(@expr, node_id);
-
-
     // These only exist in crate-level blocks.
     stmt_crate_directive(@crate_directive);
 }
@@ -314,7 +308,6 @@ tag expr_ {
     expr_alt(@expr, [arm]);
     expr_fn(_fn);
     expr_block(blk);
-
     /*
      * FIXME: many of these @exprs should be constrained with
      * is_lval once we have constrained types working.
@@ -335,15 +328,10 @@ tag expr_ {
     expr_put(option::t[@expr]);
     expr_be(@expr);
     expr_log(int, @expr);
-
-
     /* just an assert, no significance to typestate */
     expr_assert(@expr);
-
-
     /* preds that typestate is aware of */
     expr_check(check_mode, @expr);
-
     /* FIXME Would be nice if expr_check desugared
        to expr_if_check. */
     expr_if_check(@expr, blk, option::t[@expr]);
@@ -438,29 +426,20 @@ tag ty_ {
     ty_bot; /* return type of ! functions and type of
              ret/fail/break/cont. there is no syntax
              for this type. */
-
-
-
      /* bot represents the value of functions that don't return a value
         locally to their context. in contrast, things like log that do
         return, but don't return a meaningful value, have result type nil. */
-     ty_bool;
+    ty_bool;
     ty_int;
     ty_uint;
     ty_float;
     ty_machine(ty_mach);
     ty_char;
     ty_str;
     ty_istr; // interior string
-
-
-
     ty_box(mt);
     ty_vec(mt);
     ty_ivec(mt); // interior vector
-
-
-
     ty_ptr(mt);
     ty_task;
     ty_port(@ty);
@@ -523,21 +502,13 @@ type fn_decl =
 
 tag purity {
     pure_fn; // declared with "pred"
-
-
-
     impure_fn; // declared with "fn"
-
 }
 
 tag controlflow {
     noreturn; // functions with return type _|_ that always
               // raise an error or exit (i.e. never return to the caller)
-
-
-
     return; // everything else
-
 }
 
 type _fn = {decl: fn_decl, proto: proto, body: blk};