---

yaml
---
r: 32540
b: refs/heads/dist-snap
c: 98bd4a9
h: refs/heads/master
v: v3

Author: 0c0w3

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: dc11e87b84cce79c68b9782cb7bd66decbf2b001
+refs/heads/dist-snap: 98bd4a992c8997126ea4a2d4c6c1960a80a06c09
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/compiletest/runtest.rs

@@ -289,9 +289,9 @@ fn check_expected_errors(expected_errors: ~[errors::expected_error],
             was_expected = true;
         }
 
-        if !was_expected && (str::contains(line, ~"error") ||
-                             str::contains(line, ~"warning")) {
-            fatal_procres(fmt!("unexpected error pattern '%s'!", line),
+        if !was_expected && is_compiler_error_or_warning(line) {
+            fatal_procres(fmt!("unexpected compiler error or warning: '%s'",
+                               line),
                           procres);
         }
     }
@@ -305,6 +305,81 @@ fn check_expected_errors(expected_errors: ~[errors::expected_error],
     }
 }
 
+fn is_compiler_error_or_warning(line: ~str) -> bool {
+    let mut i = 0u;
+    return
+        scan_until_char(line, ':', &mut i) &&
+        scan_char(line, ':', &mut i) &&
+        scan_integer(line, &mut i) &&
+        scan_char(line, ':', &mut i) &&
+        scan_integer(line, &mut i) &&
+        scan_char(line, ':', &mut i) &&
+        scan_char(line, ' ', &mut i) &&
+        scan_integer(line, &mut i) &&
+        scan_char(line, ':', &mut i) &&
+        scan_integer(line, &mut i) &&
+        scan_char(line, ' ', &mut i) &&
+        (scan_string(line, ~"error", &mut i) ||
+         scan_string(line, ~"warning", &mut i));
+}
+
+fn scan_until_char(haystack: ~str, needle: char, idx: &mut uint) -> bool {
+    if *idx >= haystack.len() {
+        return false;
+    }
+    let opt = str::find_char_from(haystack, needle, *idx);
+    if opt.is_none() {
+        return false;
+    }
+    *idx = opt.get();
+    return true;
+}
+
+fn scan_char(haystack: ~str, needle: char, idx: &mut uint) -> bool {
+    if *idx >= haystack.len() {
+        return false;
+    }
+    let {ch, next} = str::char_range_at(haystack, *idx);
+    if ch != needle {
+        return false;
+    }
+    *idx = next;
+    return true;
+}
+
+fn scan_integer(haystack: ~str, idx: &mut uint) -> bool {
+    let mut i = *idx;
+    while i < haystack.len() {
+        let {ch, next} = str::char_range_at(haystack, i);
+        if ch < '0' || '9' < ch {
+            break;
+        }
+        i = next;
+    }
+    if i == *idx {
+        return false;
+    }
+    *idx = i;
+    return true;
+}
+
+fn scan_string(haystack: ~str, needle: ~str, idx: &mut uint) -> bool {
+    let mut haystack_i = *idx;
+    let mut needle_i = 0u;
+    while needle_i < needle.len() {
+        if haystack_i >= haystack.len() {
+            return false;
+        }
+        let {ch, next} = str::char_range_at(haystack, haystack_i);
+        haystack_i = next;
+        if !scan_char(needle, ch, &mut needle_i) {
+            return false;
+        }
+    }
+    *idx = haystack_i;
+    return true;
+}
+
 type procargs = {prog: ~str, args: ~[~str]};
 
 type procres = {status: int, stdout: ~str, stderr: ~str, cmdline: ~str};

branches/dist-snap/src/test/compile-fail/issue-1476.rs

@@ -0,0 +1,3 @@
+fn main() {
+    log(error, x); //~ ERROR unresolved name: x
+}