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

wip: Refactor ReprTree; add ReprTreeBuilder

Browse source
This commit is contained in:
Michael Sippel 2024-12-24 12:50:02 +01:00
parent 41c02465be
commit 26186b3375
Signed by: senvas
GPG key ID: F96CF119C34B64A6
20 changed files with 924 additions and 563 deletions
examples/tty-04-posint/src
main.rs

92
examples/tty-04-posint/src/main.rs
View file

@ -16,7 +16,7 @@ use {
editors::{
ObjCommander
},
repr_tree::{Context, ReprTree, ReprTreeExt, ReprLeaf},
repr_tree::{Context, ReprTreeBuilder, ReprTree, ReprTreeExt, ReprLeaf},
edit_tree::{EditTree, TreeNav, TreeCursor}
},
nested_tty::{
@ -46,76 +46,49 @@ async fn main() {
/* Create a Representation-Tree of type `ℕ`
* with a specific representation-path (big-endian hexadecimal string)
*/
let mut rt_int = nested::repr_tree::ReprTree::from_str(
/* TYPE */
let int_builder = ReprTreeBuilder::new( ctx.clone() )
.require(Context::parse(&ctx,
"ℕ ~ <PosInt 16 BigEndian> ~ <Seq~List <Digit 16>~Char> ~ EditTree"))
/*
.require(Context::parse(&ctx,
"ℕ ~ <PosInt 16 LittleEndian> ~ <Seq~List <Digit 16>> ~ EditTree"))
.require(Context::parse(&ctx,
"ℕ ~ <PosInt 16 BigEndian> ~ EditTree"))
.require(Context::parse(&ctx,
"ℕ ~ <PosInt 8 BigEndian> ~ EditTree"))
.require(Context::parse(&ctx,
"ℕ ~ <PosInt 2 BigEndian> ~ EditTree"))
*/
;
let mut rt_int = nested::repr_tree::ReprTree::from_str("cff");
rt_int.write().unwrap().set_halo(
/* HALO TYPE */
Context::parse(&ctx, "
ℕ
~ <PosInt 16 BigEndian>
~ <Seq <Digit 16>>
~ <List <Digit 16>>
~ <List Char>
~ <Vec Char>
"),
/* VALUE */
"cff"
")
);
/* initially copy values from Vec to EditTree...
*/
ctx.read().unwrap().build_repr_tree(
&rt_int,
Context::parse(&ctx, "ℕ ~ <PosInt 16 BigEndian> ~ <Seq~List <Digit 16>~Char> ~ <Vec Char>"),
vec![
Context::parse(&ctx, "ℕ ~ <PosInt 16 BigEndian> ~ <Seq~List <Digit 16>> ~ EditTree"),
Context::parse(&ctx, "ℕ ~ <PosInt 16 LittleEndian> ~ <Seq~List <Digit 16>> ~ EditTree"),
]);
eprintln!("rt_int = \n{}\n", rt_int.read().unwrap().fmt(&ctx, 0));
fn set_master(
ctx: &Arc<RwLock<Context>>,
rt: &Arc<RwLock<ReprTree>>,
mut leaves: Vec< laddertypes::TypeTerm >,
master_idx: usize
) {
eprintln!("set master to {}", master_idx);
if master_idx < leaves.len() {
let master = leaves.remove( master_idx );
rt.write().unwrap().detach( &ctx );
ctx.read().unwrap().build_repr_tree(
rt,
master,
leaves
);
}
}
rt_int = int_builder.build_from( rt_int ).expect("cant build initial repr tree");
let editor_types = vec![
Context::parse(&ctx,
"ℕ ~ <PosInt 16 BigEndian> ~ <Seq~List <Digit 16>> ~ EditTree"),
Context::parse(&ctx,
"ℕ ~ <PosInt 16 LittleEndian> ~ <Seq~List <Digit 16>> ~ EditTree"),
Context::parse(&ctx,
"ℕ ~ <PosInt 16 BigEndian> ~ EditTree"),
Context::parse(&ctx,
"ℕ ~ <PosInt 8 BigEndian> ~ EditTree"),
Context::parse(&ctx,
"ℕ ~ <PosInt 2 BigEndian> ~ EditTree"),
];
eprintln!("rt_int = \n{}\n", rt_int.read().unwrap().fmt(&ctx, 0));
set_master(&ctx, &rt_int, editor_types.clone(), 0);
return;
/* list of editors
*/
let mut list_editor = nested::editors::list::ListEditor::new(ctx.clone(), Context::parse(&ctx, "<Seq Char>"));
// add all desired editors to the list
for leaf in editor_types.iter() {
let et =
rt_int
.descend(leaf.clone()).unwrap()
.edittree(&ctx).get();
et.write().unwrap().goto(TreeCursor::none());
list_editor.data.push(et);
for edit_leaf in int_builder.required_leaves {
let leaf_rt = rt_int.descend(edit_leaf.clone()).unwrap();
list_editor.data.push(leaf_rt);
}
let mut edittree = list_editor.into_node(SingletonBuffer::new(0).get_port());
@ -128,7 +101,7 @@ async fn main() {
tree_addr: vec![0,0]
});
let edittree = Arc::new(RwLock::new(edittree));
/* setup terminal
*/
let app = TTYApplication::new({
@ -137,7 +110,6 @@ async fn main() {
let ctx = ctx.clone();
let rt_int = rt_int.clone();
let last_idx = RwLock::new(0);
let editor_types = editor_types.clone();
move |ev| {
let cur = edittree.read().unwrap().get_cursor();
if cur.tree_addr.len() > 0 {
@ -145,6 +117,7 @@ async fn main() {
let ci = cur.tree_addr[0];
if *li != ci {
/*
eprintln!("----------------------------------");
set_master(
&ctx,
@ -152,6 +125,8 @@ async fn main() {
editor_types.clone(),
ci as usize
);
*/
int_builder.update( &rt_int, int_builder.required_leaves[ci as usize].clone() );
*li = ci;
}
}
@ -177,7 +152,7 @@ async fn main() {
let halo_type = rt_edittree.read().unwrap().get_halo_type().clone();
let edittree = rt_edittree.edittree( &ctx );
comp.push( nested_tty::make_label( &ctx.read().unwrap().type_term_to_str(&halo_type) )
comp.push( nested_tty::make_label( &ctx.read().unwrap().type_term_to_str(&halo_type) )
.map_item(|_pt, atom| atom.add_style_front(TerminalStyle::fg_color((90,90,90))))
.offset(Vector2::new(1,y)));
@ -186,7 +161,7 @@ async fn main() {
}
let mut y = 1;
for t in editor_types.iter() {
for t in int_builder.required_leaves.iter() {
show_edit_tree(&ctx, &mut comp, &rt_int.descend(t.clone()).expect(""), y);
y += 3;
}
@ -196,4 +171,3 @@ async fn main() {
*/
app.show().await.expect("output error!");
}