---

yaml
---
r: 1307
b: refs/heads/master
c: 1086a2b
h: refs/heads/master
i:
  1305: f514ae0
  1303: 1d9d9f3
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2081deb2d16c58f2b367ad8a8d4a047d80f51a6
+refs/heads/master: 1086a2b7d1246770c2b0330a005e6ee828f22bd8

trunk/src/Makefile

@@ -428,6 +428,7 @@ TEST_XFAILS_RUSTC := $(filter-out \
                         arith-1.rs \
                         arith-2.rs \
                         autoderef-full-lval.rs \
+                        bind-exterior.rs \
                         bind-interior.rs \
                         bind-thunk.rs \
                         bind-trivial.rs \
@@ -444,6 +445,7 @@ TEST_XFAILS_RUSTC := $(filter-out \
                         deref.rs \
                         div-mod.rs \
                         drop-bind-thunk-args.rs \
+                        drop-on-empty-block-exit.rs \
                         drop-on-ret.rs \
                         fact.rs \
                         fn-lval.rs \
@@ -468,6 +470,7 @@ TEST_XFAILS_RUSTC := $(filter-out \
                         large-records.rs \
                         lazy-init.rs \
                         lazy-and-or.rs \
+                        leak-box-as-tydesc.rs \
                         linear-for-loop.rs \
                         multiline-comment.rs \
                         mutual-recursion-group.rs \

trunk/src/comp/middle/resolve.rs

@@ -35,7 +35,7 @@ tag def_wrap {
     def_wrap_import(@ast.view_item);
     def_wrap_mod(@ast.item);
     def_wrap_other(def);
-    def_wrap_expr_field(uint, def);
+    def_wrap_expr_field(uint);
     def_wrap_resolving;
 }
 
@@ -72,9 +72,6 @@ fn unwrap_def(def_wrap d) -> def {
         case (def_wrap_other(?d)) {
             ret d;
         }
-        case (def_wrap_expr_field(_, ?d)) {
-            ret d;
-        }
     }
 }
 
@@ -143,9 +140,9 @@ fn find_final_def(&env e, import_map index,
             case (def_wrap_use(?c)) {
                 e.sess.span_err(sp, "Crate access is not implemented");
             }
-            case (def_wrap_other(?d)) {
+            case (_) {
                 let uint l = _vec.len[ident](idents);
-                ret def_wrap_expr_field(l, d);
+                ret def_wrap_expr_field(l);
             }
         }
         fail;
@@ -422,13 +419,26 @@ fn fold_pat_tag(&env e, &span sp, ast.path p, vec[@ast.pat] args,
 fn fold_expr_path(&env e, &span sp, &ast.path p, &option.t[def] d,
                   ann a) -> @ast.expr {
     auto n_idents = _vec.len[ast.ident](p.node.idents);
+
     check (n_idents != 0u);
+    auto id0 = p.node.idents.(0);
+
+    auto d_ = lookup_name(e, id0);
+
+    alt (d_) {
+        case (some[def](_)) {
+            // log "resolved name " + n.node.ident;
+        }
+        case (none[def]) {
+            e.sess.span_err(sp, "unresolved name: " + id0);
+        }
+    }
 
     auto index = new_def_hash[def_wrap]();
     auto d = find_final_def(e, index, sp, p.node.idents, none[ast.def_id]);
     let uint path_len = 0u;
     alt (d) {
-        case (def_wrap_expr_field(?remaining, _)) {
+        case (def_wrap_expr_field(?remaining)) {
             path_len = n_idents - remaining + 1u;
         }
         case (def_wrap_other(_)) {
@@ -443,8 +453,7 @@ fn fold_expr_path(&env e, &span sp, &ast.path p, &option.t[def] d,
     }
     auto path_elems =
         _vec.slice[ident](p.node.idents, 0u, path_len);
-    auto p_ = rec(node=rec(idents = path_elems with p.node) with p);
-    auto d_ = some(unwrap_def(d));
+    auto p_ = rec(node=rec(idents = vec(id0) with p.node) with p);
     auto ex = @fold.respan[ast.expr_](sp, ast.expr_path(p_, d_, a));
     auto i = path_len;
     while (i < n_idents) {
@@ -464,7 +473,7 @@ fn fold_view_item_import(&env e, &span sp,
     auto last_id = is.(len - 1u);
     auto d = find_final_def(e, index, sp, is, some(id));
     alt (d) {
-        case (def_wrap_expr_field(?remain, _)) {
+        case (def_wrap_expr_field(?remain)) {
             auto ident = is.(len - remain);
             e.sess.span_err(sp, ident + " is not a module or crate");
         }