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

checkpoint

This commit is contained in:
microproofs 2023-07-14 17:04:43 -04:00 committed by Kasey
parent 9704cafefe
commit 947c118175
3 changed files with 45 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/aiken-lang/src/gen_uplc2.rs
View File

@ -377,7 +377,6 @@ impl<'a> CodeGenerator<'a> {
&clauses,
last_clause,
&subject.tipo(),
tipo,
&mut ClauseProperties::init(
&subject.tipo(),
constr_var.clone(),
@ -1356,7 +1355,6 @@ impl<'a> CodeGenerator<'a> {
clauses: &[TypedClause],
final_clause: TypedClause,
subject_tipo: &Arc<Type>,
return_tipo: &Arc<Type>,
props: &mut ClauseProperties,
) -> AirTree {
assert!(
@ -1414,7 +1412,6 @@ impl<'a> CodeGenerator<'a> {
rest_clauses,
final_clause,
subject_tipo,
return_tipo,
&mut next_clause_props,
),
complex_clause,
@ -1426,7 +1423,6 @@ impl<'a> CodeGenerator<'a> {
rest_clauses,
final_clause,
subject_tipo,
return_tipo,
&mut next_clause_props,
),
)
@ -1441,7 +1437,6 @@ impl<'a> CodeGenerator<'a> {
rest_clauses,
final_clause,
subject_tipo,
return_tipo,
&mut next_clause_props,
),
complex_clause,
@ -1477,7 +1472,6 @@ impl<'a> CodeGenerator<'a> {
rest_clauses,
final_clause,
subject_tipo,
return_tipo,
&mut next_clause_props,
),
);
@ -1554,7 +1548,6 @@ impl<'a> CodeGenerator<'a> {
rest_clauses,
final_clause,
subject_tipo,
return_tipo,
&mut next_clause_props,
),
)
@ -1567,7 +1560,6 @@ impl<'a> CodeGenerator<'a> {
rest_clauses,
final_clause,
subject_tipo,
return_tipo,
&mut next_clause_props,
),
next_tail_name,
@ -1611,7 +1603,6 @@ impl<'a> CodeGenerator<'a> {
rest_clauses,
final_clause,
subject_tipo,
return_tipo,
&mut next_clause_props,
),
)
@ -1626,7 +1617,6 @@ impl<'a> CodeGenerator<'a> {
rest_clauses,
final_clause,
subject_tipo,
return_tipo,
&mut next_clause_props,
),
props.complex_clause,

128
crates/aiken-lang/src/gen_uplc2/air.rs
View File

@ -87,19 +87,19 @@ pub enum Air {
subject_name: String,
},
Clause {
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
subject_name: String,
complex_clause: bool,
},
ListClause {
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
tail_name: String,
next_tail_name: Option<String>,
complex_clause: bool,
},
WrapClause,
TupleClause {
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
indices: IndexSet<(usize, String)>,
predefined_indices: IndexSet<(usize, String)>,
subject_name: String,
@ -108,16 +108,16 @@ pub enum Air {
},
ClauseGuard {
subject_name: String,
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
},
ListClauseGuard {
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
tail_name: String,
next_tail_name: Option<String>,
inverse: bool,
},
TupleGuard {
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
indices: IndexSet<(usize, String)>,
subject_name: String,
type_count: usize,
@ -181,118 +181,4 @@ pub enum Air {
ListEmpty,
}
impl Air {
pub fn tipo(&self) -> Option<Arc<Type>> {
match self {
Air::Int { .. } => Some(
Type::App {
public: true,
module: String::new(),
name: "Int".to_string(),
args: vec![],
}
.into(),
),
Air::String { .. } => Some(
Type::App {
public: true,
module: String::new(),
name: "String".to_string(),
args: vec![],
}
.into(),
),
Air::ByteArray { .. } => Some(
Type::App {
public: true,
module: String::new(),
name: "ByteArray".to_string(),
args: vec![],
}
.into(),
),
Air::Bool { .. } => Some(
Type::App {
public: true,
module: String::new(),
name: "Bool".to_string(),
args: vec![],
}
.into(),
),
Air::Void { .. } => Some(
Type::App {
public: true,
module: String::new(),
name: "Void".to_string(),
args: vec![],
}
.into(),
),
Air::WrapData { .. } => Some(
Type::App {
public: true,
module: String::new(),
name: "Data".to_string(),
args: vec![],
}
.into(),
),
Air::Var { constructor, .. } => Some(constructor.tipo.clone()),
Air::List { tipo, .. }
| Air::Tuple { tipo, .. }
| Air::Call { tipo, .. }
| Air::Builtin { tipo, .. }
| Air::BinOp { tipo, .. }
| Air::UnWrapData { tipo, .. }
| Air::When { tipo, .. }
| Air::Clause { tipo, .. }
| Air::ListClause { tipo, .. }
| Air::TupleClause { tipo, .. }
| Air::ClauseGuard { tipo, .. }
| Air::TupleGuard { tipo, .. }
| Air::If { tipo, .. }
| Air::ListClauseGuard { tipo, .. }
| Air::Constr { tipo, .. }
| Air::RecordUpdate { tipo, .. }
| Air::RecordAccess { tipo, .. }
| Air::ListAccessor { tipo, .. }
| Air::ListExpose { tipo, .. }
| Air::TupleAccessor { tipo, .. }
| Air::TupleIndex { tipo, .. }
| Air::ErrorTerm { tipo, .. }
| Air::Trace { tipo, .. } => Some(tipo.clone()),
Air::DefineFunc { .. }
| Air::Fn { .. }
| Air::Let { .. }
| Air::WrapClause { .. }
| Air::AssertConstr { .. }
| Air::AssertBool { .. }
| Air::Finally { .. }
| Air::FieldsExpose { .. }
| Air::FieldsEmpty { .. }
| Air::ListEmpty { .. }
| Air::NoOp { .. } => None,
Air::UnOp { op, .. } => match op {
UnOp::Not => Some(
Type::App {
public: true,
module: String::new(),
name: "Bool".to_string(),
args: vec![],
}
.into(),
),
UnOp::Negate => Some(
Type::App {
public: true,
module: String::new(),
name: "Int".to_string(),
args: vec![],
}
.into(),
),
},
}
}
}
impl Air {}

72
crates/aiken-lang/src/gen_uplc2/tree.rs
View File

@ -47,17 +47,17 @@ pub enum AirStatement {
// Clause Guards
ClauseGuard {
subject_name: String,
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
pattern: Box<AirTree>,
},
ListClauseGuard {
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
tail_name: String,
next_tail_name: Option<String>,
inverse: bool,
},
TupleGuard {
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
indices: IndexSet<(usize, String)>,
subject_name: String,
type_count: usize,
@ -167,7 +167,7 @@ pub enum AirExpression {
clauses: Box<AirTree>,
},
Clause {
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
subject_name: String,
complex_clause: bool,
pattern: Box<AirTree>,
@ -175,7 +175,7 @@ pub enum AirExpression {
otherwise: Box<AirTree>,
},
ListClause {
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
tail_name: String,
next_tail_name: Option<String>,
complex_clause: bool,
@ -187,7 +187,7 @@ pub enum AirExpression {
otherwise: Box<AirTree>,
},
TupleClause {
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
indices: IndexSet<(usize, String)>,
predefined_indices: IndexSet<(usize, String)>,
subject_name: String,
@ -418,13 +418,13 @@ impl AirTree {
pub fn clause(
subject_name: impl ToString,
pattern: AirTree,
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
then: AirTree,
otherwise: AirTree,
complex_clause: bool,
) -> AirTree {
AirTree::Expression(AirExpression::Clause {
tipo,
subject_tipo,
subject_name: subject_name.to_string(),
complex_clause,
pattern: pattern.into(),
@ -434,14 +434,14 @@ impl AirTree {
}
pub fn list_clause(
tail_name: impl ToString,
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
then: AirTree,
otherwise: AirTree,
next_tail_name: Option<String>,
complex_clause: bool,
) -> AirTree {
AirTree::Expression(AirExpression::ListClause {
tipo,
subject_tipo,
tail_name: tail_name.to_string(),
next_tail_name,
complex_clause,
@ -451,17 +451,17 @@ impl AirTree {
}
pub fn tuple_clause(
subject_name: impl ToString,
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
indices: IndexSet<(usize, String)>,
predefined_indices: IndexSet<(usize, String)>,
then: AirTree,
otherwise: AirTree,
complex_clause: bool,
) -> AirTree {
let type_count = tipo.get_inner_types().len();
let type_count = subject_tipo.get_inner_types().len();
AirTree::Expression(AirExpression::TupleClause {
tipo,
subject_tipo,
indices,
predefined_indices,
subject_name: subject_name.to_string(),
@ -477,11 +477,15 @@ impl AirTree {
otherwise: otherwise.into(),
})
}
pub fn clause_guard(subject_name: impl ToString, pattern: AirTree, tipo: Arc<Type>) -> AirTree {
pub fn clause_guard(
subject_name: impl ToString,
pattern: AirTree,
subject_tipo: Arc<Type>,
) -> AirTree {
AirTree::Statement {
statement: AirStatement::ClauseGuard {
subject_name: subject_name.to_string(),
tipo,
subject_tipo,
pattern: pattern.into(),
},
hoisted_over: None,
@ -489,13 +493,13 @@ impl AirTree {
}
pub fn list_clause_guard(
tail_name: impl ToString,
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
inverse: bool,
next_tail_name: Option<String>,
) -> AirTree {
AirTree::Statement {
statement: AirStatement::ListClauseGuard {
tipo,
subject_tipo,
tail_name: tail_name.to_string(),
next_tail_name,
inverse,
@ -505,15 +509,15 @@ impl AirTree {
}
pub fn tuple_clause_guard(
subject_name: impl ToString,
tipo: Arc<Type>,
subject_tipo: Arc<Type>,
indices: IndexSet<(usize, String)>,
) -> AirTree {
AirTree::Statement {
statement: AirStatement::TupleGuard {
indices,
subject_name: subject_name.to_string(),
type_count: tipo.get_inner_types().len(),
tipo,
type_count: subject_tipo.get_inner_types().len(),
subject_tipo,
},
hoisted_over: None,
}
@ -785,37 +789,37 @@ impl AirTree {
}
AirStatement::ClauseGuard {
subject_name,
tipo,
subject_tipo,
pattern,
} => {
air_vec.push(Air::ClauseGuard {
subject_name: subject_name.clone(),
tipo: tipo.clone(),
subject_tipo: subject_tipo.clone(),
});
pattern.create_air_vec(air_vec);
}
AirStatement::ListClauseGuard {
tipo,
subject_tipo,
tail_name,
next_tail_name,
inverse,
} => {
air_vec.push(Air::ListClauseGuard {
tipo: tipo.clone(),
subject_tipo: subject_tipo.clone(),
tail_name: tail_name.clone(),
next_tail_name: next_tail_name.clone(),
inverse: *inverse,
});
}
AirStatement::TupleGuard {
tipo,
subject_tipo,
indices,
subject_name,
type_count,
} => {
air_vec.push(Air::TupleGuard {
tipo: tipo.clone(),
subject_tipo: subject_tipo.clone(),
indices: indices.clone(),
subject_name: subject_name.clone(),
type_count: *type_count,
@ -983,7 +987,7 @@ impl AirTree {
clauses.create_air_vec(air_vec);
}
AirExpression::Clause {
tipo,
subject_tipo,
subject_name,
complex_clause,
pattern,
@ -991,7 +995,7 @@ impl AirTree {
otherwise,
} => {
air_vec.push(Air::Clause {
tipo: tipo.clone(),
subject_tipo: subject_tipo.clone(),
subject_name: subject_name.clone(),
complex_clause: *complex_clause,
});
@ -1000,7 +1004,7 @@ impl AirTree {
otherwise.create_air_vec(air_vec);
}
AirExpression::ListClause {
tipo,
subject_tipo,
tail_name,
next_tail_name,
complex_clause,
@ -1008,7 +1012,7 @@ impl AirTree {
otherwise,
} => {
air_vec.push(Air::ListClause {
tipo: tipo.clone(),
subject_tipo: subject_tipo.clone(),
tail_name: tail_name.clone(),
next_tail_name: next_tail_name.clone(),
complex_clause: *complex_clause,
@ -1022,7 +1026,7 @@ impl AirTree {
otherwise.create_air_vec(air_vec);
}
AirExpression::TupleClause {
tipo,
subject_tipo,
indices,
predefined_indices,
subject_name,
@ -1032,7 +1036,7 @@ impl AirTree {
otherwise,
} => {
air_vec.push(Air::TupleClause {
tipo: tipo.clone(),
subject_tipo: subject_tipo.clone(),
indices: indices.clone(),
predefined_indices: predefined_indices.clone(),
subject_name: subject_name.clone(),
@ -1170,8 +1174,8 @@ impl AirTree {
| AirExpression::TupleClause { then, .. }
| AirExpression::Finally { then, .. } => then.get_type(),
AirExpression::FieldsEmpty { constr } => todo!(),
AirExpression::ListEmpty { list } => todo!(),
AirExpression::FieldsEmpty { constr } => constr.get_type(),
AirExpression::ListEmpty { list } => list.get_type(),
},
_ => unreachable!(),
}