tomasz.sowa/morm
1
0
Fork 0
Code Issues 2 Pull Requests Releases Activity

WIP: add a Val struct as an input/output when calling a function

Browse Source
This commit is contained in:
Tomasz Sowa
2024-12-11 17:30:13 +01:00
parent 4f8ef38002
commit 04144e81be
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/model.h
View File

@@ -285,13 +285,13 @@ public:
model_env->model_data = model_data; model_env->model_data = model_data;
model_env->stream = &stream; model_env->stream = &stream;
model_env->ezc_fun_info = &fun_info; model_env->ezc_fun_info = &fun_info;
model_env->ezc_fun_info_typeinfo = &typeid(fun_info); model_env->ezc_fun_info_typeinfo = &typeid(fun_info); // now we don't need to check types, Env is not a template now
model_env->model = this; model_env->model = this;
try try
{ {
fields(); fields();
fun_info.res = model_env->ezc_fun_result; //fun_info.res = model_env->ezc_fun_result;
} }
catch(...) catch(...)
{ {
@@ -800,7 +800,7 @@ protected:
} }
#ifdef MORM_HAS_EZC_LIBRARY #ifdef MORM_HAS_EZC_LIBRARY
model_env->ezc_fun_result = convert_to_bool(field_value); //model_env->ezc_fun_result = convert_to_bool(field_value);
#endif #endif
} }
} }
@@ -971,7 +971,7 @@ protected:
{ {
Ezc::Env * ezc_fun_info = reinterpret_cast<Ezc::Env*>(model_env->ezc_fun_info); Ezc::Env * ezc_fun_info = reinterpret_cast<Ezc::Env*>(model_env->ezc_fun_info);
(model_env->model->*method)(*ezc_fun_info); (model_env->model->*method)(*ezc_fun_info);
model_env->ezc_fun_result = ezc_fun_info->res; // ezc_fun_info->res is overwritten in get_raw_value() after fields() method call so we have to remember it in model_env //model_env->ezc_fun_result = ezc_fun_info->res; // ezc_fun_info->res is overwritten in get_raw_value() after fields() method call so we have to remember it in model_env
} }
else else
{ {
@@ -1006,7 +1006,7 @@ protected:
(is_empty_field(model_env->flat_field_name) || is_the_same_field(flat_field_name, model_env->flat_field_name)) ) (is_empty_field(model_env->flat_field_name) || is_the_same_field(flat_field_name, model_env->flat_field_name)) )
{ {
model_env->was_field_found = true; model_env->was_field_found = true;
model_env->ezc_fun_result = (model_env->model->*method)(); //model_env->ezc_fun_result = (model_env->model->*method)();
} }
} }
} }
@@ -1033,7 +1033,7 @@ protected:
(is_empty_field(model_env->flat_field_name) || is_the_same_field(flat_field_name, model_env->flat_field_name)) ) (is_empty_field(model_env->flat_field_name) || is_the_same_field(flat_field_name, model_env->flat_field_name)) )
{ {
model_env->was_field_found = true; model_env->was_field_found = true;
model_env->ezc_fun_result = (model_env->model->*method)(); //model_env->ezc_fun_result = (model_env->model->*method)();
} }
} }
} }

6
src/modelenv.h
View File

@@ -98,7 +98,7 @@ public:
#ifdef MORM_HAS_EZC_LIBRARY #ifdef MORM_HAS_EZC_LIBRARY
void * ezc_fun_info; void * ezc_fun_info;
bool ezc_fun_result; //bool ezc_fun_result;
const std::type_info * ezc_fun_info_typeinfo; const std::type_info * ezc_fun_info_typeinfo;
#endif #endif
@@ -157,7 +157,7 @@ public:
#ifdef MORM_HAS_EZC_LIBRARY #ifdef MORM_HAS_EZC_LIBRARY
ezc_fun_info = e.ezc_fun_info; ezc_fun_info = e.ezc_fun_info;
ezc_fun_result = e.ezc_fun_result; //ezc_fun_result = e.ezc_fun_result;
ezc_fun_info_typeinfo = e.ezc_fun_info_typeinfo; ezc_fun_info_typeinfo = e.ezc_fun_info_typeinfo;
#endif #endif
@@ -216,7 +216,7 @@ public:
#ifdef MORM_HAS_EZC_LIBRARY #ifdef MORM_HAS_EZC_LIBRARY
ezc_fun_info = nullptr; ezc_fun_info = nullptr;
ezc_fun_result = false; //ezc_fun_result = false;
ezc_fun_info_typeinfo = nullptr; ezc_fun_info_typeinfo = nullptr;
#endif #endif
} }