Fixed while not creating its own scope; implemented exitWith

Author: X39

SQF-VM/Entry.c

@@ -196,6 +196,7 @@ void register_commmands(PVM vm)
 	create_cmd(vm, L"vectorDistance", 'b', cmd_vectordistance, 4, L"<VECTOR3D> vectorDistance <VECTOR3D>", L"_euclideanDist = getPosASL player vectorDistance [0,0,0];", L"Distance between two 3D vectors.");
 	create_cmd(vm, L"vectorDistanceSqr", 'b', cmd_vectordistancesqr, 4, L"<VECTOR3D> vectorDistanceSqr <VECTOR3D>", L"_distSqr = getPos player vectorDistanceSqr [0,0,2];", L"Squared distance between two 3D vectors.");
 	create_cmd(vm, L">>", 'b', cmd_navigateconfig, 4, L"<CONFIG> >> <STRING>", L"", L"Returns subentry of config entry with given name.");
+	create_cmd(vm, L"exitWith", 'b', cmd_exitwith, 4, L"<IF> exitWith <CODE>", L"", L"Exits current scope {...} it is executed from if condition evaluates true, creates new scope {...code...} and executes the given code in it.");
 
 	create_cmd(vm, L"diag_log", 'u', cmd_diag_LOG, 4, L"diag_log <ANY>", L"", L"Dumps the argument's value. Each call creates a new line.");
 	create_cmd(vm, L"systemChat", 'u', cmd_systemchat, 4, L"systemChat <STRING>", L"", L"Writes the argument's value plaintext. Each call creates a new line.");

SQF-VM/sqf_commands.c

@@ -1933,6 +1933,10 @@ void cmd_do(void* input, CPCMD self)
 	}
 	if (left_val->type == WHILE_TYPE())
 	{
+		if (vm->stack->data[vm->stack->top - 1]->type != INST_SCOPE)
+		{
+			push_stack(vm, vm->stack, inst_scope(L"loop"));
+		}
 		push_stack(vm, vm->stack, inst_command(find_command(vm, L"do", 'b')));
 		push_stack(vm, vm->stack, left);
 		push_stack(vm, vm->stack, right);
@@ -1961,11 +1965,14 @@ void cmd_do(void* input, CPCMD self)
 								pfor->current < pfor->end :
 								pfor->current > pfor->end)
 		{
+			if (vm->stack->data[vm->stack->top - 1]->type != INST_SCOPE)
+			{
+				push_stack(vm, vm->stack, inst_scope(L"loop"));
+			}
 			push_stack(vm, vm->stack,
 				inst_command(find_command(vm, L"do", 'b')));
 			push_stack(vm, vm->stack, left);
 			push_stack(vm, vm->stack, right);
-			push_stack(vm, vm->stack, inst_scope(L"loop"));
 			push_stack(vm, vm->stack, inst_code_load(0));
 			push_stack(vm, vm->stack,
 				inst_value(value(CODE_TYPE(), right_val->val)));
@@ -6921,4 +6928,48 @@ void cmd_tolower(void* input, CPCMD self)
 	}
 	push_stack(vm, vm->stack, inst_value(value(STRING_TYPE(), base_voidptr(outstring))));
 	inst_destroy(right);
+}
+void cmd_exitwith(void* input, CPCMD self)
+{
+	PVM vm = input;
+	PINST left;
+	PINST right;
+	PVALUE left_val;
+	PVALUE right_val;
+	PSTRING outstring;
+	unsigned int i;
+	left = pop_stack(vm, vm->work);
+	right = pop_stack(vm, vm->work);
+	left_val = get_value(vm, vm->stack, left);
+	right_val = get_value(vm, vm->stack, right);
+	if (left_val == 0 || right_val == 0)
+	{
+		inst_destroy(left);
+		inst_destroy(right);
+		return;
+	}
+	if (left_val->type != IF_TYPE())
+	{
+		vm->error(vm, ERR_LEFT_TYPE ERR_IF, vm->stack);
+		inst_destroy(left);
+		inst_destroy(right);
+		push_stack(vm, vm->stack,
+			inst_value(value(NOTHING_TYPE(), base_int(0))));
+		return;
+	}
+	if (right_val->type != CODE_TYPE())
+	{
+		vm->error(vm, ERR_RIGHT_TYPE ERR_CODE, vm->stack);
+		inst_destroy(left);
+		inst_destroy(right);
+		push_stack(vm, vm->stack,
+			inst_value(value(NOTHING_TYPE(), base_int(0))));
+		return;
+	}
+	push_stack(vm, vm->stack, inst_scope_dropout(0));
+	push_stack(vm, vm->stack, inst_code_load(true));
+	push_stack(vm, vm->stack, right);
+	push_stack(vm, vm->stack, inst_pop_eval(3, false));
+	push_stack(vm, vm->stack, inst_value(value(BOOL_TYPE(), left_val->val)));
+	inst_destroy(left);
 }

SQF-VM/sqf_commands.h

@@ -188,5 +188,6 @@ void cmd_isclass(void* input, CPCMD self);
 
 void cmd_toupper(void* input, CPCMD self);
 void cmd_tolower(void* input, CPCMD self);
+void cmd_exitwith(void* input, CPCMD self);
 
 #endif // !_SQF_COMMANDS_H_