569467eb0d
Conflicts: src/compiletest/errors.rs src/libsyntax/parse/attr.rs src/libsyntax/parse/comments.rs src/test/compile-fail/ambig_impl_unify.rs src/test/compile-fail/assign-super.rs src/test/compile-fail/bad-for-loop.rs src/test/compile-fail/bad-var-env-capture-in-block-arg.rs src/test/compile-fail/block-arg-as-stmt-with-value.rs src/test/compile-fail/borrowck-assign-comp-idx.rs src/test/compile-fail/borrowck-lend-flow.rs src/test/compile-fail/borrowck-loan-blocks-move-cc.rs src/test/compile-fail/borrowck-loan-blocks-mut-uniq.rs src/test/compile-fail/borrowck-loan-rcvr.rs src/test/compile-fail/borrowck-loan-vec-content.rs src/test/compile-fail/borrowck-mut-vec-as-imm-slice-bad.rs src/test/compile-fail/cap-clause-with-stack-closure.rs src/test/compile-fail/do1.rs src/test/compile-fail/do2.rs src/test/compile-fail/empty-vec-trailing-comma.rs src/test/compile-fail/evec-subtyping.rs src/test/compile-fail/issue-1896.rs src/test/compile-fail/issue-2149.rs src/test/compile-fail/issue-2150.rs src/test/compile-fail/issue-2487-b.rs src/test/compile-fail/kindck-implicit-close-over-mut-var.rs src/test/compile-fail/liveness-issue-2163.rs src/test/compile-fail/liveness-use-in-index-lvalue.rs src/test/compile-fail/no-reuse-move-arc.rs src/test/compile-fail/no-send-res-ports.rs src/test/compile-fail/non-const.rs src/test/compile-fail/pure-higher-order.rs src/test/compile-fail/pure-loop-body.rs src/test/compile-fail/regions-addr-of-upvar-self.rs src/test/compile-fail/regions-escape-loop-via-vec.rs src/test/compile-fail/regions-scoping.rs src/test/compile-fail/seq-args.rs src/test/compile-fail/tstate-unsat-in-called-fn-expr.rs src/test/compile-fail/tstate-unsat-in-fn-expr.rs src/test/compile-fail/vec-add.rs src/test/compile-fail/vec-concat-bug.rs src/test/compile-fail/vector-no-ann.rs
53 lines
1.5 KiB
Rust
53 lines
1.5 KiB
Rust
import io::reader_util;
|
|
|
|
import common::config;
|
|
|
|
export load_errors;
|
|
export expected_error;
|
|
|
|
type expected_error = { line: uint, kind: str, msg: str };
|
|
|
|
// Load any test directives embedded in the file
|
|
fn load_errors(testfile: str) -> ~[expected_error] {
|
|
let mut error_patterns = ~[];
|
|
let rdr = result::get(io::file_reader(testfile));
|
|
let mut line_num = 1u;
|
|
while !rdr.eof() {
|
|
let ln = rdr.read_line();
|
|
error_patterns += parse_expected(line_num, ln);
|
|
line_num += 1u;
|
|
}
|
|
ret error_patterns;
|
|
}
|
|
|
|
fn parse_expected(line_num: uint, line: str) -> ~[expected_error] unsafe {
|
|
let error_tag = "//~";
|
|
let mut idx;
|
|
alt str::find_str(line, error_tag) {
|
|
option::none { ret ~[]; }
|
|
option::some(nn) { idx = (nn as uint) + str::len(error_tag); }
|
|
}
|
|
|
|
// "//~^^^ kind msg" denotes a message expected
|
|
// three lines above current line:
|
|
let mut adjust_line = 0u;
|
|
let len = str::len(line);
|
|
while idx < len && line[idx] == ('^' as u8) {
|
|
adjust_line += 1u;
|
|
idx += 1u;
|
|
}
|
|
|
|
// Extract kind:
|
|
while idx < len && line[idx] == (' ' as u8) { idx += 1u; }
|
|
let start_kind = idx;
|
|
while idx < len && line[idx] != (' ' as u8) { idx += 1u; }
|
|
let kind = str::to_lower(str::slice(line, start_kind, idx));
|
|
|
|
// Extract msg:
|
|
while idx < len && line[idx] == (' ' as u8) { idx += 1u; }
|
|
let msg = str::slice(line, idx, len);
|
|
|
|
#debug("line=%u kind=%s msg=%s", line_num - adjust_line, kind, msg);
|
|
|
|
ret ~[{line: line_num - adjust_line, kind: kind, msg: msg}];
|
|
}
|