---

yaml
---
r: 14315
b: refs/heads/try
c: 16e5760
h: refs/heads/master
i:
  14313: cd19dd8
  14311: c17fdd4
v: v3

Author: marijnh

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 9ff5ba085de572f8efaf501b88eb831d8ee40d47
+refs/heads/try: 16e576056440fcf77d43f69f1186c3359e08b291
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/comp/middle/alias.rs

@@ -112,7 +112,7 @@ fn visit_expr(cx: @ctx, ex: @ast::expr, sc: scope, v: vt<scope>) {
       }
       ast::expr_alt(input, arms, _) { check_alt(*cx, input, arms, sc, v); }
       ast::expr_for(decl, seq, blk) {
-        v.visit_expr(seq, sc, v);
+        visit_expr(cx, seq, sc, v);
         check_loop(*cx, sc) {|| check_for(*cx, decl, seq, blk, sc, v); }
       }
       ast::expr_path(pt) {
@@ -125,11 +125,13 @@ fn visit_expr(cx: @ctx, ex: @ast::expr, sc: scope, v: vt<scope>) {
         handled = false;
       }
       ast::expr_move(dest, src) {
-        check_assign(cx, dest, src, sc, v);
+        visit_expr(cx, src, sc, v);
+        check_lval(cx, dest, sc, v);
         check_lval(cx, src, sc, v);
       }
       ast::expr_assign(dest, src) | ast::expr_assign_op(_, dest, src) {
-        check_assign(cx, dest, src, sc, v);
+        visit_expr(cx, src, sc, v);
+        check_lval(cx, dest, sc, v);
       }
       ast::expr_if(c, then, els) { check_if(c, then, els, sc, v); }
       ast::expr_while(_, _) | ast::expr_do_while(_, _) {
@@ -153,6 +155,8 @@ fn visit_block(cx: @ctx, b: ast::blk, sc: scope, v: vt<scope>) {
                   some(init) {
                     if init.op == ast::init_move {
                         check_lval(cx, init.expr, sc, v);
+                    } else {
+                        visit_expr(cx, init.expr, sc, v);
                     }
                   }
                   none { }
@@ -354,7 +358,7 @@ fn check_alt(cx: ctx, input: @ast::expr, arms: [ast::arm], sc: scope,
         }
         *sc.invalid = orig_invalid;
         visit::visit_arm(a, {bs: new_bs with sc}, v);
-        all_invalid = append_invalid(all_invalid, *sc.invalid, orig_invalid);
+        all_invalid = join_invalid(all_invalid, *sc.invalid);
     }
     *sc.invalid = all_invalid;
 }
@@ -423,12 +427,6 @@ fn check_lval(cx: @ctx, dest: @ast::expr, sc: scope, v: vt<scope>) {
     }
 }
 
-fn check_assign(cx: @ctx, dest: @ast::expr, src: @ast::expr, sc: scope,
-                v: vt<scope>) {
-    visit_expr(cx, src, sc, v);
-    check_lval(cx, dest, sc, v);
-}
-
 fn check_if(c: @ast::expr, then: ast::blk, els: option<@ast::expr>,
             sc: scope, v: vt<scope>) {
     v.visit_expr(c, sc, v);
@@ -437,7 +435,7 @@ fn check_if(c: @ast::expr, then: ast::blk, els: option<@ast::expr>,
     let then_invalid = *sc.invalid;
     *sc.invalid = orig_invalid;
     visit::visit_expr_opt(els, sc, v);
-    *sc.invalid = append_invalid(*sc.invalid, then_invalid, orig_invalid);
+    *sc.invalid = join_invalid(*sc.invalid, then_invalid);
 }
 
 fn check_loop(cx: ctx, sc: scope, checker: fn()) {
@@ -672,24 +670,14 @@ fn find_invalid(id: node_id, lst: list<@invalid>)
     ret none;
 }
 
-fn append_invalid(dest: list<@invalid>, src: list<@invalid>,
-                  stop: list<@invalid>) -> list<@invalid> {
-    let cur = src, dest = dest;
-    while cur != stop {
-        alt cur {
-          list::cons(head, tail) {
-            if is_none(find_invalid(head.node_id, dest)) {
-                dest = list::cons(head, @dest);
-            }
-            cur = *tail;
-          }
-          list::nil {
-              fail "append_invalid: stop doesn't appear to be \
-                 a postfix of src";
-          }
-        }
+fn join_invalid(a: list<@invalid>, b: list<@invalid>) -> list<@invalid> {
+    let result = a;
+    list::iter(b) {|elt|
+        let found = false;
+        list::iter(a) {|e| if e == elt { found = true; } }
+        if !found { result = list::cons(elt, @result); }
     }
-    ret dest;
+    result
 }
 
 fn filter_invalid(src: list<@invalid>, bs: [binding]) -> list<@invalid> {

branches/try/src/comp/middle/resolve.rs

@@ -1378,13 +1378,13 @@ fn lookup_glob_in_mod(e: env, info: @indexed_mod, sp: span, id: ident,
     // absence takes the place of todo()
     if !info.glob_imported_names.contains_key(id) {
         info.glob_imported_names.insert(id, glob_resolving(sp));
-        let val = lookup_in_globs(e, info.glob_imports, sp, id,
-                                  // kludge
-                                  (if wanted_ns == ns_val(ns_a_enum)
-                                  { ns_val(ns_a_enum) }
-                                  else { ns_val(ns_any_value) }), dr);
-        let typ = lookup_in_globs(e, info.glob_imports, sp, id, ns_type, dr);
-        let md = lookup_in_globs(e, info.glob_imports, sp, id, ns_module, dr);
+        // kludge
+        let val_ns = if wanted_ns == ns_val(ns_a_enum) { ns_val(ns_a_enum) }
+                     else { ns_val(ns_any_value) };
+        let globs = info.glob_imports;
+        let val = lookup_in_globs(e, globs, sp, id, val_ns, dr);
+        let typ = lookup_in_globs(e, globs, sp, id, ns_type, dr);
+        let md = lookup_in_globs(e, globs, sp, id, ns_module, dr);
         info.glob_imported_names.insert(id, glob_resolved(val, typ, md));
     }
     alt info.glob_imported_names.get(id) {

branches/try/src/test/compile-fail/cross-crate-glob-collision.rs

@@ -1,4 +1,4 @@
-// error-pattern:'member' is glob-imported from multiple different modules
+// error-pattern: is glob-imported from multiple different modules
 // issue #482
 
 use std;