-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Registers are stored inside `Editor` and accessed without `RwLock`. To work around ownership, I added a sister method to `Editor::current`: `Editor::current_with_context`. I tried to modify `Editor::current` directly but it's used at a lot of places so I reverted into this for now at least.
- Loading branch information
Showing
5 changed files
with
161 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,63 @@ | ||
| use crate::Tendril; | ||
| use once_cell::sync::Lazy; | ||
| use std::{collections::HashMap, sync::RwLock}; | ||
|
|
||
| // TODO: could be an instance on Editor | ||
| static REGISTRY: Lazy<RwLock<HashMap<char, Vec<String>>>> = | ||
| Lazy::new(|| RwLock::new(HashMap::new())); | ||
|
|
||
| /// Read register values. | ||
| pub fn get(register_name: char) -> Option<Vec<String>> { | ||
| let registry = REGISTRY.read().unwrap(); | ||
| registry.get(®ister_name).cloned() // TODO: no cloning | ||
| use std::collections::HashMap; | ||
|
|
||
| #[derive(Debug)] | ||
| pub struct Register { | ||
| name: char, | ||
| values: Vec<String>, | ||
| } | ||
|
|
||
| impl Register { | ||
| pub fn new(name: char) -> Self { | ||
| Self { | ||
| name, | ||
| values: Vec::new(), | ||
| } | ||
| } | ||
|
|
||
| pub fn new_with_values(name: char, values: Vec<String>) -> Self { | ||
| Self { name, values } | ||
| } | ||
|
|
||
| pub fn name(&self) -> char { | ||
| self.name | ||
| } | ||
|
|
||
| pub fn read(&self) -> &Vec<String> { | ||
| &self.values | ||
| } | ||
|
|
||
| pub fn write(&mut self, values: Vec<String>) { | ||
| self.values = values; | ||
| } | ||
| } | ||
|
|
||
| /// Read register values. | ||
| // restoring: bool | ||
| pub fn set(register_name: char, values: Vec<String>) { | ||
| let mut registry = REGISTRY.write().unwrap(); | ||
| registry.insert(register_name, values); | ||
| /// Currently just wraps a `HashMap` of `Register`s | ||
| #[derive(Debug, Default)] | ||
| pub struct Registers { | ||
| inner: HashMap<char, Register>, | ||
| } | ||
|
|
||
| impl Registers { | ||
| pub fn get(&self, name: char) -> Option<&Register> { | ||
| self.inner.get(&name) | ||
| } | ||
|
|
||
| pub fn get_mut(&mut self, name: char) -> Option<&mut Register> { | ||
| self.inner.get_mut(&name) | ||
| } | ||
|
|
||
| pub fn get_or_insert(&mut self, name: char) -> &mut Register { | ||
| self.inner | ||
| .entry(name) | ||
| .or_insert_with(|| Register::new(name)) | ||
| } | ||
|
|
||
| pub fn write(&mut self, name: char, values: Vec<String>) { | ||
| self.inner | ||
| .insert(name, Register::new_with_values(name, values)); | ||
| } | ||
|
|
||
| pub fn read(&self, name: char) -> Option<&Vec<String>> { | ||
| self.get(name).map(|reg| reg.read()) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.