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

context: add add_varname & minor debug stuff

Browse source
This commit is contained in:
Michael Sippel 2023-08-17 22:48:09 +02:00
parent 4cdedca62f
commit 7a55d917cc
Signed by: senvas
GPG key ID: F96CF119C34B64A6
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,7 @@ pub struct MorphismTypePattern {
impl MorphismType { impl MorphismType {
pub fn to_str(&self, ctx: &Context) -> String { pub fn to_str(&self, ctx: &Context) -> String {
format!("src_tyid = {:?}, dst_tyid = {:?}", format!("{:?} -> {:?}",
if let Some(t) = self.src_type.as_ref() { if let Some(t) = self.src_type.as_ref() {
ctx.type_term_to_str(t) ctx.type_term_to_str(t)
} else { } else {
@ -58,7 +58,7 @@ impl MorphismType {
impl MorphismTypePattern { impl MorphismTypePattern {
pub fn to_str(&self, ctx: &Context) -> String { pub fn to_str(&self, ctx: &Context) -> String {
format!("src_tyid = {:?}, dst_tyid = {:?}", format!("{:?} -> {:?}",
if let Some(t) = self.src_tyid.as_ref() { if let Some(t) = self.src_tyid.as_ref() {
ctx.type_term_to_str(&TypeTerm::TypeID(t.clone())) ctx.type_term_to_str(&TypeTerm::TypeID(t.clone()))
} else { } else {
@ -154,12 +154,16 @@ impl Context {
} }
} }
pub fn add_typename(&mut self, tn: String) -> TypeID { pub fn add_typename(&mut self, tn: &str) -> TypeID {
self.type_dict.write().unwrap().add_typename(tn) self.type_dict.write().unwrap().add_typename(tn.to_string())
}
pub fn add_varname(&mut self, vn: &str) -> TypeID {
self.type_dict.write().unwrap().add_varname(vn.to_string())
} }
pub fn add_list_typename(&mut self, tn: String) { pub fn add_list_typename(&mut self, tn: String) {
let tid = self.add_typename(tn); let tid = self.add_typename(&tn);
self.list_types.push( tid ); self.list_types.push( tid );
} }
@ -252,7 +256,7 @@ impl Context {
let mk_node = ctx.read().unwrap().get_morphism(MorphismType { let mk_node = ctx.read().unwrap().get_morphism(MorphismType {
src_type: None, src_type: None,
dst_type: type_term.clone() dst_type: type_term.clone()
}).expect("morphism"); }).expect(&format!("morphism {}", ctx.read().unwrap().type_term_to_str(&type_term)));
/* create new context per node ?? too heavy.. whats the reason? TODO */ /* create new context per node ?? too heavy.. whats the reason? TODO */
@ -268,6 +272,7 @@ impl Context {
pub fn morph_node(mut node: NestedNode, dst_type: TypeTerm) -> NestedNode { pub fn morph_node(mut node: NestedNode, dst_type: TypeTerm) -> NestedNode {
let mut src_type = node.data.read().unwrap().get_type().clone(); let mut src_type = node.data.read().unwrap().get_type().clone();
let pattern = MorphismType { src_type: Some(src_type), dst_type: dst_type.clone() }; let pattern = MorphismType { src_type: Some(src_type), dst_type: dst_type.clone() };
/* it is not univesally true to always use ascend. /* it is not univesally true to always use ascend.
*/ */
node.data = node.data =
@ -276,7 +281,7 @@ impl Context {
dst_type.clone() dst_type.clone()
); );
let m = node.ctx.read().unwrap().get_morphism(pattern); let m = node.ctx.read().unwrap().get_morphism(pattern.clone());
if let Some(transform) = m { if let Some(transform) = m {
if let Some(new_node) = transform(node.clone(), dst_type) { if let Some(new_node) = transform(node.clone(), dst_type) {
new_node new_node
@ -284,7 +289,7 @@ impl Context {
node.clone() node.clone()
} }
} else { } else {
eprintln!("could not find morphism"); eprintln!("could not find morphism {}", pattern.to_str(&node.ctx.read().unwrap()));
node node
} }
} }