Handle Attr.Attr in numbers

This commit is contained in:
Richard Feldman 2020-03-03 02:14:24 -05:00
parent b988fc6e56
commit 99ee9dc3b1

View File

@ -205,37 +205,24 @@ fn layout_from_flat_type<'a>(
let (tag, args) = tags.into_iter().next().unwrap(); let (tag, args) = tags.into_iter().next().unwrap();
match tag { match tag {
TagName::Private(Symbol::NUM_AT_NUM) if args.len() == 1 => { TagName::Private(Symbol::ATTR_AT_ATTR) => {
debug_assert!(args.len() == 2);
// The first argument is the uniqueness info;
// we don't need that here.
let wrapped_var = args[1];
// For now, layout is unaffected by uniqueness.
// (Incorporating refcounting may change this.)
// Unwrap and continue
Layout::from_var(arena, wrapped_var, subs)
}
TagName::Private(Symbol::NUM_AT_NUM) => {
debug_assert!(args.len() == 1);
let var = args.into_iter().next().unwrap(); let var = args.into_iter().next().unwrap();
match subs.get_without_compacting(var).content { unwrap_num_tag(subs, var)
Content::Structure(flat_type) => match flat_type {
_ => {
panic!("TODO handle Num.@Num flat_type {:?}", flat_type);
}
},
Content::Alias(Symbol::INT_INTEGER, args, _) => {
debug_assert!(args.is_empty());
Ok(Layout::Builtin(Builtin::Int64))
}
Content::Alias(Symbol::FLOAT_FLOATINGPOINT, args, _) => {
debug_assert!(args.is_empty());
Ok(Layout::Builtin(Builtin::Float64))
}
other => {
panic!("TODO non structure Num.@Num flat_type {:?}", other);
} // Symbol::INT_INT => {
// debug_assert!(args.is_empty());
// types::I64
// }
// Symbol::FLOAT_FLOAT => {
// debug_assert!(args.is_empty());
// types::F64
// }
// tag => {
// panic!("TODO gracefully handle unrecognized Num.Num variant {:?} {:?}", tag, args);
// }
}
} }
TagName::Private(Symbol::STR_AT_STR) => Ok(Layout::Builtin(Builtin::Str)), TagName::Private(Symbol::STR_AT_STR) => Ok(Layout::Builtin(Builtin::Str)),
TagName::Private(symbol) => { TagName::Private(symbol) => {
@ -338,3 +325,31 @@ fn flatten_record(fields: &mut MutMap<Lowercase, Variable>, ext_var: Variable, s
} }
}; };
} }
fn unwrap_num_tag<'a>(subs: &Subs, var: Variable) -> Result<Layout<'a>, ()> {
match subs.get_without_compacting(var).content {
Content::Structure(flat_type) => match flat_type {
_ => {
panic!("TODO handle Num.@Num flat_type {:?}", flat_type);
}
},
Content::Alias(Symbol::INT_INTEGER, args, _) => {
debug_assert!(args.is_empty());
Ok(Layout::Builtin(Builtin::Int64))
}
Content::Alias(Symbol::FLOAT_FLOATINGPOINT, args, _) => {
debug_assert!(args.is_empty());
Ok(Layout::Builtin(Builtin::Float64))
}
Content::Alias(Symbol::ATTR_ATTR, args, _) => {
debug_assert!(args.len() == 2);
let (_name, arg_var) = args.get(1).unwrap();
unwrap_num_tag(subs, *arg_var)
}
other => {
panic!("TODO non structure Num.@Num flat_type {:?}", other);
}
}
}