feat: Else blocks in definitions

- ensure both run-to-completion and suspendable rule execution stop evaluating
  bodies once one succeeds so later else branches are skipped
- test cases

Signed-off-by: Anand Krishnamoorthi <anakrish@microsoft.com>
This commit is contained in:
Anand Krishnamoorthi
2025-12-05 11:40:43 -06:00
parent e9a50bcfd5
commit a232b13e50
3 changed files with 300 additions and 2 deletions

View File

@@ -96,6 +96,10 @@ impl RegoVM {
} }
} }
} }
// Once a body in this definition succeeds, remaining bodies
// are treated as else-branches and must not be evaluated.
break;
} }
Err(_e) => { Err(_e) => {
continue; continue;
@@ -502,7 +506,14 @@ impl RegoVM {
} }
} }
frame_data.current_body_index += 1; if let Some(definition_bodies) = rule_info
.definitions
.get(frame_data.current_definition_index)
{
frame_data.current_body_index = definition_bodies.len();
} else {
frame_data.current_body_index += 1;
}
self.rule_frame_schedule_segment(frame_data, rule_info) self.rule_frame_schedule_segment(frame_data, rule_info)
} }

View File

@@ -63,7 +63,8 @@ cases:
rule_infos: rule_infos:
- rule_type: Complete - rule_type: Complete
definitions: definitions:
- [2, 5] - [2]
- [5]
instructions: instructions:
- "CallRule { dest: 0, rule_index: 0 }" - "CallRule { dest: 0, rule_index: 0 }"
- "Return { value: 0 }" - "Return { value: 0 }"
@@ -74,3 +75,43 @@ cases:
- "Load { dest: 1, literal_idx: 1 }" - "Load { dest: 1, literal_idx: 1 }"
- "RuleReturn {}" - "RuleReturn {}"
want_result: "#undefined" want_result: "#undefined"
- note: call_rule_else_short_circuit
description: Rule definitions stop executing additional bodies once one succeeds
literals:
- 1
- 2
rule_infos:
- rule_type: Complete
definitions:
- [2, 5]
instructions:
- "CallRule { dest: 0, rule_index: 0 }"
- "Return { value: 0 }"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "Load { dest: 1, literal_idx: 0 }"
- "RuleReturn {}"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "Load { dest: 1, literal_idx: 1 }"
- "RuleReturn {}"
want_result: 1
- note: call_rule_else_fallback_on_failure
description: Failed bodies can still fall back to the next else body
literals:
- 99
rule_infos:
- rule_type: Complete
definitions:
- [2, 6]
instructions:
- "CallRule { dest: 0, rule_index: 0 }"
- "Return { value: 0 }"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "LoadBool { dest: 2, value: false }"
- "AssertCondition { condition: 2 }"
- "RuleReturn {}"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "Load { dest: 1, literal_idx: 0 }"
- "RuleReturn {}"
want_result: 99

View File

@@ -0,0 +1,246 @@
# Else Rule Test Suite
# Validates VM handling of rule bodies with else chains across rule types and execution modes.
cases:
- note: else_complete_short_circuit
description: First body succeeds and remaining else bodies are skipped
literals:
- 1
- 2
rule_infos:
- rule_type: Complete
definitions:
- [2, 6]
instructions:
- "CallRule { dest: 0, rule_index: 0 }"
- "Return { value: 0 }"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "Load { dest: 1, literal_idx: 0 }"
- "RuleReturn {}"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "Load { dest: 1, literal_idx: 1 }"
- "RuleReturn {}"
want_result: 1
- note: else_complete_fallback
description: First body fails, second else body succeeds
literals:
- 10
rule_infos:
- rule_type: Complete
definitions:
- [2, 6]
instructions:
- "CallRule { dest: 0, rule_index: 0 }"
- "Return { value: 0 }"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "LoadBool { dest: 2, value: false }"
- "AssertCondition { condition: 2 }"
- "RuleReturn {}"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "Load { dest: 1, literal_idx: 0 }"
- "RuleReturn {}"
want_result: 10
- note: else_complete_multi_failure_then_success
description: Multiple failing bodies before a later success
literals:
- 7
rule_infos:
- rule_type: Complete
definitions:
- [2, 6, 10]
instructions:
- "CallRule { dest: 0, rule_index: 0 }"
- "Return { value: 0 }"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "LoadBool { dest: 2, value: false }"
- "AssertCondition { condition: 2 }"
- "RuleReturn {}"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "LoadBool { dest: 2, value: false }"
- "AssertCondition { condition: 2 }"
- "RuleReturn {}"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "Load { dest: 1, literal_idx: 0 }"
- "RuleReturn {}"
want_result: 7
- note: else_complete_all_fail_default_literal
description: All bodies fail and default literal is returned
literals:
- 42
rule_infos:
- rule_type: Complete
default_literal_index: 0
definitions:
- [2, 6]
instructions:
- "CallRule { dest: 0, rule_index: 0 }"
- "Return { value: 0 }"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "LoadBool { dest: 2, value: false }"
- "AssertCondition { condition: 2 }"
- "RuleReturn {}"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "LoadBool { dest: 2, value: false }"
- "AssertCondition { condition: 2 }"
- "RuleReturn {}"
want_result: 42
- note: else_partial_set
description: Partial set rule initializes result even if all bodies fail
literals:
- []
rule_infos:
- rule_type: PartialSet
definitions:
- [2, 6]
instructions:
- "CallRule { dest: 0, rule_index: 0 }"
- "Return { value: 0 }"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "LoadBool { dest: 2, value: false }"
- "AssertCondition { condition: 2 }"
- "RuleReturn {}"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "LoadBool { dest: 2, value: false }"
- "AssertCondition { condition: 2 }"
- "RuleReturn {}"
want_result:
set!: []
- note: else_partial_object
description: Partial object rule emits value from first successful branch
literals:
- {}
- "key"
- 5
rule_infos:
- rule_type: PartialObject
definitions:
- [2, 6]
instructions:
- "CallRule { dest: 0, rule_index: 0 }"
- "Return { value: 0 }"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "LoadBool { dest: 2, value: false }"
- "AssertCondition { condition: 2 }"
- "RuleReturn {}"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "Load { dest: 1, literal_idx: 0 }"
- "Load { dest: 2, literal_idx: 1 }"
- "Load { dest: 3, literal_idx: 2 }"
- "ObjectSet { obj: 1, key: 2, value: 3 }"
- "RuleReturn {}"
want_result: { "key": 5 }
- note: else_function_rule
description: Function rule respects else chain and caches final value
literals:
- 0 # function rule index
- 1 # argument value (unused)
- 2 # return value from else body
instruction_params:
function_call_params:
- func: 0
dest: 3
args: [1]
rule_infos:
- rule_type: Complete
function_info:
param_names: ["x"]
num_params: 1
definitions:
- [4, 8]
instructions:
- "Load { dest: 0, literal_idx: 0 }"
- "Load { dest: 1, literal_idx: 1 }"
- "FunctionCall { params_index: 0 }"
- "Return { value: 3 }"
- "RuleInit { result_reg: 0, rule_index: 0 }"
- "LoadBool { dest: 2, value: false }"
- "AssertCondition { condition: 2 }"
- "RuleReturn {}"
- "RuleInit { result_reg: 0, rule_index: 0 }"
- "Load { dest: 0, literal_idx: 2 }"
- "RuleReturn {}"
want_result: 2
- note: else_assignment_only
description: Assignment-only else block without query statements
literals:
- 99
rule_infos:
- rule_type: Complete
definitions:
- [2, 6]
instructions:
- "CallRule { dest: 0, rule_index: 0 }"
- "Return { value: 0 }"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "LoadBool { dest: 2, value: false }"
- "AssertCondition { condition: 2 }"
- "RuleReturn {}"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "Load { dest: 1, literal_idx: 0 }"
- "RuleReturn {}"
want_result: 99
- note: else_nested_callrule
description: Outer rule observes inner rule else short-circuit behaviour
literals:
- 5
rule_infos:
- rule_type: Complete
definitions:
- [2]
- rule_type: Complete
definitions:
- [5, 9]
rule_tree:
data:
outer:
allow: 0
inner:
value: 1
instructions:
- "CallRule { dest: 0, rule_index: 0 }"
- "Return { value: 0 }"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "CallRule { dest: 1, rule_index: 1 }"
- "RuleReturn {}"
- "RuleInit { result_reg: 1, rule_index: 1 }"
- "LoadBool { dest: 3, value: false }"
- "AssertCondition { condition: 3 }"
- "RuleReturn {}"
- "RuleInit { result_reg: 1, rule_index: 1 }"
- "Load { dest: 1, literal_idx: 0 }"
- "RuleReturn {}"
want_result: 5
- note: else_suspendable_step
description: Suspendable execution mode respects else short-circuiting
literals:
- 4
- "await-else"
rule_infos:
- rule_type: Complete
definitions:
- [2, 7]
execution_mode: suspendable
instructions:
- "CallRule { dest: 0, rule_index: 0 }"
- "Return { value: 0 }"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "Load { dest: 1, literal_idx: 0 }"
- "Load { dest: 2, literal_idx: 1 }"
- "HostAwait { dest: 3, arg: 1, id: 2 }"
- "RuleReturn {}"
- "RuleInit { result_reg: 1, rule_index: 0 }"
- "Load { dest: 1, literal_idx: 0 }"
- "RuleReturn {}"
host_await_responses:
- id: "await-else"
value: "resume-ok"
want_result: 4