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

added space values

This commit is contained in:
Tomasz Sowa 2021-11-21 21:08:06 +01:00
parent 46bc5c35a1
commit a7656d5ccd
1 changed files with 71 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
src/generator.h
View File

@ -354,7 +354,7 @@ private:
//bool CallDate(pt::Date & date, const std::wstring & name, std::vector<std::wstring> & fields, size_t & field_index, std::vector<Var<StreamType>> & parameters, Var<StreamType> & result); //bool CallDate(pt::Date & date, const std::wstring & name, std::vector<std::wstring> & fields, size_t & field_index, std::vector<Var<StreamType>> & parameters, Var<StreamType> & result);
void PrintLastSpaceField(pt::Space & space, FindHelper & find_helper); void PrintLastSpaceField(pt::Space & space, FindHelper & find_helper);
void CallSpaceObjectForLastField(pt::Space & space, FindHelper & find_helper); //void CallSpaceObjectForLastField(pt::Space & space, FindHelper & find_helper);
//pt::Space * CallSpaceObjectForMiddleField(const std::wstring & root_space_name, std::vector<std::wstring> & fields, size_t field_index, pt::Space * space); //pt::Space * CallSpaceObjectForMiddleField(const std::wstring & root_space_name, std::vector<std::wstring> & fields, size_t field_index, pt::Space * space);
void CallSpaceTableForLastField(morm::SpaceWrapper & space_wrapper, pt::Space & space, FindHelper & find_helper, size_t model_wrapper_space_table_index); void CallSpaceTableForLastField(morm::SpaceWrapper & space_wrapper, pt::Space & space, FindHelper & find_helper, size_t model_wrapper_space_table_index);
@ -1308,15 +1308,15 @@ bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallDate(
template<class StreamType, bool is_pikotools_stream, bool is_autoescape_stream> //template<class StreamType, bool is_pikotools_stream, bool is_autoescape_stream>
void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallSpaceObjectForLastField(pt::Space & space, FindHelper & find_helper) //void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallSpaceObjectForLastField(pt::Space & space, FindHelper & find_helper)
{ //{
if( !IsTestingFunctionExistence() ) // if( !IsTestingFunctionExistence() )
{ // {
// CHECKME should we convert the last value to last_res? // // CHECKME should we convert the last value to last_res?
DumpSpaceIfNeeded(space, find_helper); // DumpSpaceIfNeeded(space, find_helper);
} // }
} //}
//template<class StreamType, bool is_pikotools_stream, bool is_autoescape_stream> //template<class StreamType, bool is_pikotools_stream, bool is_autoescape_stream>
@ -1432,7 +1432,7 @@ bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallSpace
{ {
pt::Space * space = space_wrapper.get_space(); pt::Space * space = space_wrapper.get_space();
size_t model_wrapper_space_table_index = 0; size_t model_wrapper_space_table_index = 0;
bool status = false; // bool status = false;
/* /*
* *
@ -1445,19 +1445,25 @@ bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallSpace
{ {
if( space->is_object() ) if( space->is_object() )
{ {
std::wstring & next_field = find_helper.fields[find_helper.field_index]; if( find_helper.field_index < find_helper.fields.size() )
pt::Space * next_space = space->get_space(next_field);
if( !next_space )
{ {
CallSpaceObjectForLastField(*space, find_helper); const std::wstring & next_field = find_helper.fields[find_helper.field_index];
status = true; pt::Space * next_space = space->get_space(next_field);
if( next_space )
{
find_helper.field_index += 1;
space = next_space;
}
else
{
break;
}
}
else
{
break;
} }
space = next_space;
if( space )
find_helper.field_index += 1;
} }
else else
if( space->is_table() ) if( space->is_table() )
@ -1468,7 +1474,7 @@ bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallSpace
{ {
CallSpaceTableForLastField(space_wrapper, *space, find_helper, model_wrapper_space_table_index); CallSpaceTableForLastField(space_wrapper, *space, find_helper, model_wrapper_space_table_index);
find_helper.field_index += 1; find_helper.field_index += 1;
status = true; // status = true;
} }
else else
{ {
@ -1494,9 +1500,9 @@ bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallSpace
} }
else else
{ {
PrintLastSpaceField(*space, find_helper); // PrintLastSpaceField(*space, find_helper);
status = true; // status = true;
// increment field_index here? // // increment field_index here?
break; break;
// if( is_last_field ) // if( is_last_field )
@ -1522,7 +1528,18 @@ bool Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::CallSpace
model_wrapper_space_table_index += 1; model_wrapper_space_table_index += 1;
} }
return status; if( space )
{
PrintLastSpaceField(*space, find_helper);
if( !IsTestingFunctionExistence() )
{
DumpSpaceIfNeeded(*space, find_helper);
}
}
return true;
//return status;
} }
@ -1820,8 +1837,6 @@ void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::FindVaria
find_helper.nested_calls = 0; find_helper.nested_calls = 0;
Var<StreamType> * origin_result = find_helper.result; Var<StreamType> * origin_result = find_helper.result;
//Var<StreamType> local_result, local_result2;
//bool use_first_local_result = true;
std::vector<Var<StreamType>> results; std::vector<Var<StreamType>> results;
results.resize(find_helper.fields.size() + 1); results.resize(find_helper.fields.size() + 1);
@ -1829,16 +1844,7 @@ void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::FindVaria
do do
{ {
if( find_helper.is_last_field() ) find_helper.result = find_helper.is_last_field() ? origin_result : &results[find_helper.field_index];
{
find_helper.result = origin_result;
}
else
{
//find_helper.result = use_first_local_result ? &local_result : &local_result2;
//find_helper.result->clear();
find_helper.result = &results[find_helper.field_index];
}
EvaluateVariable(find_helper); EvaluateVariable(find_helper);
@ -1849,11 +1855,16 @@ void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::FindVaria
find_helper.result->type != Var<StreamType>::TYPE_SPACE_WRAPPER ) find_helper.result->type != Var<StreamType>::TYPE_SPACE_WRAPPER )
{ {
find_helper.input = find_helper.result; find_helper.input = find_helper.result;
//use_first_local_result = !use_first_local_result;
} }
find_helper.previous_name = &find_helper.current_name(); find_helper.previous_name = &find_helper.current_name();
find_helper.field_index += 1; find_helper.field_index += 1;
// for space
if( find_helper.field_index >= find_helper.fields.size() + 1 && find_helper.result != origin_result )
{
*origin_result = *find_helper.result;
}
} }
else else
{ {
@ -1886,13 +1897,14 @@ void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::EvaluateV
*find_helper.result = *find_helper.current_var; *find_helper.result = *find_helper.current_var;
} }
if( !find_helper.found && find_helper.previous_name && find_helper.previous_result && if( !find_helper.found && find_helper.previous_name && find_helper.previous_result )
(find_helper.previous_result->type == Var<StreamType>::TYPE_MODEL ||
find_helper.previous_result->type == Var<StreamType>::TYPE_MODEL_CONTAINER_WRAPPER ||
find_helper.previous_result->type == Var<StreamType>::TYPE_SPACE_WRAPPER))
{ {
if( !EvaluateModelField(find_helper) ) if( find_helper.previous_result->type == Var<StreamType>::TYPE_MODEL ||
return; find_helper.previous_result->type == Var<StreamType>::TYPE_MODEL_CONTAINER_WRAPPER )
{
if( !EvaluateModelField(find_helper) )
return; // is the return here needed? may set find_helper.found?
}
} }
if( !find_helper.found ) if( !find_helper.found )
@ -1911,12 +1923,6 @@ void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::EvaluateV
EvaluateFunction(find_helper.current_var->user_function, find_helper); EvaluateFunction(find_helper.current_var->user_function, find_helper);
} }
else else
if( find_helper.current_var->type == Var<StreamType>::TYPE_SPACE_WRAPPER && find_helper.current_var->space_wrapper )
{
// move me below (where TYPE_MODEL_CONTAINER_WRAPPER is used)
find_helper.found = CallSpace(*find_helper.current_var->space_wrapper, find_helper);
}
else
if( find_helper.current_var->type == Var<StreamType>::TYPE_DATE && find_helper.current_var->date ) if( find_helper.current_var->type == Var<StreamType>::TYPE_DATE && find_helper.current_var->date )
{ {
// move me below (where TYPE_MODEL_CONTAINER_WRAPPER is used) // move me below (where TYPE_MODEL_CONTAINER_WRAPPER is used)
@ -1957,7 +1963,13 @@ void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::EvaluateV
find_helper.result->type == Var<StreamType>::TYPE_SPACE_WRAPPER || find_helper.result->type == Var<StreamType>::TYPE_SPACE_WRAPPER ||
find_helper.result->type == Var<StreamType>::TYPE_FUNCTION ) find_helper.result->type == Var<StreamType>::TYPE_FUNCTION )
{ {
find_helper.previous_var->add_child(name, *find_helper.result); Var<StreamType> * previous = find_helper.previous_var->add_child(name, *find_helper.result);
if( find_helper.result->type == Var<StreamType>::TYPE_SPACE_WRAPPER && find_helper.result->space_wrapper )
{
find_helper.result->clear();
find_helper.found = CallSpace(*previous->space_wrapper, find_helper);
}
} }
} }
@ -2706,13 +2718,16 @@ void Generator<StreamType, is_pikotools_stream, is_autoescape_stream>::MakeTextF
if( result.type == Var<StreamType>::Type::TYPE_MODEL_CONTAINER_WRAPPER ) if( result.type == Var<StreamType>::Type::TYPE_MODEL_CONTAINER_WRAPPER )
{ {
//result.model_container_wrapper->increment_iterator();
// what about clear_childs() ?
if( !result.model_container_wrapper->is_iterator_correct() ) if( !result.model_container_wrapper->is_iterator_correct() )
break; break;
} }
else else
// if( result.type == Var<StreamType>::Type::TYPE_SPACE_WRAPPER )
// {
// if( !result.space_wrapper->is_iterator_correct() )
// break;
// }
// else
{ {
break; break;
} }