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

wip

Browse source
This commit is contained in:
Michael Sippel 2023-07-03 12:32:03 +02:00
parent 66c6478124
commit 3968baffe1
Signed by: senvas
GPG key ID: F96CF119C34B64A6
7 changed files with 132 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
nested/src/editors/list/editor.rs
View file

@ -16,7 +16,7 @@ use {
pub struct ListEditor { pub struct ListEditor {
pub(super) cursor: SingletonBuffer<ListCursor>, pub(super) cursor: SingletonBuffer<ListCursor>,
pub data: VecBuffer<NestedNode>, pub data: VecBuffer< Arc<RwLock<NestedNode>> >,
pub(super) addr_port: OuterViewPort<dyn SequenceView<Item = isize>>, pub(super) addr_port: OuterViewPort<dyn SequenceView<Item = isize>>,
pub(super) mode_port: OuterViewPort<dyn SingletonView<Item = ListCursorMode>>, pub(super) mode_port: OuterViewPort<dyn SingletonView<Item = ListCursorMode>>,
@ -64,7 +64,7 @@ impl ListEditor {
typ: TypeTerm, typ: TypeTerm,
) -> Self { ) -> Self {
let cursor = SingletonBuffer::new(ListCursor::default()); let cursor = SingletonBuffer::new(ListCursor::default());
let data = VecBuffer::<NestedNode>::new(); let data = VecBuffer::<Arc<RwLock<NestedNode>>>::new();
ListEditor { ListEditor {
mode_port: cursor mode_port: cursor
@ -77,7 +77,7 @@ impl ListEditor {
ListCursorMode::Insert => ip, ListCursorMode::Insert => ip,
ListCursorMode::Select => { ListCursorMode::Select => {
if let Some(idx) = c.idx { if let Some(idx) = c.idx {
data.get(idx as usize).get_mode_view() data.get(idx as usize).read().unwrap().get_mode_view()
} else { } else {
ip ip
} }
@ -99,7 +99,7 @@ impl ListEditor {
if cur.mode == ListCursorMode::Select { if cur.mode == ListCursorMode::Select {
if let Some(idx) = cur.idx { if let Some(idx) = cur.idx {
if idx >= 0 && idx < data.len() as isize { if idx >= 0 && idx < data.len() as isize {
return data.get(idx as usize).get_addr_view(); return data.get(idx as usize).read().unwrap().get_addr_view();
} }
} }
} }
@ -169,7 +169,9 @@ impl ListEditor {
} }
pub fn get_data_port(&self) -> OuterViewPort<dyn SequenceView<Item = NestedNode>> { pub fn get_data_port(&self) -> OuterViewPort<dyn SequenceView<Item = NestedNode>> {
self.data.get_port().to_sequence() self.data.get_port().to_sequence().map(
|x| x.read().unwrap().clone()
)
} }
pub fn get_data(&self) -> Arc<RwLock<ReprTree>> { pub fn get_data(&self) -> Arc<RwLock<ReprTree>> {
@ -184,7 +186,7 @@ impl ListEditor {
if let Some(idx) = self.cursor.get().idx { if let Some(idx) = self.cursor.get().idx {
let idx = crate::utils::modulo(idx as isize, self.data.len() as isize) as usize; let idx = crate::utils::modulo(idx as isize, self.data.len() as isize) as usize;
if idx < self.data.len() { if idx < self.data.len() {
Some(self.data.get(idx)) Some(self.data.get(idx).read().unwrap().clone())
} else { } else {
None None
} }
@ -193,7 +195,7 @@ impl ListEditor {
} }
} }
pub fn get_item_mut(&mut self) -> Option<MutableVecAccess<NestedNode>> { pub fn get_item_mut(&mut self) -> Option<MutableVecAccess<Arc<RwLock<NestedNode>>>> {
if let Some(idx) = self.cursor.get().idx { if let Some(idx) = self.cursor.get().idx {
let idx = crate::utils::modulo(idx as isize, self.data.len() as isize) as usize; let idx = crate::utils::modulo(idx as isize, self.data.len() as isize) as usize;
if idx < self.data.len() { if idx < self.data.len() {
@ -208,14 +210,6 @@ impl ListEditor {
pub fn is_listlist(&self) -> bool { pub fn is_listlist(&self) -> bool {
self.ctx.read().unwrap().is_list_type(&self.typ) self.ctx.read().unwrap().is_list_type(&self.typ)
/*
match self.typ.clone() {
TypeTerm::Type { id, args } => {
id == self.ctx.read().unwrap().get_typeid("List").unwrap()
},
TypeTerm::Num(_) => false
}
*/
} }
/// delete all items /// delete all items
@ -246,10 +240,9 @@ impl ListEditor {
} }
/// insert a new element /// insert a new element
pub fn insert(&mut self, item: NestedNode) { pub fn insert(&mut self, item: Arc<RwLock<NestedNode>>) {
let mut cur = self.cursor.get(); let mut cur = self.cursor.get();
if let Some(idx) = cur.idx { if let Some(idx) = cur.idx {
match cur.mode { match cur.mode {
ListCursorMode::Insert => { ListCursorMode::Insert => {
self.data.insert(idx as usize, item.clone()); self.data.insert(idx as usize, item.clone());
@ -276,6 +269,7 @@ impl ListEditor {
/// split the list off at the current cursor position and return the second half /// split the list off at the current cursor position and return the second half
pub fn split(&mut self) -> ListEditor { pub fn split(&mut self) -> ListEditor {
eprintln!("split!");
let mut le = ListEditor::new( let mut le = ListEditor::new(
Arc::new(RwLock::new(self.ctx.read().unwrap().clone())), Arc::new(RwLock::new(self.ctx.read().unwrap().clone())),
self.typ.clone()); self.typ.clone());
@ -290,12 +284,16 @@ impl ListEditor {
if self.is_listlist() { if self.is_listlist() {
if idx > 0 && idx < self.data.len()+1 { if idx > 0 && idx < self.data.len()+1 {
let prev_idx = idx - 1; // we are in insert mode, last element before cursor let prev_idx = idx - 1; // we are in insert mode, last element before cursor
let prev_node = self.data.get(prev_idx); let prev_node = self.data.get(prev_idx);
if let Some(prev_editor) = prev_node.editor.clone() { eprintln!("try locking prev node");
prev_editor.0.update(); let prev_node = prev_node.read().unwrap();
let prev_editor = prev_editor.get_view().unwrap().get().unwrap().downcast::<RwLock<ListEditor>>().unwrap(); eprintln!("locked prev node");
if let Some(prev_editor) = prev_node.editor.get() {
let prev_editor = prev_editor.downcast::<RwLock<ListEditor>>().unwrap();
let prev_editor = prev_editor.write().unwrap(); let prev_editor = prev_editor.write().unwrap();
prev_editor.get_data_port().0.update(); prev_editor.get_data_port().0.update();
@ -347,24 +345,28 @@ impl ListEditor {
} }
} }
pub fn listlist_split(&mut self) { pub fn listlist_split(&mut self) {
eprintln!("listlist split");
let cur = self.get_cursor(); let cur = self.get_cursor();
if let Some(item) = self.get_item_mut() {
eprintln!("cur = {:?}", cur);
if let Some(item) = self.get_item() {
eprintln!("got item");
// let item = item.read().unwrap();
let depth = item.depth; let depth = item.depth;
if let Some(head_editor) = item.editor.clone() { if let Some(head_editor) = item.editor.get() {
eprintln!("got head editor");
head_editor.0.update(); let head = head_editor.downcast::<RwLock<ListEditor>>().unwrap();
let head = head_editor.get_view().unwrap().get().unwrap().downcast::<RwLock<ListEditor>>().unwrap();
let mut head = head.write().unwrap(); let mut head = head.write().unwrap();
if head.data.len() > 0 { if head.data.len() > 0 {
eprintln!("data len > 0");
if cur.tree_addr.len() > 2 { if cur.tree_addr.len() > 2 {
head.listlist_split(); head.listlist_split();
} }
eprintln!("split head");
let mut tail = head.split(); let mut tail = head.split();
head.goto(TreeCursor::none()); head.goto(TreeCursor::none());
@ -388,15 +390,16 @@ impl ListEditor {
None None
}; };
let mut tail_node = tail.into_node(depth); let mut tail_node = tail.into_node(depth.get());
tail_node = tail_node.set_ctx(item.ctx.clone().unwrap());
// if let Some(item_type) = item_type { //if let Some(item_type) = item_type {
//eprintln!("morph to {}", self.ctx.read().unwrap().type_term_to_str(&self.typ));
tail_node = tail_node.morph(self.typ.clone()); tail_node = tail_node.morph(self.typ.clone());
//} //}
//eprintln!("insert node");
self.insert( self.insert(
tail_node Arc::new(RwLock::new(tail_node))
); );
} }
} }
@ -406,15 +409,14 @@ impl ListEditor {
pub fn listlist_join_pxev(&mut self, idx: isize, item: &NestedNode) { pub fn listlist_join_pxev(&mut self, idx: isize, item: &NestedNode) {
{ {
let prev_editor = self.data.get_mut(idx as usize-1); let prev_editor = self.data.get_mut(idx as usize-1);
let prev_editor = prev_editor.editor.clone(); let prev_editor = prev_editor.read().unwrap();
if let Some(prev_editor) = prev_editor {
prev_editor.0.update(); if let Some(prev_editor) = prev_editor.editor.get() {
if let Ok(prev_editor) = prev_editor.get_view().unwrap().get().unwrap().downcast::<RwLock<ListEditor>>() { if let Ok(prev_editor) = prev_editor.downcast::<RwLock<ListEditor>>() {
let mut prev_editor = prev_editor.write().unwrap(); let mut prev_editor = prev_editor.write().unwrap();
let cur_editor = item.editor.clone().unwrap(); let cur_editor = item.editor.get().unwrap();
cur_editor.0.update(); let cur_editor = cur_editor.downcast::<RwLock<ListEditor>>().unwrap();
let cur_editor = cur_editor.get_view().unwrap().get().unwrap().downcast::<RwLock<ListEditor>>().unwrap();
let cur_editor = cur_editor.write().unwrap(); let cur_editor = cur_editor.write().unwrap();
prev_editor.join(&cur_editor); prev_editor.join(&cur_editor);
@ -434,14 +436,13 @@ impl ListEditor {
pub fn listlist_join_nexd(&mut self, next_idx: usize, item: &NestedNode) { pub fn listlist_join_nexd(&mut self, next_idx: usize, item: &NestedNode) {
{ {
let next_editor = self.data.get_mut(next_idx).editor.clone(); let next_editor = self.data.get(next_idx);
if let Some(next_editor) = next_editor { let next_editor = next_editor.read().unwrap();
next_editor.0.update(); if let Some(next_editor) = next_editor.editor.get() {
if let Ok(next_editor) = next_editor.get_view().unwrap().get().unwrap().downcast::<RwLock<ListEditor>>() { if let Ok(next_editor) = next_editor.downcast::<RwLock<ListEditor>>() {
let mut next_editor = next_editor.write().unwrap(); let mut next_editor = next_editor.write().unwrap();
let cur_editor = item.editor.clone().unwrap(); let cur_editor = item.editor.get().unwrap();
cur_editor.0.update(); let cur_editor = cur_editor.downcast::<RwLock<ListEditor>>().unwrap();
let cur_editor = cur_editor.get_view().unwrap().get().unwrap().downcast::<RwLock<ListEditor>>().unwrap();
let mut cur_editor = cur_editor.write().unwrap(); let mut cur_editor = cur_editor.write().unwrap();
cur_editor.join(&next_editor); cur_editor.join(&next_editor);

11
nested/src/editors/list/nav.rs
View file

@ -43,7 +43,7 @@ impl TreeNav for ListEditor {
ListCursorMode::Select => { ListCursorMode::Select => {
if let Some(i) = cur.idx { if let Some(i) = cur.idx {
if i < self.data.len() as isize { if i < self.data.len() as isize {
let mut sub_cur = self.data.get(i as usize).get_cursor_warp(); let mut sub_cur = self.data.get(i as usize).read().unwrap().get_cursor_warp();
sub_cur.tree_addr.insert(0, i as isize - self.data.len() as isize); sub_cur.tree_addr.insert(0, i as isize - self.data.len() as isize);
return sub_cur; return sub_cur;
} else { } else {
@ -75,7 +75,7 @@ impl TreeNav for ListEditor {
ListCursorMode::Select => { ListCursorMode::Select => {
if let Some(i) = cur.idx { if let Some(i) = cur.idx {
if i < self.data.len() as isize { if i < self.data.len() as isize {
let mut sub_cur = self.data.get(i as usize).get_cursor(); let mut sub_cur = self.data.get(i as usize).read().unwrap().get_cursor();
if sub_cur.tree_addr.len() > 0 { if sub_cur.tree_addr.len() > 0 {
sub_cur.tree_addr.insert(0, i as isize); sub_cur.tree_addr.insert(0, i as isize);
return sub_cur; return sub_cur;
@ -99,7 +99,7 @@ impl TreeNav for ListEditor {
let old_cur = self.cursor.get(); let old_cur = self.cursor.get();
if let Some(i) = old_cur.idx { if let Some(i) = old_cur.idx {
if i < self.data.len() as isize { if i < self.data.len() as isize {
self.data.get_mut(i as usize).goto(TreeCursor::none()); self.data.get_mut(i as usize).write().unwrap().goto(TreeCursor::none());
} }
} }
@ -122,6 +122,7 @@ impl TreeNav for ListEditor {
if new_cur.leaf_mode == ListCursorMode::Select && self.data.len() > 0 { if new_cur.leaf_mode == ListCursorMode::Select && self.data.len() > 0 {
self.data self.data
.get_mut(idx as usize) .get_mut(idx as usize)
.write().unwrap()
.goto(TreeCursor { .goto(TreeCursor {
leaf_mode: ListCursorMode::Select, leaf_mode: ListCursorMode::Select,
tree_addr: vec![] tree_addr: vec![]
@ -141,6 +142,7 @@ impl TreeNav for ListEditor {
self.data self.data
.get_mut(idx as usize) .get_mut(idx as usize)
.write().unwrap()
.goto(TreeCursor { .goto(TreeCursor {
leaf_mode: new_cur.leaf_mode, leaf_mode: new_cur.leaf_mode,
tree_addr: new_cur.tree_addr[1..].iter().cloned().collect(), tree_addr: new_cur.tree_addr[1..].iter().cloned().collect(),
@ -189,6 +191,7 @@ impl TreeNav for ListEditor {
if cur.tree_addr[0] < self.data.len() as isize { if cur.tree_addr[0] < self.data.len() as isize {
if self.data if self.data
.get_mut(cur.tree_addr[0] as usize) .get_mut(cur.tree_addr[0] as usize)
.write().unwrap()
.goby(Vector2::new(direction.x, direction.y)) .goby(Vector2::new(direction.x, direction.y))
== TreeNavResult::Continue { == TreeNavResult::Continue {
self.cursor.set(ListCursor { self.cursor.set(ListCursor {
@ -224,6 +227,7 @@ impl TreeNav for ListEditor {
if idx < self.data.len() as isize { if idx < self.data.len() as isize {
self.data self.data
.get_mut(idx as usize) .get_mut(idx as usize)
.write().unwrap()
.goto(TreeCursor { .goto(TreeCursor {
leaf_mode: cur.leaf_mode, leaf_mode: cur.leaf_mode,
tree_addr: vec![] tree_addr: vec![]
@ -247,6 +251,7 @@ impl TreeNav for ListEditor {
if cur.tree_addr[0] < self.data.len() as isize { if cur.tree_addr[0] < self.data.len() as isize {
match self.data match self.data
.get_mut(cur.tree_addr[0] as usize) .get_mut(cur.tree_addr[0] as usize)
.write().unwrap()
.goby(direction) .goby(direction)
{ {
TreeNavResult::Exit => { TreeNavResult::Exit => {

35
nested/src/editors/list/pty_editor.rs
View file

@ -61,7 +61,7 @@ impl PTYListStyle {
pub fn for_node(node: &mut NestedNode, style: (&str, &str, &str)) { pub fn for_node(node: &mut NestedNode, style: (&str, &str, &str)) {
node.view = Some( node.view = Some(
Self::new(style, node.depth) Self::new(style, node.depth.get())
.pty_view( .pty_view(
&node.get_edit::<ListEditor>().unwrap().read().unwrap() &node.get_edit::<ListEditor>().unwrap().read().unwrap()
) )
@ -115,10 +115,10 @@ impl PTYListController {
} }
let editor = node.get_edit::<ListEditor>().unwrap(); let editor = node.get_edit::<ListEditor>().unwrap();
let controller = Arc::new(RwLock::new(PTYListController::from_editor( editor, split_char, close_char, node.depth ))); let controller = Arc::new(RwLock::new(PTYListController::from_editor( editor, split_char, close_char, node.depth.get() )));
node.cmd = Some(controller.clone()); node.cmd.set(Some(controller.clone()));
node.close_char = close_char; node.close_char.set(close_char);
} }
pub fn get_data_port(&self) -> OuterViewPort<dyn SequenceView<Item = NestedNode>> { pub fn get_data_port(&self) -> OuterViewPort<dyn SequenceView<Item = NestedNode>> {
@ -136,6 +136,20 @@ impl PTYListController {
pub fn set_depth(&mut self, depth: usize) { pub fn set_depth(&mut self, depth: usize) {
self.depth = depth; self.depth = depth;
} }
/*
pub fn handle_node_event(&mut self, c: &NestedNode) -> TreeNavResult {
}
pub fn handle_char_event(&mut self, c: &char) -> TreeNavResult {
}
pub fn handle_term_event(&mut self, e: &TerminalEvent) -> TreeNavResult {
}
*/
} }
use r3vi::view::singleton::SingletonView; use r3vi::view::singleton::SingletonView;
@ -161,10 +175,10 @@ impl ObjCommander for PTYListController {
if let Some(idx) = cur.idx { if let Some(idx) = cur.idx {
match cur.mode { match cur.mode {
ListCursorMode::Select => { ListCursorMode::Select => {
*e.data.get_mut(idx as usize) = node_view.get(); *e.data.get_mut(idx as usize) = Arc::new(RwLock::new(node_view.get()));
} }
ListCursorMode::Insert => { ListCursorMode::Insert => {
e.data.insert(idx as usize, node_view.get()); e.data.insert(idx as usize, Arc::new(RwLock::new(node_view.get())));
} }
} }
} }
@ -212,7 +226,7 @@ impl ObjCommander for PTYListController {
if ! remove { if ! remove {
*/ */
e.insert(node); e.insert(Arc::new(RwLock::new(node)));
TreeNavResult::Continue TreeNavResult::Continue
} }
@ -310,7 +324,7 @@ impl ObjCommander for PTYListController {
match new_edit.send_cmd_obj(cmd_obj.clone()) { match new_edit.send_cmd_obj(cmd_obj.clone()) {
TreeNavResult::Continue => { TreeNavResult::Continue => {
e.insert(new_edit); e.insert(Arc::new(RwLock::new(new_edit)));
TreeNavResult::Continue TreeNavResult::Continue
} }
@ -322,7 +336,7 @@ impl ObjCommander for PTYListController {
}, },
ListCursorMode::Select => { ListCursorMode::Select => {
if let Some(mut item) = e.get_item_mut() { if let Some(mut item) = e.get_item_mut() {
match item.send_cmd_obj(cmd_obj.clone()) { match item.write().unwrap().send_cmd_obj(cmd_obj.clone()) {
TreeNavResult::Continue => { TreeNavResult::Continue => {
TreeNavResult::Continue TreeNavResult::Continue
} }
@ -337,10 +351,9 @@ impl ObjCommander for PTYListController {
//eprintln!("close char = {:?}", item.close_char); //eprintln!("close char = {:?}", item.close_char);
if Some(c) == self.split_char { if Some(c) == self.split_char {
//eprintln!("listlist_split");
e.listlist_split(); e.listlist_split();
TreeNavResult::Continue TreeNavResult::Continue
} else if Some(c) == item.close_char { } else if Some(c) == item.read().unwrap().close_char.get() {
//eprintln!("listedit: exit from select (close)"); //eprintln!("listedit: exit from select (close)");
//item.goto(TreeCursor::none()); //item.goto(TreeCursor::none());
e.cursor.set(ListCursor { e.cursor.set(ListCursor {

72
nested/src/tree/node.rs
View file

@ -17,35 +17,41 @@ use {
#[derive(Clone)] #[derive(Clone)]
pub struct NestedNode { pub struct NestedNode {
/// depth
pub depth: usize,
/// context /// context
pub ctx: Option<Arc<RwLock<Context>>>, pub ctx: Option< Arc<RwLock<Context>> >,
/// abstract editor
pub editor: Option<OuterViewPort<dyn SingletonView<Item = Option<Arc<dyn Any + Send + Sync>>>>>,
/// abstract data view /// abstract data view
pub data: Option<Arc<RwLock<ReprTree>>>, pub data: Option< Arc<RwLock<ReprTree>> >,
/// display view /// display view
pub view: Option<OuterViewPort<dyn TerminalView>>, pub view: Option< OuterViewPort<dyn TerminalView> >,
/// diagnostics /// diagnostics
pub diag: Option<OuterViewPort<dyn SequenceView<Item = Message>>>, pub diag: Option< OuterViewPort<dyn SequenceView<Item = Message>> >,
/// commander /// depth
pub close_char: Option<char>, pub depth: SingletonBuffer< usize >,
pub cmd: Option<Arc<RwLock<dyn ObjCommander + Send + Sync>>>,
/// tree navigation /// abstract editor
pub tree_nav: Option<Arc<RwLock<dyn TreeNav + Send + Sync>>>, pub editor: SingletonBuffer<
Option< Arc<dyn Any + Send + Sync> >
>,
/// commander & navigation
pub cmd: SingletonBuffer<
Option< Arc<RwLock<dyn ObjCommander + Send + Sync>> >
>,
pub close_char: SingletonBuffer<
Option< char >
>,
pub tree_nav: SingletonBuffer<
Option< Arc<RwLock<dyn TreeNav + Send + Sync>> >
>,
} }
impl ObjCommander for NestedNode { impl ObjCommander for NestedNode {
fn send_cmd_obj(&mut self, cmd_obj: Arc<RwLock<ReprTree>>) -> TreeNavResult { fn send_cmd_obj(&mut self, cmd_obj: Arc<RwLock<ReprTree>>) -> TreeNavResult {
if let Some(cmd) = self.cmd.as_ref() { if let Some(cmd) = self.cmd.get() {
// todo: filter out tree-nav cmds and send them to tree_nav // todo: filter out tree-nav cmds and send them to tree_nav
cmd.write().unwrap().send_cmd_obj(cmd_obj) cmd.write().unwrap().send_cmd_obj(cmd_obj)
} else { } else {
@ -74,7 +80,7 @@ impl TerminalEditor for NestedNode {
fn handle_terminal_event(&mut self, event: &TerminalEvent) -> TerminalEditorResult { fn handle_terminal_event(&mut self, event: &TerminalEvent) -> TerminalEditorResult {
let buf = SingletonBuffer::new(event.clone()); let buf = SingletonBuffer::new(event.clone());
if let (Some(cmd),Some(ctx)) = (self.cmd.as_ref(),self.ctx.as_ref()) { if let (Some(cmd),Some(ctx)) = (self.cmd.get(),self.ctx.as_ref()) {
cmd.write().unwrap().send_cmd_obj( cmd.write().unwrap().send_cmd_obj(
ReprTree::new_leaf( ReprTree::new_leaf(
ctx.read().unwrap().type_term_from_str("( TerminalEvent )").unwrap(), ctx.read().unwrap().type_term_from_str("( TerminalEvent )").unwrap(),
@ -88,7 +94,7 @@ impl TerminalEditor for NestedNode {
impl TreeNav for NestedNode { impl TreeNav for NestedNode {
fn get_cursor(&self) -> TreeCursor { fn get_cursor(&self) -> TreeCursor {
if let Some(tn) = self.tree_nav.as_ref() { if let Some(tn) = self.tree_nav.get() {
tn.read().unwrap().get_cursor() tn.read().unwrap().get_cursor()
} else { } else {
TreeCursor::default() TreeCursor::default()
@ -96,7 +102,7 @@ impl TreeNav for NestedNode {
} }
fn get_addr_view(&self) -> OuterViewPort<dyn SequenceView<Item = isize>> { fn get_addr_view(&self) -> OuterViewPort<dyn SequenceView<Item = isize>> {
if let Some(tn) = self.tree_nav.as_ref() { if let Some(tn) = self.tree_nav.get() {
tn.read().unwrap().get_addr_view() tn.read().unwrap().get_addr_view()
} else { } else {
OuterViewPort::default() OuterViewPort::default()
@ -104,7 +110,7 @@ impl TreeNav for NestedNode {
} }
fn get_mode_view(&self) -> OuterViewPort<dyn SingletonView<Item = ListCursorMode>> { fn get_mode_view(&self) -> OuterViewPort<dyn SingletonView<Item = ListCursorMode>> {
if let Some(tn) = self.tree_nav.as_ref() { if let Some(tn) = self.tree_nav.get() {
tn.read().unwrap().get_mode_view() tn.read().unwrap().get_mode_view()
} else { } else {
OuterViewPort::default() OuterViewPort::default()
@ -112,7 +118,7 @@ impl TreeNav for NestedNode {
} }
fn get_cursor_warp(&self) -> TreeCursor { fn get_cursor_warp(&self) -> TreeCursor {
if let Some(tn) = self.tree_nav.as_ref() { if let Some(tn) = self.tree_nav.get() {
tn.read().unwrap().get_cursor_warp() tn.read().unwrap().get_cursor_warp()
} else { } else {
TreeCursor::default() TreeCursor::default()
@ -124,7 +130,7 @@ impl TreeNav for NestedNode {
} }
fn goby(&mut self, direction: Vector2<isize>) -> TreeNavResult { fn goby(&mut self, direction: Vector2<isize>) -> TreeNavResult {
if let Some(tn) = self.tree_nav.as_ref() { if let Some(tn) = self.tree_nav.get() {
tn.write().unwrap().goby(direction) tn.write().unwrap().goby(direction)
} else { } else {
TreeNavResult::Exit TreeNavResult::Exit
@ -132,7 +138,7 @@ impl TreeNav for NestedNode {
} }
fn goto(&mut self, new_cursor: TreeCursor) -> TreeNavResult { fn goto(&mut self, new_cursor: TreeCursor) -> TreeNavResult {
if let Some(tn) = self.tree_nav.as_ref() { if let Some(tn) = self.tree_nav.get() {
tn.write().unwrap().goto(new_cursor) tn.write().unwrap().goto(new_cursor)
} else { } else {
TreeNavResult::Exit TreeNavResult::Exit
@ -149,15 +155,15 @@ impl Diagnostics for NestedNode {
impl NestedNode { impl NestedNode {
pub fn new(depth: usize) -> Self { pub fn new(depth: usize) -> Self {
NestedNode { NestedNode {
depth,
ctx: None, ctx: None,
data: None, data: None,
editor: None,
view: None, view: None,
diag: None, diag: None,
cmd: None, depth: SingletonBuffer::new(depth),
close_char: None, editor: SingletonBuffer::new(None),
tree_nav: None cmd: SingletonBuffer::new(None),
close_char: SingletonBuffer::new(None),
tree_nav: SingletonBuffer::new(None)
} }
} }
@ -197,7 +203,7 @@ impl NestedNode {
} }
pub fn set_editor(mut self, editor: Arc<dyn Any + Send + Sync>) -> Self { pub fn set_editor(mut self, editor: Arc<dyn Any + Send + Sync>) -> Self {
self.editor = Some(SingletonBuffer::new(Some(editor)).get_port()); self.editor.set(Some(editor));
self self
} }
@ -207,12 +213,12 @@ impl NestedNode {
} }
pub fn set_cmd(mut self, cmd: Arc<RwLock<dyn ObjCommander + Send + Sync>>) -> Self { pub fn set_cmd(mut self, cmd: Arc<RwLock<dyn ObjCommander + Send + Sync>>) -> Self {
self.cmd = Some(cmd); self.cmd.set(Some(cmd));
self self
} }
pub fn set_nav(mut self, nav: Arc<RwLock<dyn TreeNav + Send + Sync>>) -> Self { pub fn set_nav(mut self, nav: Arc<RwLock<dyn TreeNav + Send + Sync>>) -> Self {
self.tree_nav = Some(nav); self.tree_nav.set(Some(nav));
self self
} }
@ -268,8 +274,8 @@ impl NestedNode {
} }
*/ */
pub fn get_edit<T: Send + Sync + 'static>(&self) -> Option<Arc<RwLock<T>>> { pub fn get_edit<T: Send + Sync + 'static>(&self) -> Option<Arc<RwLock<T>>> {
if let Some(edit) = self.editor.clone() { if let Some(edit) = self.editor.get() {
if let Ok(edit) = edit.get_view().unwrap().get().unwrap().downcast::<RwLock<T>>() { if let Ok(edit) = edit.downcast::<RwLock<T>>() {
Some(edit) Some(edit)
} else { } else {
None None

2
nested/src/type_system/context.rs
View file

@ -189,7 +189,7 @@ impl Context {
self.add_morphism(morphism_pattern, Arc::new(move |node, dst_type| { self.add_morphism(morphism_pattern, Arc::new(move |node, dst_type| {
let ctx = node.ctx.clone().unwrap(); let ctx = node.ctx.clone().unwrap();
let depth = node.depth; let depth = node.depth;
mk_editor(ctx, dst_type, depth) mk_editor(ctx, dst_type, depth.get())
})); }));
} }

35
nested/src/type_system/editor.rs
View file

@ -33,7 +33,7 @@ pub struct TypeTermEditor {
ctx: Arc<RwLock<Context>>, ctx: Arc<RwLock<Context>>,
state: State, state: State,
cur_node: SingletonBuffer<NestedNode> cur_node: SingletonBuffer< NestedNode >
} }
impl TypeTermEditor { impl TypeTermEditor {
@ -64,17 +64,15 @@ impl TypeTermEditor {
Arc::new( Arc::new(
|mut node, _dst_type:_| { |mut node, _dst_type:_| {
//eprintln!("morphism to typeterm"); //eprintln!("morphism to typeterm");
PTYListController::for_node( &mut node, Some(' '), None ); PTYListController::for_node( &mut node, Some(' '), None );
PTYListStyle::for_node( &mut node, ("","","") ); PTYListStyle::for_node( &mut node, ("","","") );
let mut new_node = TypeTermEditor::with_node( node.ctx.clone().unwrap(), node.depth.get(), node.clone(), State::Any );
let mut new_node = TypeTermEditor::with_node( node.ctx.clone().unwrap(), node.depth, node.clone(), State::Any );
let item_nodes = node.get_edit::<ListEditor>().clone().unwrap(); let item_nodes = node.get_edit::<ListEditor>().clone().unwrap();
let item_nodes = item_nodes.read().unwrap(); let item_nodes = item_nodes.read().unwrap();
for i in 0..item_nodes.data.len() { for i in 0..item_nodes.data.len() {
if let Some(x) = item_nodes.data.get(i).data { if let Some(x) = &item_nodes.data.get(i).read().unwrap().data {
//eprintln!("item with {:?}", x); //eprintln!("item with {:?}", x);
//let c = x.read().unwrap().get_view::<dyn SingletonView<Item = NestedNode>>().unwrap().get(); //let c = x.read().unwrap().get_view::<dyn SingletonView<Item = NestedNode>>().unwrap().get();
new_node.send_cmd_obj( new_node.send_cmd_obj(
@ -99,7 +97,6 @@ impl TypeTermEditor {
let mut node = match new_state { let mut node = match new_state {
State::Char => { State::Char => {
let mut node = Context::make_node( &self.ctx, (&self.ctx, "( Char )").into(), 0 ).unwrap(); let mut node = Context::make_node( &self.ctx, (&self.ctx, "( Char )").into(), 0 ).unwrap();
let mut grid = r3vi::buffer::index_hashmap::IndexBuffer::new(); let mut grid = r3vi::buffer::index_hashmap::IndexBuffer::new();
grid.insert_iter( grid.insert_iter(
@ -110,7 +107,7 @@ impl TypeTermEditor {
] ]
); );
node.close_char = Some('\''); node.close_char.set(Some('\''));
node.view = Some( node.view = Some(
grid.get_port() grid.get_port()
.flatten() .flatten()
@ -153,21 +150,6 @@ impl TypeTermEditor {
cur_node: SingletonBuffer::new(node) cur_node: SingletonBuffer::new(node)
}; };
let ed_view = editor.cur_node
.get_port()
.map(
|node|
match node.editor {
Some(e) => {
e
},
None => {
r3vi::buffer::singleton::SingletonBuffer::new(None).get_port()
}
}
)
.flatten();
let view = editor.cur_node let view = editor.cur_node
.get_port() .get_port()
.map( .map(
@ -190,12 +172,10 @@ impl TypeTermEditor {
let mut node = NestedNode::new(depth) let mut node = NestedNode::new(depth)
.set_ctx(ctx) .set_ctx(ctx)
.set_view( view ) .set_view(view)
.set_nav(editor.clone()) .set_nav(editor.clone())
.set_cmd(editor.clone()); .set_cmd(editor.clone())
.set_editor(editor.clone());
node.editor = Some(ed_view);
//node.editor.unwrap().get_view().unwrap().get().unwrap()
node node
} }
@ -308,7 +288,6 @@ impl ObjCommander for TypeTermEditor {
TreeNavResult::Exit TreeNavResult::Exit
} }
} }
} }
} }
} }

4
nested/src/type_system/make_editor.rs
View file

@ -192,8 +192,8 @@ pub fn init_math_ctx(parent: Arc<RwLock<Context>>) -> Arc<RwLock<Context>> {
ctx.write().unwrap().add_morphism(pattern, ctx.write().unwrap().add_morphism(pattern,
Arc::new( Arc::new(
|mut node, dst_type| { |mut node, dst_type| {
let depth = node.depth; let depth = node.depth.get();
let editor = node.editor.clone().unwrap().get_view().unwrap().get().unwrap().downcast::<RwLock<ListEditor>>().unwrap(); let editor = node.editor.get().unwrap().downcast::<RwLock<ListEditor>>().unwrap();
// todo: check src_type parameter to be ( Digit radix ) // todo: check src_type parameter to be ( Digit radix )