tomasz.sowa/ezc
1
0
Fork 0
Code Issues 4 Pull Requests Releases Activity

rename the FunInfo struct to Env

Browse Source
This commit is contained in:
Tomasz Sowa
2024-12-06 12:20:55 +01:00
parent e39311c290
commit 5d5d5bcdde
6 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/generator.h
View File

@@ -313,9 +313,9 @@ private:
bool FindInVariables(const std::wstring & name, FindHelper & find_helper);
bool Find(Item::Function & item_fun, FindHelper & find_helper);
void PrepareEnvStruct(FunInfo & info);
void PrepareEnvStruct(Env & info);
void CallFunction(typename Functions::UserFunction & function, FunInfo & info);
void CallFunction(typename Functions::UserFunction & function, Env & info);
void CallFunction(typename Functions::UserFunction & function,
std::vector<Var> & parameters,
@@ -326,7 +326,7 @@ private:
std::vector<Var> & parameters,
pt::Stream & out_stream);
void CallObject(BaseObj & base_obj, int method_index, FunInfo & info);
void CallObject(BaseObj & base_obj, int method_index, Env & info);
void PrintDate(pt::Date * date, std::vector<Var> & parameters, pt::Stream & out_stream);
bool PrintDatePart(pt::Date * date, const std::wstring & field, std::vector<Var> & parameters, pt::Stream & out_stream);
@@ -1202,7 +1202,7 @@ bool Generator::Find(Item::Function & item_fun, FindHelper & find_helper)
void Generator::PrepareEnvStruct(FunInfo & info)
void Generator::PrepareEnvStruct(Env & info)
{
info.Clear();
@@ -1220,7 +1220,7 @@ void Generator::PrepareEnvStruct(FunInfo & info)
void Generator::CallFunction(typename Functions::UserFunction & function, FunInfo & info)
void Generator::CallFunction(typename Functions::UserFunction & function, Env & info)
{
PrepareEnvStruct(info);
(function)(info);
@@ -1239,12 +1239,12 @@ void Generator::CallFunction(typename Functions::UserFunction & function,
{
if( parameters.empty() )
{
FunInfo info(out_stream, parameters, empty, in_stream, stack_tab[stack_index-1], *stack_tab[stack_index-1].item);
Env info(out_stream, parameters, empty, in_stream, stack_tab[stack_index-1], *stack_tab[stack_index-1].item);
CallFunction(function, info);
}
else
{
FunInfo info(out_stream, parameters, parameters[0].str, in_stream, stack_tab[stack_index-1], *stack_tab[stack_index-1].item);
Env info(out_stream, parameters, parameters[0].str, in_stream, stack_tab[stack_index-1], *stack_tab[stack_index-1].item);
CallFunction(function, info);
}
}
@@ -1254,7 +1254,7 @@ void Generator::CallFunction(typename Functions::UserFunction & function,
void Generator::CallObject(BaseObj & base_obj, int method_index, FunInfo & info)
void Generator::CallObject(BaseObj & base_obj, int method_index, Env & info)
{
PrepareEnvStruct(info);
base_obj.CallFun(method_index, info);
@@ -1715,14 +1715,14 @@ bool Generator::CallModelField(
if( parameters.empty() )
{
FunInfo info(out_stream, parameters, empty, in_stream, stack_tab[stack_index-1], *stack_tab[stack_index-1].item);
Env info(out_stream, parameters, empty, in_stream, stack_tab[stack_index-1], *stack_tab[stack_index-1].item);
PrepareEnvStruct(info);
found = model.get_raw_value(nullptr, field.c_str(), nullptr, info, str, false);
last_res = info.res;
}
else
{
FunInfo info(out_stream, parameters, parameters[0].str, in_stream, stack_tab[stack_index-1], *stack_tab[stack_index-1].item);
Env info(out_stream, parameters, parameters[0].str, in_stream, stack_tab[stack_index-1], *stack_tab[stack_index-1].item);
PrepareEnvStruct(info);
found = model.get_raw_value(nullptr, field.c_str(), nullptr, info, str, false);
last_res = info.res;
@@ -1908,12 +1908,12 @@ void Generator::CallObject(BaseObj & base_obj,
{
if( parameters.empty() )
{
FunInfo info(out_stream, parameters, empty, in_stream, stack_tab[stack_index-1], *stack_tab[stack_index-1].item);
Env info(out_stream, parameters, empty, in_stream, stack_tab[stack_index-1], *stack_tab[stack_index-1].item);
CallObject(base_obj, method_index, info);
}
else
{
FunInfo info(out_stream, parameters, parameters[0].str, in_stream, stack_tab[stack_index-1], *stack_tab[stack_index-1].item);
Env info(out_stream, parameters, parameters[0].str, in_stream, stack_tab[stack_index-1], *stack_tab[stack_index-1].item);
CallObject(base_obj, method_index, info);
}
}