dsl: make clearing app data in opt_vm_clear() optional

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

dsl/optscript.c

@@ -647,12 +647,13 @@ opt_vm_new (MIO *in, MIO *out, MIO *err)
 }
 
 void
-opt_vm_clear (OptVM *vm)
+opt_vm_clear (OptVM *vm, bool clear_app_data)
 {
 	ptrArrayClear  (vm->estack);
 	ptrArrayClear  (vm->ostack);
 	vm_dstack_clear (vm);
-	vm->app_data = NULL;
+	if (clear_app_data)
+		vm->app_data = NULL;
 	dict_op_clear (vm->error);
 }
 

dsl/optscript.h

@@ -41,7 +41,7 @@ void      opt_vm_print_prompt (OptVM *vm);
 int       opt_vm_help         (OptVM *vm, MIO *out,
 							   struct OptHelpExtender *extop, void *data);
 
-void      opt_vm_clear       (OptVM *vm);
+void      opt_vm_clear       (OptVM *vm, bool clear_app_data);
 void      opt_vm_dstack_push (OptVM *vm, EsObject *dict);
 void      opt_vm_dstack_pop  (OptVM *vm);
 

extra-cmds/optscript-repl.c

@@ -211,7 +211,7 @@ main(int argc, char **argv)
 		r = optscript_run (vm, file? NULL: "OPT", &renew);
 		if (renew)
 		{
-			opt_vm_clear (vm);
+			opt_vm_clear (vm, true);
 			opt_vm_dstack_push (vm, dict);
 			renew = false;
 			goto renew;

main/lregex.c

@@ -2147,7 +2147,7 @@ extern void notifyRegexInputEnd (struct lregexControlBlock *lcb)
 {
 	scriptEvalHook (optvm, lcb, SCRIPT_HOOK_SEQUEL);
 	opt_vm_set_app_data (optvm, NULL);
-	opt_vm_clear (optvm);
+	opt_vm_clear (optvm, true);
 	opt_dict_clear (lcb->local_dict);
 	unsigned long endline = getInputLineNumber ();
 	fillEndLineFieldOfUpperScopes (lcb, endline);