waalge/aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

all but six tests passing

Browse Source
This commit is contained in:
microproofs
2023-07-25 15:46:53 -04:00
committed by Kasey
parent 6eeb282dee
commit 72b6f0f847
2 changed files with 129 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
crates/aiken-lang/src/gen_uplc/tree.rs
View File

@@ -185,6 +185,12 @@ pub enum AirStatement {
tuple: Box<AirTree>,
},
// Misc.
FieldsEmpty {
constr: Box<AirTree>,
},
ListEmpty {
list: Box<AirTree>,
},
NoOp,
}
@@ -339,12 +345,6 @@ pub enum AirExpression {
msg: Box<AirTree>,
then: Box<AirTree>,
},
FieldsEmpty {
constr: Box<AirTree>,
},
ListEmpty {
list: Box<AirTree>,
},
}
impl AirTree {
@@ -769,12 +769,18 @@ impl AirTree {
}
}
pub fn fields_empty(constr: AirTree) -> AirTree {
AirTree::Expression(AirExpression::FieldsEmpty {
constr: constr.into(),
})
AirTree::Statement {
statement: AirStatement::FieldsEmpty {
constr: constr.into(),
},
hoisted_over: None,
}
}
pub fn list_empty(list: AirTree) -> AirTree {
AirTree::Expression(AirExpression::ListEmpty { list: list.into() })
AirTree::Statement {
statement: AirStatement::ListEmpty { list: list.into() },
hoisted_over: None,
}
}
pub fn hoist_over(mut self, next_exp: AirTree) -> AirTree {
match &mut self {
@@ -969,6 +975,14 @@ impl AirTree {
AirStatement::NoOp => {
air_vec.push(Air::NoOp);
}
AirStatement::FieldsEmpty { constr } => {
air_vec.push(Air::FieldsEmpty);
constr.create_air_vec(air_vec);
}
AirStatement::ListEmpty { list } => {
air_vec.push(Air::ListEmpty);
list.create_air_vec(air_vec);
}
};
exp.create_air_vec(air_vec);
}
@@ -1212,14 +1226,6 @@ impl AirTree {
msg.create_air_vec(air_vec);
then.create_air_vec(air_vec);
}
AirExpression::FieldsEmpty { constr } => {
air_vec.push(Air::FieldsEmpty);
constr.create_air_vec(air_vec);
}
AirExpression::ListEmpty { list } => {
air_vec.push(Air::ListEmpty);
list.create_air_vec(air_vec);
}
},
AirTree::UnhoistedSequence(_) => {
unreachable!("FIRST RESOLVE ALL UNHOISTED SEQUENCES")
@@ -1266,9 +1272,6 @@ impl AirTree {
| AirExpression::WrapClause { then, .. }
| AirExpression::TupleClause { then, .. }
| AirExpression::Finally { then, .. } => then.return_type(),
AirExpression::FieldsEmpty { constr } => constr.return_type(),
AirExpression::ListEmpty { list } => list.return_type(),
},
_ => unreachable!(),
}
@@ -1425,6 +1428,22 @@ impl AirTree {
);
}
AirStatement::NoOp => {}
AirStatement::FieldsEmpty { constr } => {
constr.do_traverse_tree_with(
tree_path,
current_depth + 1,
index_count.next_number(),
with,
);
}
AirStatement::ListEmpty { list } => {
list.do_traverse_tree_with(
tree_path,
current_depth + 1,
index_count.next_number(),
with,
);
}
};
hoisted_over.do_traverse_tree_with(
@@ -1721,22 +1740,6 @@ impl AirTree {
with,
);
}
AirExpression::FieldsEmpty { constr } => {
constr.do_traverse_tree_with(
tree_path,
current_depth + 1,
index_count.next_number(),
with,
);
}
AirExpression::ListEmpty { list } => {
list.do_traverse_tree_with(
tree_path,
current_depth + 1,
index_count.next_number(),
with,
);
}
_ => {}
},
a => unreachable!("GOT THIS {:#?}", a),
@@ -1861,6 +1864,24 @@ impl AirTree {
}
}
AirStatement::DefineFunc { .. } => unreachable!(),
AirStatement::FieldsEmpty { constr } => {
if *index == 0 {
constr.as_mut().do_find_air_tree_node(tree_path_iter)
} else if *index == 1 {
hoisted_over.as_mut().do_find_air_tree_node(tree_path_iter)
} else {
panic!("Tree Path index outside tree children nodes")
}
}
AirStatement::ListEmpty { list } => {
if *index == 0 {
list.as_mut().do_find_air_tree_node(tree_path_iter)
} else if *index == 1 {
hoisted_over.as_mut().do_find_air_tree_node(tree_path_iter)
} else {
panic!("Tree Path index outside tree children nodes")
}
}
},
AirTree::Expression(e) => match e {
AirExpression::List { items, .. }
@@ -2037,20 +2058,6 @@ impl AirTree {
panic!("Tree Path index outside tree children nodes")
}
}
AirExpression::FieldsEmpty { constr } => {
if *index == 0 {
constr.as_mut().do_find_air_tree_node(tree_path_iter)
} else {
panic!("Tree Path index outside tree children nodes")
}
}
AirExpression::ListEmpty { list } => {
if *index == 0 {
list.as_mut().do_find_air_tree_node(tree_path_iter)
} else {
panic!("Tree Path index outside tree children nodes")
}
}
_ => unreachable!(
"A tree node with no children was encountered with a longer tree path."
),