diff --git a/src/ezc.cpp b/src/ezc.cpp index 3b7058e..3157936 100644 --- a/src/ezc.cpp +++ b/src/ezc.cpp @@ -836,7 +836,7 @@ Item * pitem; else pitem = new Item(); - item_table.push_back(pitem); + item_tab.push_back(pitem); return pitem; } @@ -850,12 +850,12 @@ Pattern::Item * Pattern::Item::AddItem(const Pattern::Item & porg) void Pattern::Item::ClearItems() { - std::vector::iterator i = item_table.begin(); + std::vector::iterator i = item_tab.begin(); - for( ; i != item_table.end() ; ++i ) + for( ; i != item_tab.end() ; ++i ) delete *i; - item_table.clear(); + item_tab.clear(); } @@ -871,20 +871,20 @@ void Pattern::Item::Clear() Pattern::Item::Type Pattern::Item::LastItemType() { - if( item_table.empty() ) + if( item_tab.empty() ) return item_none; -return item_table.back()->type; +return item_tab.back()->type; } void Pattern::Item::DeleteLastItem() { - if( item_table.empty() ) + if( item_tab.empty() ) return; - delete item_table.back(); - item_table.pop_back(); + delete item_tab.back(); + item_tab.pop_back(); } @@ -914,9 +914,9 @@ return *this; void Pattern::Item::CopyItemTable(const Pattern::Item & item) { - std::vector::const_iterator i = item.item_table.begin(); + std::vector::const_iterator i = item.item_tab.begin(); - for( ; i != item.item_table.end() ; ++i) + for( ; i != item.item_tab.end() ; ++i) AddItem( *i ); } @@ -976,7 +976,7 @@ void Functions::Insert(const std::string & key, UserFunction ufunction) f.type = function; f.user_function = ufunction; - functions_table[key] = f; + functions_tab[key] = f; } @@ -986,7 +986,7 @@ void Functions::Insert(const std::string & key, const char * var) f.type = variable; f.variable = var; - functions_table[key] = f; + functions_tab[key] = f; } @@ -996,15 +996,15 @@ void Functions::Insert(const std::string & key, const std::string & var) f.type = variable; f.variable = var; - functions_table[key] = f; + functions_tab[key] = f; } bool Functions::Find(const std::string & key, Function ** fun) { - FunctionsTable::iterator i = functions_table.find( key ); + FunctionsTable::iterator i = functions_tab.find( key ); - if( i == functions_table.end() ) + if( i == functions_tab.end() ) return false; *fun = &(i->second); @@ -1015,7 +1015,7 @@ return true; void Functions::Clear() { - functions_table.clear(); + functions_tab.clear(); } @@ -1200,9 +1200,9 @@ return called; void Generator::MakeTextContainer(Pattern::Item & item) { - std::vector::iterator i = item.item_table.begin(); + std::vector::iterator i = item.item_tab.begin(); - for( ; i != item.item_table.end() && !break_generating ; ++i ) + for( ; i != item.item_tab.end() && !break_generating ; ++i ) MakeText(**i); } @@ -1226,14 +1226,14 @@ void Generator::MakeTextIf_go(Pattern::Item & item, bool result) { if( result ) { - if( item.item_table.size() > 0 ) - MakeText( *item.item_table[0] ); + if( item.item_tab.size() > 0 ) + MakeText( *item.item_tab[0] ); } else { // second element can be (or not -- it's from [else]) - if( item.item_table.size() > 1 ) - MakeText( *item.item_table[1] ); + if( item.item_tab.size() > 1 ) + MakeText( *item.item_tab[1] ); } } @@ -1457,8 +1457,8 @@ bool info_res; if( !info_res ) break; - if( !item.item_table.empty() ) - MakeText( *item.item_table[0] ); // should be only one item - item_container + if( !item.item_tab.empty() ) + MakeText( *item.item_tab[0] ); // should be only one item - item_container } } diff --git a/src/ezc.h b/src/ezc.h index 110b0fc..192367e 100644 --- a/src/ezc.h +++ b/src/ezc.h @@ -102,7 +102,7 @@ public: Type type; std::string text; // used in: item_text, item_include (as a file name) - std::vector item_table; // !! zamienic na 'items'? + std::vector item_tab; // !! zamienic na 'items'? std::vector functions; Item(); @@ -265,7 +265,7 @@ public: private: typedef std::map FunctionsTable; - FunctionsTable functions_table; + FunctionsTable functions_tab; };