Mirrors/rink-rs
2
0
Fork 0
mirror of https://github.com/tiffany352/rink-rs synced 2024-11-10 05:34:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Get content from Name with one method

Browse source 
Get the content of whatever variant by calling `Name::name()`.
This commit is contained in:
Colin Benner 2018-11-21 20:15:00 +01:00 committed by Tiffany Bennett
parent 9c74a38b4d
commit 1e87d5a54f
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/load.rs
View file

@ -23,6 +23,17 @@ impl Context {
Category(Rc<String>),
}
impl Name {
fn name(&self) -> String {
match &self {
Name::Unit(ref name) |
Name::Prefix(ref name) |
Name::Quantity(ref name) |
Name::Category(ref name) => (**name).clone(),
}
}
}
struct Resolver {
interned: BTreeSet<Rc<String>>,
input: BTreeMap<Name, Rc<Def>>,
@ -203,12 +214,7 @@ impl Context {
reverse.insert("katal");
for (name, def) in udefs {
let name = match name {
Name::Unit(name) => (*name).clone(),
Name::Prefix(name) => (*name).clone(),
Name::Quantity(name) => (*name).clone(),
Name::Category(name) => (*name).clone(),
};
let name = name.name();
match *def {
Def::Dimension => {
self.dimensions.insert(Dim::new(&*name));
@ -359,24 +365,14 @@ impl Context {
}
for (name, val) in resolver.docs {
let name = match name {
Name::Unit(name) => (*name).clone(),
Name::Prefix(name) => (*name).clone(),
Name::Quantity(name) => (*name).clone(),
Name::Category(name) => (*name).clone(),
};
let name = name.name();
if self.docs.insert(name.clone(), val).is_some() {
println!("Doc conflict for {}", name);
}
}
for (name, val) in resolver.categories {
let name = match name {
Name::Unit(name) => (*name).clone(),
Name::Prefix(name) => (*name).clone(),
Name::Quantity(name) => (*name).clone(),
Name::Category(name) => (*name).clone(),
};
let name = name.name();
if self.categories.insert(name.clone(), val).is_some() {
println!("Category conflict for {}", name);
}