From a7656d5ccd8443175df5ee6ec942bf17cc242875 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Sun, 21 Nov 2021 21:08:06 +0100 Subject: [PATCH] added space values --- src/generator.h | 127 +++++++++++++++++++++++++++--------------------- 1 file changed, 71 insertions(+), 56 deletions(-) diff --git a/src/generator.h b/src/generator.h index f6fc51d..c11d3eb 100644 --- a/src/generator.h +++ b/src/generator.h @@ -354,7 +354,7 @@ private: //bool CallDate(pt::Date & date, const std::wstring & name, std::vector & fields, size_t & field_index, std::vector> & parameters, Var & result); 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 & 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); @@ -1308,15 +1308,15 @@ bool Generator::CallDate( -template -void Generator::CallSpaceObjectForLastField(pt::Space & space, FindHelper & find_helper) -{ - if( !IsTestingFunctionExistence() ) - { - // CHECKME should we convert the last value to last_res? - DumpSpaceIfNeeded(space, find_helper); - } -} +//template +//void Generator::CallSpaceObjectForLastField(pt::Space & space, FindHelper & find_helper) +//{ +// if( !IsTestingFunctionExistence() ) +// { +// // CHECKME should we convert the last value to last_res? +// DumpSpaceIfNeeded(space, find_helper); +// } +//} //template @@ -1432,7 +1432,7 @@ bool Generator::CallSpace { pt::Space * space = space_wrapper.get_space(); size_t model_wrapper_space_table_index = 0; - bool status = false; +// bool status = false; /* * @@ -1445,19 +1445,25 @@ bool Generator::CallSpace { if( space->is_object() ) { - std::wstring & next_field = find_helper.fields[find_helper.field_index]; - pt::Space * next_space = space->get_space(next_field); - - if( !next_space ) + if( find_helper.field_index < find_helper.fields.size() ) { - CallSpaceObjectForLastField(*space, find_helper); - status = true; + const std::wstring & next_field = find_helper.fields[find_helper.field_index]; + 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 if( space->is_table() ) @@ -1468,7 +1474,7 @@ bool Generator::CallSpace { CallSpaceTableForLastField(space_wrapper, *space, find_helper, model_wrapper_space_table_index); find_helper.field_index += 1; - status = true; +// status = true; } else { @@ -1494,9 +1500,9 @@ bool Generator::CallSpace } else { - PrintLastSpaceField(*space, find_helper); - status = true; - // increment field_index here? +// PrintLastSpaceField(*space, find_helper); +// status = true; +// // increment field_index here? break; // if( is_last_field ) @@ -1522,7 +1528,18 @@ bool Generator::CallSpace 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::FindVaria find_helper.nested_calls = 0; Var * origin_result = find_helper.result; - //Var local_result, local_result2; - //bool use_first_local_result = true; std::vector> results; results.resize(find_helper.fields.size() + 1); @@ -1829,16 +1844,7 @@ void Generator::FindVaria do { - if( find_helper.is_last_field() ) - { - 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]; - } + find_helper.result = find_helper.is_last_field() ? origin_result : &results[find_helper.field_index]; EvaluateVariable(find_helper); @@ -1849,11 +1855,16 @@ void Generator::FindVaria find_helper.result->type != Var::TYPE_SPACE_WRAPPER ) { find_helper.input = find_helper.result; - //use_first_local_result = !use_first_local_result; } find_helper.previous_name = &find_helper.current_name(); 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 { @@ -1886,13 +1897,14 @@ void Generator::EvaluateV *find_helper.result = *find_helper.current_var; } - if( !find_helper.found && find_helper.previous_name && find_helper.previous_result && - (find_helper.previous_result->type == Var::TYPE_MODEL || - find_helper.previous_result->type == Var::TYPE_MODEL_CONTAINER_WRAPPER || - find_helper.previous_result->type == Var::TYPE_SPACE_WRAPPER)) + if( !find_helper.found && find_helper.previous_name && find_helper.previous_result ) { - if( !EvaluateModelField(find_helper) ) - return; + if( find_helper.previous_result->type == Var::TYPE_MODEL || + find_helper.previous_result->type == Var::TYPE_MODEL_CONTAINER_WRAPPER ) + { + if( !EvaluateModelField(find_helper) ) + return; // is the return here needed? may set find_helper.found? + } } if( !find_helper.found ) @@ -1911,12 +1923,6 @@ void Generator::EvaluateV EvaluateFunction(find_helper.current_var->user_function, find_helper); } else - if( find_helper.current_var->type == Var::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::TYPE_DATE && find_helper.current_var->date ) { // move me below (where TYPE_MODEL_CONTAINER_WRAPPER is used) @@ -1957,7 +1963,13 @@ void Generator::EvaluateV find_helper.result->type == Var::TYPE_SPACE_WRAPPER || find_helper.result->type == Var::TYPE_FUNCTION ) { - find_helper.previous_var->add_child(name, *find_helper.result); + Var * previous = find_helper.previous_var->add_child(name, *find_helper.result); + + if( find_helper.result->type == Var::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::MakeTextF if( result.type == Var::Type::TYPE_MODEL_CONTAINER_WRAPPER ) { - //result.model_container_wrapper->increment_iterator(); - // what about clear_childs() ? - if( !result.model_container_wrapper->is_iterator_correct() ) break; } else +// if( result.type == Var::Type::TYPE_SPACE_WRAPPER ) +// { +// if( !result.space_wrapper->is_iterator_correct() ) +// break; +// } +// else { break; }