2b92962aa2
- Make `extern fn()` assignable to any closure type, rather than a subtype. - Remove unused int_ty_set and float_ty_set - Refactor variable unification and make it more DRY - Do fn sub/lub/glb on the level of fn_sig - Rename infer::to_str::ToStr to infer::to_str::InferStr - Capitalize names of various types - Correct hashing of FnMeta - Convert various records-of-fns into structs-of-fns. This is both eliminating use of deprecated features and more forwards compatible with fn reform. r=pcwalton
122 lines
3.1 KiB
Rust
122 lines
3.1 KiB
Rust
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
use core::prelude::*;
|
|
|
|
use syntax::ast;
|
|
use syntax::codemap::{span};
|
|
use syntax::visit;
|
|
use syntax::print;
|
|
use syntax;
|
|
|
|
use core::option;
|
|
use core::str;
|
|
use core::vec;
|
|
use std::map::HashMap;
|
|
|
|
fn indent<R>(op: fn() -> R) -> R {
|
|
// Use in conjunction with the log post-processor like `src/etc/indenter`
|
|
// to make debug output more readable.
|
|
debug!(">>");
|
|
let r = op();
|
|
debug!("<< (Result = %?)", r);
|
|
move r
|
|
}
|
|
|
|
struct _indenter {
|
|
_i: (),
|
|
drop { debug!("<<"); }
|
|
}
|
|
|
|
fn _indenter(_i: ()) -> _indenter {
|
|
_indenter {
|
|
_i: ()
|
|
}
|
|
}
|
|
|
|
fn indenter() -> _indenter {
|
|
debug!(">>");
|
|
_indenter(())
|
|
}
|
|
|
|
type flag = HashMap<~str, ()>;
|
|
|
|
fn field_expr(f: ast::field) -> @ast::expr { return f.node.expr; }
|
|
|
|
fn field_exprs(fields: ~[ast::field]) -> ~[@ast::expr] {
|
|
fields.map(|f| f.node.expr)
|
|
}
|
|
|
|
// Takes a predicate p, returns true iff p is true for any subexpressions
|
|
// of b -- skipping any inner loops (loop, while, loop_body)
|
|
fn loop_query(b: ast::blk, p: fn@(ast::expr_) -> bool) -> bool {
|
|
let rs = @mut false;
|
|
let visit_expr =
|
|
|e: @ast::expr, &&flag: @mut bool, v: visit::vt<@mut bool>| {
|
|
*flag |= p(e.node);
|
|
match e.node {
|
|
// Skip inner loops, since a break in the inner loop isn't a
|
|
// break inside the outer loop
|
|
ast::expr_loop(*) | ast::expr_while(*)
|
|
| ast::expr_loop_body(*) => {}
|
|
_ => visit::visit_expr(e, flag, v)
|
|
}
|
|
};
|
|
let v = visit::mk_vt(@visit::Visitor {
|
|
visit_expr: visit_expr,
|
|
.. *visit::default_visitor()});
|
|
visit::visit_block(b, rs, v);
|
|
return *rs;
|
|
}
|
|
|
|
// Takes a predicate p, returns true iff p is true for any subexpressions
|
|
// of b -- skipping any inner loops (loop, while, loop_body)
|
|
fn block_query(b: ast::blk, p: fn@(@ast::expr) -> bool) -> bool {
|
|
let rs = @mut false;
|
|
let visit_expr =
|
|
|e: @ast::expr, &&flag: @mut bool, v: visit::vt<@mut bool>| {
|
|
*flag |= p(e);
|
|
visit::visit_expr(e, flag, v)
|
|
};
|
|
let v = visit::mk_vt(@visit::Visitor{
|
|
visit_expr: visit_expr,
|
|
.. *visit::default_visitor()});
|
|
visit::visit_block(b, rs, v);
|
|
return *rs;
|
|
}
|
|
|
|
fn local_rhs_span(l: @ast::local, def: span) -> span {
|
|
match l.node.init {
|
|
Some(i) => return i.span,
|
|
_ => return def
|
|
}
|
|
}
|
|
|
|
fn is_main_name(path: syntax::ast_map::path) -> bool {
|
|
vec::last(path) == syntax::ast_map::path_name(
|
|
syntax::parse::token::special_idents::main
|
|
)
|
|
}
|
|
|
|
fn pluralize(n: uint, +s: ~str) -> ~str {
|
|
if n == 1 { s }
|
|
else { str::concat([s, ~"s"]) }
|
|
}
|
|
|
|
//
|
|
// Local Variables:
|
|
// mode: rust
|
|
// fill-column: 78;
|
|
// indent-tabs-mode: nil
|
|
// c-basic-offset: 4
|
|
// buffer-file-coding-system: utf-8-unix
|
|
// End:
|
|
//
|