fluencelabs/aquavm
1
0
Fork 0
mirror of https://github.com/fluencelabs/aquavm synced 2025-04-24 14:52:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix mismatch code

Browse Source
This commit is contained in:
Ivan Boldyrev 2024-05-22 22:10:28 +02:00 committed by Ivan Boldyrev
parent e3eb209aac
commit 892c501b92
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/beautifier/src/tests/if_else.rs
View File

@ -201,7 +201,7 @@ fn if_else_mismatch_on() {
(seq (seq
(ap :error: -if-error-) (ap :error: -if-error-)
(xor (xor
(match :error:.$.error_code 10001 (match :error:.$.error_code 10002
(ap 1 $result) (ap 1 $result)
) )
(seq (seq
@ -253,7 +253,7 @@ fn if_else_mismatch_off() {
(seq (seq
(ap :error: -if-error-) (ap :error: -if-error-)
(xor (xor
(match :error:.$.error_code 10001 (match :error:.$.error_code 10002
(ap 1 $result) (ap 1 $result)
) )
(seq (seq
@ -293,7 +293,7 @@ fn if_else_mismatch_off() {
" catch:\n", " catch:\n",
" ap :error: -if-error-\n", " ap :error: -if-error-\n",
" try:\n", " try:\n",
" match :error:.$.error_code 10001:\n", " match :error:.$.error_code 10002:\n",
" ap 1 $result\n", " ap 1 $result\n",
" catch:\n", " catch:\n",
" ap :error: -else-error-\n", " ap :error: -else-error-\n",
@ -435,7 +435,7 @@ fn if_then_mismatch_on() {
(seq (seq
(ap :error: -if-error-) (ap :error: -if-error-)
(xor (xor
(match :error:.$.error_code 10001 (match :error:.$.error_code 10002
(null) (null)
) )
(fail -if-error-) (fail -if-error-)
@ -470,7 +470,7 @@ fn if_then_mismatch_off() {
(seq (seq
(ap :error: -if-error-) (ap :error: -if-error-)
(xor (xor
(match :error:.$.error_code 10001 (match :error:.$.error_code 10002
(null) (null)
) )
(fail -if-error-) (fail -if-error-)
@ -495,7 +495,7 @@ fn if_then_mismatch_off() {
" catch:\n", " catch:\n",
" ap :error: -if-error-\n", " ap :error: -if-error-\n",
" try:\n", " try:\n",
" match :error:.$.error_code 10001:\n", " match :error:.$.error_code 10002:\n",
" null\n", " null\n",
" catch:\n", " catch:\n",
" fail -if-error-\n" " fail -if-error-\n"

38
crates/beautifier/src/virtual/if_else.rs
View File

@ -124,6 +124,11 @@ pub(crate) fn try_if_else<'i>(root_new: &'i ast::New<'i>) -> Option<IfElse<'i>>
_ => return None, _ => return None,
}; };
let expected_code = match &condition {
Condition::Match { .. } => 10001,
Condition::Mismatch { .. } => 10002,
};
let if_else_error = root_scalar; let if_else_error = root_scalar;
let else_error = nested1_scalar; let else_error = nested1_scalar;
let if_error = nested2_scalar; let if_error = nested2_scalar;
@ -153,9 +158,12 @@ pub(crate) fn try_if_else<'i>(root_new: &'i ast::New<'i>) -> Option<IfElse<'i>>
expected_tree.to_string() expected_tree.to_string()
}; };
// TODO return a Result here // TODO return a Result here
if let Some(else_body) = if let Some(else_body) = validate_error_handling(
validate_error_handling(error_handling, if_error, expected_error_handling_xor) error_handling,
{ if_error,
expected_error_handling_xor,
expected_code,
) {
// todo!("check free variables"); // todo!("check free variables");
Some(IfElse { Some(IfElse {
condition, condition,
@ -202,6 +210,11 @@ pub(crate) fn try_if_then<'i>(root_new: &'i ast::New<'i>) -> Option<IfElse<'i>>
_ => return None, _ => return None,
}; };
let expected_code = match &condition {
Condition::Match { .. } => 10001,
Condition::Mismatch { .. } => 10002,
};
let if_error = root_scalar; let if_error = root_scalar;
let expected_error_handling_xor = || { let expected_error_handling_xor = || {
let air_script = format!( let air_script = format!(
@ -215,9 +228,13 @@ pub(crate) fn try_if_then<'i>(root_new: &'i ast::New<'i>) -> Option<IfElse<'i>>
let expected_tree = pop_new_from_tree(expected_tree, 1); let expected_tree = pop_new_from_tree(expected_tree, 1);
expected_tree.to_string() expected_tree.to_string()
}; };
if let Some(ast::Instruction::Null(ast::Null)) =
validate_error_handling(error_handling, root_scalar, expected_error_handling_xor) if let Some(ast::Instruction::Null(ast::Null)) = validate_error_handling(
{ error_handling,
root_scalar,
expected_error_handling_xor,
expected_code,
) {
// todo!("check free variables"); // todo!("check free variables");
Some(IfElse { Some(IfElse {
condition, condition,
@ -236,9 +253,10 @@ fn validate_error_handling<'i>(
root: &'i ast::Seq<'i>, root: &'i ast::Seq<'i>,
if_error: &ast::Scalar<'_>, if_error: &ast::Scalar<'_>,
expected_error_handling_xor: impl FnOnce() -> String, expected_error_handling_xor: impl FnOnce() -> String,
expected_code: i64,
) -> Option<&'i ast::Instruction<'i>> { ) -> Option<&'i ast::Instruction<'i>> {
if validate_error_handling_ap(&root.0, if_error) { if validate_error_handling_ap(&root.0, if_error) {
validate_error_handling_xor(&root.1, expected_error_handling_xor) validate_error_handling_xor(&root.1, expected_error_handling_xor, expected_code)
} else { } else {
None None
} }
@ -247,18 +265,20 @@ fn validate_error_handling<'i>(
fn validate_error_handling_xor<'i>( fn validate_error_handling_xor<'i>(
instruction: &'i ast::Instruction<'i>, instruction: &'i ast::Instruction<'i>,
expected_error_handling_xor: impl FnOnce() -> String, expected_error_handling_xor: impl FnOnce() -> String,
expected_code: i64,
) -> Option<&'i ast::Instruction<'i>> { ) -> Option<&'i ast::Instruction<'i>> {
if let ast::Instruction::Xor(xor) = instruction { if let ast::Instruction::Xor(xor) = instruction {
if !validate_error_handling_xor_second(&xor.1, expected_error_handling_xor) { if !validate_error_handling_xor_second(&xor.1, expected_error_handling_xor) {
return None; return None;
} }
if let ast::Instruction::Match(match_) = &xor.0 { if let ast::Instruction::Match(match_) = &xor.0 {
// check arguments: match :error:.$.error_code 10001 // check arguments: for == match :error:.$.error_code 10001
// for != match :error:.$.error_code 10002
let lambda = let lambda =
air_lambda_parser::parse(".$.error_code").expect("invalid internal lambda"); air_lambda_parser::parse(".$.error_code").expect("invalid internal lambda");
let expected_left = let expected_left =
ast::ImmutableValue::Error(ast::InstructionErrorAST::new(Some(lambda))); ast::ImmutableValue::Error(ast::InstructionErrorAST::new(Some(lambda)));
let expected_right = ast::ImmutableValue::Number(ast::Number::Int(10001)); let expected_right = ast::ImmutableValue::Number(ast::Number::Int(expected_code));
if match_.left_value == expected_left && match_.right_value == expected_right { if match_.left_value == expected_left && match_.right_value == expected_right {
return Some(&match_.instruction); return Some(&match_.instruction);
} }