syntaxAlchemist/lib-nested
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

impl View traits for Option<V>

Browse source
This commit is contained in:
Michael Sippel 2021-01-19 22:54:50 +01:00
parent c2b4683a1a
commit 6aef446134
Signed by: senvas
GPG key ID: F96CF119C34B64A6
7 changed files with 51 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/view.rs
View file

@ -13,12 +13,15 @@ pub trait View : Send + Sync {
use std::sync::{Arc, RwLock};
impl<V: View> View for RwLock<V> {
impl<V: View + ?Sized> View for RwLock<V> {
type Msg = V::Msg;
}
impl<V: View> View for Arc<V> {
impl<V: View + ?Sized> View for Arc<V> {
type Msg = V::Msg;
}
impl<V: View> View for Option<V> {
type Msg = V::Msg;
}

4
src/index/map_item.rs
View file

@ -78,11 +78,11 @@ where SrcView: IndexView<Key> + ?Sized,
type Item = DstItem;
fn get(&self, key: &Key) -> Option<Self::Item> {
self.src_view.as_ref()?.get(key).as_ref().map(|item| (self.f)(key, item))
self.src_view.get(key).as_ref().map(|item| (self.f)(key, item))
}
fn area(&self) -> Option<Vec<Key>> {
self.src_view.as_ref()?.area()
self.src_view.area()
}
}

4
src/index/map_key.rs
View file

@ -88,11 +88,11 @@ where SrcView: IndexView<SrcKey> + ?Sized,
type Item = SrcView::Item;
fn get(&self, key: &DstKey) -> Option<Self::Item> {
self.src_view.as_ref()?.get(&(self.f2)(key)?)
self.src_view.get(&(self.f2)(key)?)
}
fn area(&self) -> Option<Vec<DstKey>> {
Some(self.src_view.as_ref()?.area()?.iter().map(&self.f1).collect())
Some(self.src_view.area()?.iter().map(&self.f1).collect())
}
}

20
src/index/mod.rs
View file

@ -25,7 +25,7 @@ pub trait IndexView<Key> : View<Msg = Key> {
//<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
impl<Key, V: IndexView<Key>> IndexView<Key> for RwLock<V> {
impl<Key, V: IndexView<Key> + ?Sized> IndexView<Key> for RwLock<V> {
type Item = V::Item;
fn get(&self, key: &Key) -> Option<Self::Item> {
@ -37,7 +37,7 @@ impl<Key, V: IndexView<Key>> IndexView<Key> for RwLock<V> {
}
}
impl<Key, V: IndexView<Key>> IndexView<Key> for Arc<V> {
impl<Key, V: IndexView<Key> + ?Sized> IndexView<Key> for Arc<V> {
type Item = V::Item;
fn get(&self, key: &Key) -> Option<Self::Item> {
@ -49,6 +49,22 @@ impl<Key, V: IndexView<Key>> IndexView<Key> for Arc<V> {
}
}
impl<Key, V: IndexView<Key>> IndexView<Key> for Option<V> {
type Item = V::Item;
fn get(&self, key: &Key) -> Option<Self::Item> {
(self.as_ref()? as &V).get(key)
}
fn area(&self) -> Option<Vec<Key>> {
if let Some(v) = self.as_ref() {
v.area()
} else {
Some(Vec::new())
}
}
}
//<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
pub trait ImplIndexView : Send + Sync {

19
src/sequence/mod.rs
View file

@ -25,7 +25,7 @@ use std::{
ops::{Deref}
};
impl<V: SequenceView> SequenceView for RwLock<V> {
impl<V: SequenceView + ?Sized> SequenceView for RwLock<V> {
type Item = V::Item;
fn get(&self, idx: &usize) -> Option<Self::Item> {
@ -37,7 +37,7 @@ impl<V: SequenceView> SequenceView for RwLock<V> {
}
}
impl<V: SequenceView> SequenceView for Arc<V> {
impl<V: SequenceView + ?Sized> SequenceView for Arc<V> {
type Item = V::Item;
fn get(&self, idx: &usize) -> Option<Self::Item> {
@ -49,4 +49,19 @@ impl<V: SequenceView> SequenceView for Arc<V> {
}
}
impl<V: SequenceView> SequenceView for Option<V> {
type Item = V::Item;
fn get(&self, idx: &usize) -> Option<Self::Item> {
(self.as_ref()? as &V).get(idx)
}
fn len(&self) -> Option<usize> {
if let Some(v) = self.as_ref() {
v.len()
} else {
Some(0)
}
}
}

5
src/sequence/seq2idx.rs
View file

@ -53,12 +53,11 @@ where SrcView: SequenceView + ?Sized + 'static {
type Item = SrcView::Item;
fn get(&self, key: &usize) -> Option<Self::Item> {
self.src_view.as_ref()?.get(key)
self.src_view.get(key)
}
fn area(&self) -> Option<Vec<usize>> {
let len = self.src_view.as_ref()?.len()?;
Some((0 .. len).collect())
Some((0 .. self.src_view.len()?).collect())
}
}

17
src/string_editor.rs
View file

@ -9,6 +9,7 @@ use {
//<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
#[derive(Clone)]
pub struct StringEditor {
data: VecBuffer<char>,
cursor: SingletonBuffer<usize>,
@ -123,21 +124,9 @@ pub mod insert_view {
impl Observer<dyn SequenceView<Item = char>> for DataObserver {
fn reset(&mut self, new_data: Option<Arc<dyn SequenceView<Item = char>>>) {
let old_len =
if let Some(data) = self.data.as_ref() {
data.len().unwrap_or(0)
} else {
0
};
let old_len = self.data.len().unwrap_or(0);
self.data = new_data;
let new_len =
if let Some(data) = self.data.as_ref() {
data.len().unwrap_or(0)
} else {
0
};
let new_len = self.data.len().unwrap_or(0);
self.edit
.upgrade().unwrap()