Hide stuff that are not used outside of _match.rs
This commit is contained in:
Dmitry Ermolov
parent
8d3c62af9f
commit
1fa0a8c9db
1 changed files with 42 additions and 42 deletions
|
|
@ -183,7 +183,7 @@ use syntax::codemap::{span, dummy_sp};
|
|||
|
||||
// An option identifying a literal: either a unit-like struct or an
|
||||
// expression.
|
||||
pub enum Lit {
|
||||
enum Lit {
|
||||
UnitLikeStructLit(ast::NodeId), // the node ID of the pattern
|
||||
ExprLit(@ast::expr),
|
||||
ConstLit(ast::def_id), // the def ID of the constant
|
||||
|
|
@ -191,7 +191,7 @@ pub enum Lit {
|
|||
|
||||
// An option identifying a branch (either a literal, a enum variant or a
|
||||
// range)
|
||||
pub enum Opt {
|
||||
enum Opt {
|
||||
lit(Lit),
|
||||
var(/* disr val */ uint, @adt::Repr),
|
||||
range(@ast::expr, @ast::expr),
|
||||
|
|
@ -199,7 +199,7 @@ pub enum Opt {
|
|||
vec_len_ge(uint, /* slice */uint)
|
||||
}
|
||||
|
||||
pub fn opt_eq(tcx: ty::ctxt, a: &Opt, b: &Opt) -> bool {
|
||||
fn opt_eq(tcx: ty::ctxt, a: &Opt, b: &Opt) -> bool {
|
||||
match (a, b) {
|
||||
(&lit(a), &lit(b)) => {
|
||||
match (a, b) {
|
||||
|
|
@ -258,7 +258,7 @@ pub enum opt_result {
|
|||
lower_bound(Result),
|
||||
range_result(Result, Result),
|
||||
}
|
||||
pub fn trans_opt(bcx: @mut Block, o: &Opt) -> opt_result {
|
||||
fn trans_opt(bcx: @mut Block, o: &Opt) -> opt_result {
|
||||
let _icx = push_ctxt("match::trans_opt");
|
||||
let ccx = bcx.ccx();
|
||||
let bcx = bcx;
|
||||
|
|
@ -292,7 +292,7 @@ pub fn trans_opt(bcx: @mut Block, o: &Opt) -> opt_result {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn variant_opt(bcx: @mut Block, pat_id: ast::NodeId)
|
||||
fn variant_opt(bcx: @mut Block, pat_id: ast::NodeId)
|
||||
-> Opt {
|
||||
let ccx = bcx.ccx();
|
||||
match ccx.tcx.def_map.get_copy(&pat_id) {
|
||||
|
|
@ -317,7 +317,7 @@ pub fn variant_opt(bcx: @mut Block, pat_id: ast::NodeId)
|
|||
}
|
||||
|
||||
#[deriving(Clone)]
|
||||
pub enum TransBindingMode {
|
||||
enum TransBindingMode {
|
||||
TrByValue(/*llbinding:*/ ValueRef),
|
||||
TrByRef,
|
||||
}
|
||||
|
|
@ -331,24 +331,24 @@ pub enum TransBindingMode {
|
|||
* - `id` is the node id of the binding
|
||||
* - `ty` is the Rust type of the binding */
|
||||
#[deriving(Clone)]
|
||||
pub struct BindingInfo {
|
||||
struct BindingInfo {
|
||||
llmatch: ValueRef,
|
||||
trmode: TransBindingMode,
|
||||
id: ast::NodeId,
|
||||
ty: ty::t,
|
||||
}
|
||||
|
||||
pub type BindingsMap = HashMap<ident, BindingInfo>;
|
||||
type BindingsMap = HashMap<ident, BindingInfo>;
|
||||
|
||||
#[deriving(Clone)]
|
||||
pub struct ArmData<'self> {
|
||||
struct ArmData<'self> {
|
||||
bodycx: @mut Block,
|
||||
arm: &'self ast::arm,
|
||||
bindings_map: @BindingsMap
|
||||
}
|
||||
|
||||
#[deriving(Clone)]
|
||||
pub struct Match<'self> {
|
||||
struct Match<'self> {
|
||||
pats: ~[@ast::pat],
|
||||
data: ArmData<'self>
|
||||
}
|
||||
|
|
@ -364,7 +364,7 @@ impl<'self> Repr for Match<'self> {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn has_nested_bindings(m: &[Match], col: uint) -> bool {
|
||||
fn has_nested_bindings(m: &[Match], col: uint) -> bool {
|
||||
for br in m.iter() {
|
||||
match br.pats[col].node {
|
||||
ast::pat_ident(_, _, Some(_)) => return true,
|
||||
|
|
@ -374,7 +374,7 @@ pub fn has_nested_bindings(m: &[Match], col: uint) -> bool {
|
|||
return false;
|
||||
}
|
||||
|
||||
pub fn expand_nested_bindings<'r>(bcx: @mut Block,
|
||||
fn expand_nested_bindings<'r>(bcx: @mut Block,
|
||||
m: &[Match<'r>],
|
||||
col: uint,
|
||||
val: ValueRef)
|
||||
|
|
@ -409,7 +409,7 @@ pub fn expand_nested_bindings<'r>(bcx: @mut Block,
|
|||
}
|
||||
}
|
||||
|
||||
pub fn assert_is_binding_or_wild(bcx: @mut Block, p: @ast::pat) {
|
||||
fn assert_is_binding_or_wild(bcx: @mut Block, p: @ast::pat) {
|
||||
if !pat_is_binding_or_wild(bcx.tcx().def_map, p) {
|
||||
bcx.sess().span_bug(
|
||||
p.span,
|
||||
|
|
@ -418,9 +418,9 @@ pub fn assert_is_binding_or_wild(bcx: @mut Block, p: @ast::pat) {
|
|||
}
|
||||
}
|
||||
|
||||
pub type enter_pat<'self> = &'self fn(@ast::pat) -> Option<~[@ast::pat]>;
|
||||
type enter_pat<'self> = &'self fn(@ast::pat) -> Option<~[@ast::pat]>;
|
||||
|
||||
pub fn enter_match<'r>(bcx: @mut Block,
|
||||
fn enter_match<'r>(bcx: @mut Block,
|
||||
dm: DefMap,
|
||||
m: &[Match<'r>],
|
||||
col: uint,
|
||||
|
|
@ -470,7 +470,7 @@ pub fn enter_match<'r>(bcx: @mut Block,
|
|||
return result;
|
||||
}
|
||||
|
||||
pub fn enter_default<'r>(bcx: @mut Block,
|
||||
fn enter_default<'r>(bcx: @mut Block,
|
||||
dm: DefMap,
|
||||
m: &[Match<'r>],
|
||||
col: uint,
|
||||
|
|
@ -516,7 +516,7 @@ pub fn enter_default<'r>(bcx: @mut Block,
|
|||
// <nmatsakis> so all patterns must either be records (resp. tuples) or
|
||||
// wildcards
|
||||
|
||||
pub fn enter_opt<'r>(bcx: @mut Block,
|
||||
fn enter_opt<'r>(bcx: @mut Block,
|
||||
m: &[Match<'r>],
|
||||
opt: &Opt,
|
||||
col: uint,
|
||||
|
|
@ -628,7 +628,7 @@ pub fn enter_opt<'r>(bcx: @mut Block,
|
|||
}
|
||||
}
|
||||
|
||||
pub fn enter_rec_or_struct<'r>(bcx: @mut Block,
|
||||
fn enter_rec_or_struct<'r>(bcx: @mut Block,
|
||||
dm: DefMap,
|
||||
m: &[Match<'r>],
|
||||
col: uint,
|
||||
|
|
@ -663,7 +663,7 @@ pub fn enter_rec_or_struct<'r>(bcx: @mut Block,
|
|||
}
|
||||
}
|
||||
|
||||
pub fn enter_tup<'r>(bcx: @mut Block,
|
||||
fn enter_tup<'r>(bcx: @mut Block,
|
||||
dm: DefMap,
|
||||
m: &[Match<'r>],
|
||||
col: uint,
|
||||
|
|
@ -689,7 +689,7 @@ pub fn enter_tup<'r>(bcx: @mut Block,
|
|||
}
|
||||
}
|
||||
|
||||
pub fn enter_tuple_struct<'r>(bcx: @mut Block,
|
||||
fn enter_tuple_struct<'r>(bcx: @mut Block,
|
||||
dm: DefMap,
|
||||
m: &[Match<'r>],
|
||||
col: uint,
|
||||
|
|
@ -715,7 +715,7 @@ pub fn enter_tuple_struct<'r>(bcx: @mut Block,
|
|||
}
|
||||
}
|
||||
|
||||
pub fn enter_box<'r>(bcx: @mut Block,
|
||||
fn enter_box<'r>(bcx: @mut Block,
|
||||
dm: DefMap,
|
||||
m: &[Match<'r>],
|
||||
col: uint,
|
||||
|
|
@ -742,7 +742,7 @@ pub fn enter_box<'r>(bcx: @mut Block,
|
|||
}
|
||||
}
|
||||
|
||||
pub fn enter_uniq<'r>(bcx: @mut Block,
|
||||
fn enter_uniq<'r>(bcx: @mut Block,
|
||||
dm: DefMap,
|
||||
m: &[Match<'r>],
|
||||
col: uint,
|
||||
|
|
@ -769,7 +769,7 @@ pub fn enter_uniq<'r>(bcx: @mut Block,
|
|||
}
|
||||
}
|
||||
|
||||
pub fn enter_region<'r>(bcx: @mut Block,
|
||||
fn enter_region<'r>(bcx: @mut Block,
|
||||
dm: DefMap,
|
||||
m: &[Match<'r>],
|
||||
col: uint,
|
||||
|
|
@ -799,7 +799,7 @@ pub fn enter_region<'r>(bcx: @mut Block,
|
|||
// Returns the options in one column of matches. An option is something that
|
||||
// needs to be conditionally matched at runtime; for example, the discriminant
|
||||
// on a set of enum variants or a literal.
|
||||
pub fn get_options(bcx: @mut Block, m: &[Match], col: uint) -> ~[Opt] {
|
||||
fn get_options(bcx: @mut Block, m: &[Match], col: uint) -> ~[Opt] {
|
||||
let ccx = bcx.ccx();
|
||||
fn add_to_set(tcx: ty::ctxt, set: &mut ~[Opt], val: Opt) {
|
||||
if set.iter().any(|l| opt_eq(tcx, l, &val)) {return;}
|
||||
|
|
@ -865,12 +865,12 @@ pub fn get_options(bcx: @mut Block, m: &[Match], col: uint) -> ~[Opt] {
|
|||
return found;
|
||||
}
|
||||
|
||||
pub struct ExtractedBlock {
|
||||
struct ExtractedBlock {
|
||||
vals: ~[ValueRef],
|
||||
bcx: @mut Block
|
||||
}
|
||||
|
||||
pub fn extract_variant_args(bcx: @mut Block,
|
||||
fn extract_variant_args(bcx: @mut Block,
|
||||
repr: &adt::Repr,
|
||||
disr_val: uint,
|
||||
val: ValueRef)
|
||||
|
|
@ -893,7 +893,7 @@ fn match_datum(bcx: @mut Block, val: ValueRef, pat_id: ast::NodeId) -> Datum {
|
|||
}
|
||||
|
||||
|
||||
pub fn extract_vec_elems(bcx: @mut Block,
|
||||
fn extract_vec_elems(bcx: @mut Block,
|
||||
pat_span: span,
|
||||
pat_id: ast::NodeId,
|
||||
elem_count: uint,
|
||||
|
|
@ -948,7 +948,7 @@ pub fn extract_vec_elems(bcx: @mut Block,
|
|||
}
|
||||
|
||||
// NB: This function does not collect fields from struct-like enum variants.
|
||||
pub fn collect_record_or_struct_fields(bcx: @mut Block,
|
||||
fn collect_record_or_struct_fields(bcx: @mut Block,
|
||||
m: &[Match],
|
||||
col: uint)
|
||||
-> ~[ast::ident] {
|
||||
|
|
@ -976,7 +976,7 @@ pub fn collect_record_or_struct_fields(bcx: @mut Block,
|
|||
}
|
||||
}
|
||||
|
||||
pub fn pats_require_rooting(bcx: @mut Block,
|
||||
fn pats_require_rooting(bcx: @mut Block,
|
||||
m: &[Match],
|
||||
col: uint)
|
||||
-> bool {
|
||||
|
|
@ -987,7 +987,7 @@ pub fn pats_require_rooting(bcx: @mut Block,
|
|||
}
|
||||
}
|
||||
|
||||
pub fn root_pats_as_necessary(mut bcx: @mut Block,
|
||||
fn root_pats_as_necessary(mut bcx: @mut Block,
|
||||
m: &[Match],
|
||||
col: uint,
|
||||
val: ValueRef)
|
||||
|
|
@ -1018,23 +1018,23 @@ macro_rules! any_pat (
|
|||
)
|
||||
)
|
||||
|
||||
pub fn any_box_pat(m: &[Match], col: uint) -> bool {
|
||||
fn any_box_pat(m: &[Match], col: uint) -> bool {
|
||||
any_pat!(m, ast::pat_box(_))
|
||||
}
|
||||
|
||||
pub fn any_uniq_pat(m: &[Match], col: uint) -> bool {
|
||||
fn any_uniq_pat(m: &[Match], col: uint) -> bool {
|
||||
any_pat!(m, ast::pat_uniq(_))
|
||||
}
|
||||
|
||||
pub fn any_region_pat(m: &[Match], col: uint) -> bool {
|
||||
fn any_region_pat(m: &[Match], col: uint) -> bool {
|
||||
any_pat!(m, ast::pat_region(_))
|
||||
}
|
||||
|
||||
pub fn any_tup_pat(m: &[Match], col: uint) -> bool {
|
||||
fn any_tup_pat(m: &[Match], col: uint) -> bool {
|
||||
any_pat!(m, ast::pat_tup(_))
|
||||
}
|
||||
|
||||
pub fn any_tuple_struct_pat(bcx: @mut Block, m: &[Match], col: uint) -> bool {
|
||||
fn any_tuple_struct_pat(bcx: @mut Block, m: &[Match], col: uint) -> bool {
|
||||
do m.iter().any |br| {
|
||||
let pat = br.pats[col];
|
||||
match pat.node {
|
||||
|
|
@ -1050,9 +1050,9 @@ pub fn any_tuple_struct_pat(bcx: @mut Block, m: &[Match], col: uint) -> bool {
|
|||
}
|
||||
}
|
||||
|
||||
pub type mk_fail = @fn() -> BasicBlockRef;
|
||||
type mk_fail = @fn() -> BasicBlockRef;
|
||||
|
||||
pub fn pick_col(m: &[Match]) -> uint {
|
||||
fn pick_col(m: &[Match]) -> uint {
|
||||
fn score(p: &ast::pat) -> uint {
|
||||
match p.node {
|
||||
ast::pat_lit(_) | ast::pat_enum(_, _) | ast::pat_range(_, _) => 1u,
|
||||
|
|
@ -1088,7 +1088,7 @@ pub enum branch_kind { no_branch, single, switch, compare, compare_vec_len, }
|
|||
// Compiles a comparison between two things.
|
||||
//
|
||||
// NB: This must produce an i1, not a Rust bool (i8).
|
||||
pub fn compare_values(cx: @mut Block,
|
||||
fn compare_values(cx: @mut Block,
|
||||
lhs: ValueRef,
|
||||
rhs: ValueRef,
|
||||
rhs_t: ty::t)
|
||||
|
|
@ -1204,7 +1204,7 @@ fn insert_lllocals(bcx: @mut Block,
|
|||
return bcx;
|
||||
}
|
||||
|
||||
pub fn compile_guard(bcx: @mut Block,
|
||||
fn compile_guard(bcx: @mut Block,
|
||||
guard_expr: @ast::expr,
|
||||
data: &ArmData,
|
||||
m: &[Match],
|
||||
|
|
@ -1261,7 +1261,7 @@ pub fn compile_guard(bcx: @mut Block,
|
|||
}
|
||||
}
|
||||
|
||||
pub fn compile_submatch(bcx: @mut Block,
|
||||
fn compile_submatch(bcx: @mut Block,
|
||||
m: &[Match],
|
||||
vals: &[ValueRef],
|
||||
chk: Option<mk_fail>) {
|
||||
|
|
@ -1670,7 +1670,7 @@ fn create_bindings_map(bcx: @mut Block, pat: @ast::pat) -> BindingsMap {
|
|||
return bindings_map;
|
||||
}
|
||||
|
||||
pub fn trans_match_inner(scope_cx: @mut Block,
|
||||
fn trans_match_inner(scope_cx: @mut Block,
|
||||
discr_expr: @ast::expr,
|
||||
arms: &[ast::arm],
|
||||
dest: Dest) -> @mut Block {
|
||||
|
|
@ -1752,7 +1752,7 @@ pub fn trans_match_inner(scope_cx: @mut Block,
|
|||
}
|
||||
}
|
||||
|
||||
pub enum IrrefutablePatternBindingMode {
|
||||
enum IrrefutablePatternBindingMode {
|
||||
// Stores the association between node ID and LLVM value in `lllocals`.
|
||||
BindLocal,
|
||||
// Stores the association between node ID and LLVM value in `llargs`.
|
||||
|
|
|
|||
Loading…
Reference in a new issue