Extract types into separate files

Also make tables more nice to work with and fix debug printing for cyclic
references.
This commit is contained in:
Joscha 2021-09-26 15:20:18 +02:00
parent c1bea626b1
commit fc1ada97c1
3 changed files with 208 additions and 81 deletions

70
src/table.rs Normal file
View file

@ -0,0 +1,70 @@
use std::cell::RefCell;
use std::collections::HashMap;
use std::fmt::{self, Debug};
use std::hash::{Hash, Hasher};
use std::rc::{Rc, Weak};
use crate::values::{Key, Value};
pub struct TableOwner(Rc<RefCell<HashMap<Key, Value>>>);
impl TableOwner {
pub fn new() -> Self {
Self(Rc::new(RefCell::new(HashMap::new())))
}
}
#[derive(Clone)]
pub struct Table(Weak<RefCell<HashMap<Key, Value>>>);
impl Debug for Table {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let rc = match self.0.upgrade() {
Some(rc) => rc,
None => return write!(f, "<broken table>"),
};
let hash_map = match rc.try_borrow_mut() {
Ok(hash_map) => hash_map,
Err(_) => return write!(f, "<cyclic ref>"),
};
hash_map.fmt(f)
}
}
impl PartialEq for Table {
fn eq(&self, other: &Self) -> bool {
self.0.ptr_eq(&other.0)
}
}
impl Eq for Table {}
impl Hash for Table {
fn hash<H: Hasher>(&self, state: &mut H) {
self.0.as_ptr().hash(state);
}
}
impl Table {
pub fn new(owner: &TableOwner) -> Self {
Self(Rc::downgrade(&owner.0))
}
pub fn insert(&self, key: Key, value: Value) {
self.0
.upgrade()
.expect("table owner was deallocated")
.borrow_mut()
.insert(key, value);
}
pub fn remove(&self, key: &Key) {
self.0
.upgrade()
.expect("table owner was deallocated")
.borrow_mut()
.remove(key);
}
}