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

Lift 'error' up one level in the parser and remove its label.

Browse Source 
We now parse errors as a combination of a trace plus and error term. This is a baby step in order to simplify the code generation down the line and the internal representation of todo / errors.
This commit is contained in:
KtorZ
2023-02-15 21:09:03 +01:00
parent 7abd76b6ad
commit 7b676643bd
8 changed files with 176 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
crates/aiken-lang/src/uplc.rs
View File

@@ -679,11 +679,10 @@ impl<'a> CodeGenerator<'a> {
self.build_ir(tuple, ir_stack, scope);
}
TypedExpr::ErrorTerm { tipo, label, .. } => {
TypedExpr::ErrorTerm { tipo, .. } => {
ir_stack.push(Air::ErrorTerm {
scope,
tipo: tipo.clone(),
label: label.clone(),
});
}
}
@@ -2568,10 +2567,19 @@ impl<'a> CodeGenerator<'a> {
});
}
assert_vec.push(Air::Trace {
scope: scope.clone(),
tipo: tipo.clone(),
});
assert_vec.push(Air::String {
scope: scope.clone(),
value: "Constr index did not match any type variant".to_string(),
});
assert_vec.push(Air::ErrorTerm {
scope,
tipo: tipo.clone(),
label: Some("Constr index did not match any type variant".to_string()),
});
}
}
@@ -3496,14 +3504,13 @@ impl<'a> CodeGenerator<'a> {
tipo: replaced_type,
};
}
Air::ErrorTerm { tipo, scope, label } => {
Air::ErrorTerm { tipo, scope } => {
let mut replaced_type = tipo.clone();
replace_opaque_type(&mut replaced_type, self.data_types.clone());
ir_stack[index] = Air::ErrorTerm {
scope,
tipo: replaced_type,
label,
};
}
Air::Trace { tipo, scope } => {
@@ -5645,22 +5652,7 @@ impl<'a> CodeGenerator<'a> {
arg_stack.push(term);
}
Air::ErrorTerm { label, .. } => {
if let Some(label) = label {
let term = apply_wrap(
apply_wrap(
Term::Builtin(DefaultFunction::Trace).force_wrap(),
Term::Constant(UplcConstant::String(label).into()),
),
Term::Delay(Term::Error.into()),
)
.force_wrap();
arg_stack.push(term);
} else {
arg_stack.push(Term::Error)
}
}
Air::ErrorTerm { .. } => arg_stack.push(Term::Error),
Air::TupleClause {
tipo,
indices,