diff -ur nci-orig/suif/suif2b/basepasses/linksuif/ansic.cpp nci/suif/suif2b/basepasses/linksuif/ansic.cpp --- nci-orig/suif/suif2b/basepasses/linksuif/ansic.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/linksuif/ansic.cpp Thu May 31 09:00:41 2001 @@ -170,7 +170,7 @@ add_warning(qt1, qt2, "(composite is not a datatype)"); return NULL; } - list qual; + suif_list qual; Iter it = qt1->get_qualification_iterator(); for (; it.is_valid(); it.next()) { qual.push_back(it.current()); @@ -311,9 +311,9 @@ -list ANSIC::get_arg_list(CProcedureType *proc) +suif_list ANSIC::get_arg_list(CProcedureType *proc) { - list lst; + suif_list lst; for (Iter it = proc->get_argument_iterator(); it.is_valid(); it.next()) { @@ -338,7 +338,7 @@ map); if (carg == NULL) return NULL; } - list args = get_arg_list(proc); + suif_list args = get_arg_list(proc); return get_c_procedure_type(proc->get_suif_env(), to(ret), args, false, true, proc->get_bit_alignment()); } @@ -357,7 +357,7 @@ add_warning(t1, t2, "(argument count mismatch)"); return NULL; } - list cargs; + suif_list cargs; for (size_t i=0; iget_argument_count(); i++) { Type *c = get_composite(t1->get_argument(i), t2->get_argument(i), map); @@ -385,7 +385,7 @@ return NULL; } if (!t1->get_arguments_known() && !t2->get_arguments_known()) { - list args; + suif_list args; return get_c_procedure_type(t1->get_suif_env(), to(ret), args, false, false, t1->get_bit_alignment()); } diff -ur nci-orig/suif/suif2b/basepasses/linksuif/ansic.h nci/suif/suif2b/basepasses/linksuif/ansic.h --- nci-orig/suif/suif2b/basepasses/linksuif/ansic.h Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/linksuif/ansic.h Thu May 31 09:00:41 2001 @@ -87,7 +87,7 @@ MultiDimArrayType *t2, TypePairStack *map); - list get_arg_list(CProcedureType *proc); + suif_list get_arg_list(CProcedureType *proc); Type* get_composite_1prototype(Type* ret, CProcedureType *proc, diff -ur nci-orig/suif/suif2b/basepasses/linksuif/merge_fsb.cpp nci/suif/suif2b/basepasses/linksuif/merge_fsb.cpp --- nci-orig/suif/suif2b/basepasses/linksuif/merge_fsb.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/linksuif/merge_fsb.cpp Thu May 31 09:00:41 2001 @@ -96,7 +96,7 @@ SymbolTable *symtab) { Type *basetype = merge_type(oldtype->get_base_type(), map, symtab); - list qual; + suif_list qual; for (Iter it = oldtype->get_qualification_iterator(); it.is_valid(); it.next()) { @@ -160,7 +160,7 @@ SymbolTable *symtab) { Type* result = merge_type(oldtype->get_result_type(), typemap, symtab); - list args; + suif_list args; for (unsigned i=0; iget_argument_count(); i++) args.push_back(to(merge_type(oldtype->get_argument(i), typemap, symtab))); diff -ur nci-orig/suif/suif2b/basepasses/linksuif/replace_map.cpp nci/suif/suif2b/basepasses/linksuif/replace_map.cpp --- nci-orig/suif/suif2b/basepasses/linksuif/replace_map.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/linksuif/replace_map.cpp Thu May 31 09:00:41 2001 @@ -135,9 +135,9 @@ } */ -list * ReplaceMap::get_sources(void) +suif_list * ReplaceMap::get_sources(void) { - list *sources = new list; + suif_list *sources = new suif_list; for (suif_hash_map::iterator it = _map.begin(); diff -ur nci-orig/suif/suif2b/basepasses/linksuif/replace_map.h nci/suif/suif2b/basepasses/linksuif/replace_map.h --- nci-orig/suif/suif2b/basepasses/linksuif/replace_map.h Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/linksuif/replace_map.h Thu May 31 09:00:41 2001 @@ -57,7 +57,7 @@ */ // SymbolTableObject* get_nth_source(unsigned i); - list *get_sources(void); + suif_list *get_sources(void); /** Print the content of this map. * @param out the ostream. diff -ur nci-orig/suif/suif2b/basepasses/linksuif/suif_linker.cpp nci/suif/suif2b/basepasses/linksuif/suif_linker.cpp --- nci-orig/suif/suif2b/basepasses/linksuif/suif_linker.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/linksuif/suif_linker.cpp Thu May 31 09:00:41 2001 @@ -23,9 +23,9 @@ void SuifLinker::cleanup_symtab(ReplaceMap *rmap) { - list *sources = rmap->get_sources(); + suif_list *sources = rmap->get_sources(); - list::iterator it; + suif_list::iterator it; for (it = sources->begin(); it != sources->end(); diff -ur nci-orig/suif/suif2b/basepasses/transforms/array_dismantlers.cpp nci/suif/suif2b/basepasses/transforms/array_dismantlers.cpp --- nci-orig/suif/suif2b/basepasses/transforms/array_dismantlers.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/transforms/array_dismantlers.cpp Thu May 31 09:00:41 2001 @@ -49,10 +49,10 @@ } void ArrayReferenceDismantlerPass:: do_procedure_definition(ProcedureDefinition *pd) { - list *l = collect_objects(pd); + suif_list *l = collect_objects(pd); TypeBuilder *tb = (TypeBuilder *) _env->get_object_factory(TypeBuilder::get_class_name()); - for (list::iterator iter = l->begin(); + for (suif_list::iterator iter = l->begin(); iter != l->end(); iter++) { ArrayReferenceExpression *cal = *iter; @@ -179,7 +179,7 @@ suif_hash_map type_map; ReplacingWalker walker(env); - list type_list; + suif_list type_list; for (Iter titer = object_iterator(file_set_block); @@ -189,7 +189,7 @@ type_list.push_back(type); } - for (list::iterator tliter = type_list.begin();tliter != type_list.end();tliter ++) { + for (suif_list::iterator tliter = type_list.begin();tliter != type_list.end();tliter ++) { MultiDimArrayType *type = *tliter; Type *rep_type = disassemble_multi_array_type(env,type_builder,type); type_map.enter_value(type,rep_type); @@ -434,7 +434,7 @@ suif_vector lower_bounds; suif_vector upper_bounds; - list indices; + suif_list indices; IInteger bit_size, bit_alignment; suif_vector exprs; @@ -556,7 +556,7 @@ offset); // now when we have the expression, set the indices - for (list::iterator ind_iter = indices.begin(); + for (suif_list::iterator ind_iter = indices.begin(); ind_iter!=indices.end(); ind_iter++) { Expression* index = *ind_iter; @@ -620,7 +620,7 @@ #endif CONVERT_TYPES // collect tops of array access chains into this list - list ref_exprs; + suif_list ref_exprs; for (Iter are_iter = object_iterator(proc_def); are_iter.is_valid(); are_iter.next()) @@ -636,7 +636,7 @@ } // for top all expressions, convert them to multi-exprs - for(list::iterator ref_iter = ref_exprs.begin(); + for(suif_list::iterator ref_iter = ref_exprs.begin(); ref_iter != ref_exprs.end(); ref_iter++) { ArrayReferenceExpression* top_array = *ref_iter; diff -ur nci-orig/suif/suif2b/basepasses/transforms/expression_dismantlers.cpp nci/suif/suif2b/basepasses/transforms/expression_dismantlers.cpp --- nci-orig/suif/suif2b/basepasses/transforms/expression_dismantlers.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/transforms/expression_dismantlers.cpp Thu May 31 09:00:41 2001 @@ -123,15 +123,15 @@ void CallExpressionDismantlerPass:: do_procedure_definition(ProcedureDefinition *pd) { - list *l = collect_objects(pd); - for (list::iterator iter = l->begin(); + suif_list *l = collect_objects(pd); + for (suif_list::iterator iter = l->begin(); iter != l->end(); iter++) { CallExpression *cal = *iter; //suif_information(cal, 1, "Preprocessing Call"); //list *store_list = force_dest_not_expr(cal); - list call_list; + suif_list call_list; force_call_dest_not_expr(cal, &call_list); - for (list::iterator siter = + for (suif_list::iterator siter = call_list.begin(); siter != call_list.end(); siter++) { //suif_information(cal, 1, "Dismantling Call"); CallExpression *cal_expr = *siter; @@ -156,8 +156,8 @@ void LoadExpressionDismantlerPass:: do_procedure_definition(ProcedureDefinition *pd) { - list *l = collect_objects(pd); - for (list::iterator iter = l->begin(); + suif_list *l = collect_objects(pd); + for (suif_list::iterator iter = l->begin(); iter != l->end(); iter++) { LoadExpression *load = *iter; force_dest_not_expr(load); @@ -209,7 +209,7 @@ static LString k_fields = "fields"; // This is a suif1 convention - list l; + suif_list l; // collect all expression with a "fields" annotation for (Iter iter = object_iterator(pd); iter.is_valid(); iter.next()) { @@ -220,7 +220,7 @@ } } - for (list::iterator eiter = l.begin(); + for (suif_list::iterator eiter = l.begin(); eiter != l.end(); eiter++) { Expression *expr = *eiter; if (!process_a_field_expression(expr)) { @@ -294,7 +294,7 @@ // IInteger offset // try to do the transform. - list access_list; + suif_list access_list; bool OK = false; IInteger actual_offset = 0; @@ -395,12 +395,12 @@ IInteger _evb_val; IInteger _base_offset; int _count; - list *_new_list; + suif_list *_new_list; TypeBuilder *_tb; public: repeat_builder(SuifEnv *s) : _s(s), _evb(NULL), _evb_val(0), _base_offset(0), _count(0), - _new_list(new list), + _new_list(new suif_list), _tb(NULL) { _tb = (TypeBuilder *)s->get_object_factory(TypeBuilder::get_class_name()); @@ -499,7 +499,7 @@ clear_pending(); // Now walk over the "new_list" and add them back - {for (list::iterator iter = + {for (suif_list::iterator iter = _new_list->begin(); iter != _new_list->end(); iter++) { // use add because it's faster. IInteger ii = (*iter).first; diff -ur nci-orig/suif/suif2b/basepasses/transforms/function_dismantlers.cpp nci/suif/suif2b/basepasses/transforms/function_dismantlers.cpp --- nci-orig/suif/suif2b/basepasses/transforms/function_dismantlers.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/transforms/function_dismantlers.cpp Thu May 31 09:00:41 2001 @@ -25,7 +25,7 @@ void DismantleStructuredReturns::do_file_set_block( FileSetBlock* file_set_block ) { suif_map type_map; - list ref_exprs; + suif_list ref_exprs; SuifEnv *env = 0; TypeBuilder *tb = 0; VoidType *vt = 0; diff -ur nci-orig/suif/suif2b/basepasses/transforms/region_passes.cpp nci/suif/suif2b/basepasses/transforms/region_passes.cpp --- nci-orig/suif/suif2b/basepasses/transforms/region_passes.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/transforms/region_passes.cpp Thu May 31 09:00:41 2001 @@ -31,9 +31,9 @@ return Walker::Continue; }; - list* get_list(){return &statements;}; + suif_list* get_list(){return &statements;}; protected: - list statements; + suif_list statements; }; RemoveIfAndLoopWalker::RemoveIfAndLoopWalker(SuifEnv* the_env, ProcedureDefinition* proc_def, bool preserve_ifs) @@ -80,8 +80,8 @@ walker.set_post_order(); proc_def->walk(walker); - list* lists = walker.get_list(); - for(list::iterator iter = lists->begin();iter!=lists->end();iter++){ + suif_list* lists = walker.get_list(); + for(suif_list::iterator iter = lists->begin();iter!=lists->end();iter++){ StatementList* the_list = *iter; @@ -107,14 +107,14 @@ }} // Move the annotes - list an_list; + suif_list an_list; {for (Iter iter = the_list->get_annote_iterator(); iter.is_valid(); iter.next()) { Annote *an = iter.current(); an_list.push_back(an); }} - {for (list::iterator iter = an_list.begin(); + {for (suif_list::iterator iter = an_list.begin(); iter != an_list.end(); iter++) { //fprintf(stderr, "Moving annotes from %p to %p\n", the_list, parent_list); Annote *an = *iter; @@ -346,10 +346,10 @@ }; void CFor2ForPass::do_procedure_definition(ProcedureDefinition *proc_def){ - list* to_be_converted = + suif_list* to_be_converted = collect_objects(proc_def); - {for (list::iterator iter = to_be_converted->begin(); + {for (suif_list::iterator iter = to_be_converted->begin(); iter!=to_be_converted->end(); iter++) { CForStatement* cfor = *iter; @@ -402,8 +402,8 @@ template static void eliminate_jumps_into(ProcedureDefinition* proc_def, T* dummy=0){ - list* stmt_list = collect_objects(proc_def); - list::iterator iter = stmt_list->begin(); + suif_list* stmt_list = collect_objects(proc_def); + suif_list::iterator iter = stmt_list->begin(); for ( ; iter != stmt_list->end(); iter++) { T* stmt = *iter; @@ -628,10 +628,10 @@ void IfConditionsToBinaryExprs::do_procedure_definition(ProcedureDefinition *proc_def){ SuifEnv* suif_env = proc_def->get_suif_env(); - list* to_be_converted = + suif_list* to_be_converted = collect_objects(proc_def); - {for ( list::iterator iter = to_be_converted->begin(); + {for ( suif_list::iterator iter = to_be_converted->begin(); iter!=to_be_converted->end(); iter++) { IfStatement* the_if = *iter; @@ -652,4 +652,4 @@ }} delete to_be_converted; -}; \ No newline at end of file +}; diff -ur nci-orig/suif/suif2b/basepasses/transforms/statement_dismantlers.cpp nci/suif/suif2b/basepasses/transforms/statement_dismantlers.cpp --- nci-orig/suif/suif2b/basepasses/transforms/statement_dismantlers.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/transforms/statement_dismantlers.cpp Thu May 31 09:00:41 2001 @@ -309,14 +309,14 @@ // I modifed this to build a list so we aren't iterating over // a changing object (which didn't work. and I don't expect it to) - list l; + suif_list l; {for (Iter iter = symbol_table->get_symbol_table_object_iterator(); iter.is_valid(); iter.next()) { l.push_back(iter.current()); }} - for (list::iterator iter = + for (suif_list::iterator iter = l.begin(); iter != l.end(); iter++) { SymbolTableObject *object = *iter; @@ -507,7 +507,7 @@ void generate_code_subgroup(StatementList *x,IInteger bound_below,IInteger bound_above, int low,int high); - list _list; + suif_list _list; SuifEnv *_env; CodeLabelSymbol *_default_lab; VariableSymbol *_decision; @@ -899,7 +899,7 @@ void DismantleEmptyScopeStatements:: do_procedure_definition(ProcedureDefinition *pd) { - list *l = collect_objects(pd); + suif_list *l = collect_objects(pd); while (!l->empty()) { ScopeStatement *sc = l->front(); l->pop_front(); @@ -968,7 +968,7 @@ void DismantleCallArguments:: do_procedure_definition(ProcedureDefinition *pd) { - list *l = collect_objects(pd); + suif_list *l = collect_objects(pd); while (!l->empty()) { CallStatement *call = l->front(); l->pop_front(); @@ -977,7 +977,7 @@ Expression *arg = call->get_argument(i); if (!arg) continue; if (is_kind_of(arg)) continue; - list l; + suif_list l; force_dest_not_expr(arg, l); } } @@ -987,8 +987,8 @@ void GuardAllFors:: do_procedure_definition(ProcedureDefinition *pd) { - list *l = collect_objects(pd); - for (list::iterator it = l->begin(); it != l->end(); it++) { + suif_list *l = collect_objects(pd); + for (suif_list::iterator it = l->begin(); it != l->end(); it++) { ForStatement *the_for = *it; // This may replace the for statement. // with a lower bound assignment or diff -ur nci-orig/suif/suif2b/basepasses/transforms/symbol_walkers.cpp nci/suif/suif2b/basepasses/transforms/symbol_walkers.cpp --- nci-orig/suif/suif2b/basepasses/transforms/symbol_walkers.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/transforms/symbol_walkers.cpp Thu May 31 09:00:41 2001 @@ -224,7 +224,7 @@ } else { if (file_scope_symbol_tables) { // or the file scope tables - for (list::iterator iter = + for (suif_list::iterator iter = file_scope_symbol_tables->begin(); iter != file_scope_symbol_tables->end(); iter++) { @@ -302,7 +302,7 @@ } void AvoidFileScopeCollisions::do_file_set_block( FileSetBlock* file_set_block ) { - list file_scope_tables; + suif_list file_scope_tables; for (Iter iter = file_set_block->get_file_block_iterator(); iter.is_valid(); iter.next()) { @@ -322,7 +322,7 @@ void AvoidLabelCollisions::do_procedure_definition( ProcedureDefinition *proc_def ) { // get a list of all of the Labels in the procedure. - list* l = collect_objects(proc_def); + suif_list* l = collect_objects(proc_def); suif_hash_map label_defined; // It's an n^2 algorithm. If this ever becomes @@ -342,7 +342,7 @@ } void CombinedPass::do_file_set_block( FileSetBlock* file_set_block ) { - list file_scope_tables; + suif_list file_scope_tables; for (Iter iter = file_set_block->get_file_block_iterator(); iter.is_valid(); iter.next()) diff -ur nci-orig/suif/suif2b/basepasses/transforms/symbol_walkers.h nci/suif/suif2b/basepasses/transforms/symbol_walkers.h --- nci-orig/suif/suif2b/basepasses/transforms/symbol_walkers.h Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/transforms/symbol_walkers.h Thu May 31 09:00:41 2001 @@ -72,14 +72,14 @@ class CollisionAvoider : public SelectiveWalker { BasicSymbolTable *external_symbol_table; - list *file_scope_symbol_tables; + suif_list *file_scope_symbol_tables; LString source_file_name; bool name_all_symbols; public: CollisionAvoider(SuifEnv *env, BasicSymbolTable *the_external_symbol_table, - list *the_file_scope_symbol_tables, + suif_list *the_file_scope_symbol_tables, LString source_file_name, bool name_all) : SelectiveWalker(env,Symbol::get_class_name()), diff -ur nci-orig/suif/suif2b/basepasses/usefulpasses/gc_symbol_table_pass.cpp nci/suif/suif2b/basepasses/usefulpasses/gc_symbol_table_pass.cpp --- nci-orig/suif/suif2b/basepasses/usefulpasses/gc_symbol_table_pass.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/usefulpasses/gc_symbol_table_pass.cpp Thu May 31 09:00:41 2001 @@ -46,8 +46,6 @@ return false; } -#define suif_list list - void GCSymbolTablePass::execute(void) { // Let's try a little optimization. diff -ur nci-orig/suif/suif2b/basepasses/usefulpasses/inline_pass.cpp nci/suif/suif2b/basepasses/usefulpasses/inline_pass.cpp --- nci-orig/suif/suif2b/basepasses/usefulpasses/inline_pass.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/usefulpasses/inline_pass.cpp Thu May 31 09:00:41 2001 @@ -38,11 +38,11 @@ #else typedef CallStatement CallType; #endif - list *l = collect_objects(proc); + suif_list *l = collect_objects(proc); // Let's go nuts... Inline EVERYTHING!!! // It's just a test.. for ( - list::iterator iter = l->begin(); + suif_list::iterator iter = l->begin(); iter != l->end(); iter++) { CallType *the_call = *iter; ProcedureSymbol *proc = get_procedure_target_from_call(the_call); diff -ur nci-orig/suif/suif2b/basepasses/usefulpasses/source_lang_support.cpp nci/suif/suif2b/basepasses/usefulpasses/source_lang_support.cpp --- nci-orig/suif/suif2b/basepasses/usefulpasses/source_lang_support.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/usefulpasses/source_lang_support.cpp Thu May 31 09:00:41 2001 @@ -67,10 +67,10 @@ }; void set_source_language(FileSetBlock* fsb, LString lang){ - list* to_be_set = + suif_list* to_be_set = collect_objects(fsb); - {for (list::iterator iter = to_be_set->begin(); + {for (suif_list::iterator iter = to_be_set->begin(); iter != to_be_set->end(); iter++) { ProcedureSymbol* proc_sym= *iter; @@ -107,10 +107,10 @@ } { - list* to_be_converted = + suif_list* to_be_converted = collect_objects(proc_def); - {for (list::iterator iter = to_be_converted->begin(); + {for (suif_list::iterator iter = to_be_converted->begin(); iter!=to_be_converted->end(); iter++) { LoadExpression* load = *iter; @@ -134,10 +134,10 @@ } { - list* to_be_converted = + suif_list* to_be_converted = collect_objects(proc_def); - {for (list::iterator iter = to_be_converted->begin(); + {for (suif_list::iterator iter = to_be_converted->begin(); iter!=to_be_converted->end(); iter++) { StoreStatement* store = *iter; @@ -205,10 +205,10 @@ } { - list* to_be_unconverted = + suif_list* to_be_unconverted = collect_objects(proc_def); - {for (list::iterator iter = to_be_unconverted->begin(); + {for (suif_list::iterator iter = to_be_unconverted->begin(); iter!=to_be_unconverted->end(); iter++) { LoadVariableExpression* load_var = *iter; @@ -229,10 +229,10 @@ } { - list* to_be_unconverted = + suif_list* to_be_unconverted = collect_objects(proc_def); - {for (list::iterator iter = to_be_unconverted->begin(); + {for (suif_list::iterator iter = to_be_unconverted->begin(); iter!=to_be_unconverted->end(); iter++) { StoreVariableStatement* store_var = *iter; diff -ur nci-orig/suif/suif2b/basepasses/usefulpasses/strip_annotes_pass.cpp nci/suif/suif2b/basepasses/usefulpasses/strip_annotes_pass.cpp --- nci-orig/suif/suif2b/basepasses/usefulpasses/strip_annotes_pass.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/usefulpasses/strip_annotes_pass.cpp Thu May 31 09:00:41 2001 @@ -21,7 +21,7 @@ void StripAnnotesPass::do_file_set_block(FileSetBlock *fsb) { - list names; + suif_list names; for (suif_vector< String >::iterator it = annote_name_args.begin(); it != annote_name_args.end(); diff -ur nci-orig/suif/suif2b/basepasses/usefulpasses/suif_gc.cpp nci/suif/suif2b/basepasses/usefulpasses/suif_gc.cpp --- nci-orig/suif/suif2b/basepasses/usefulpasses/suif_gc.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basepasses/usefulpasses/suif_gc.cpp Thu May 31 09:00:41 2001 @@ -97,7 +97,7 @@ return; _symtab = symtab; root->walk(*this); - list l; + suif_list l; for (Iter it = _symtab-> get_symbol_table_object_iterator(); it.is_valid(); @@ -107,7 +107,7 @@ l.push_back(symobj); } } - for (list::iterator liter = l.begin(); + for (suif_list::iterator liter = l.begin(); liter != l.end(); liter++) { SymbolTableObject *symobj = *liter; _symtab->remove_symbol(symobj); diff -ur nci-orig/suif/suif2b/basesuif/basicnodes/basic.hoof nci/suif/suif2b/basesuif/basicnodes/basic.hoof --- nci-orig/suif/suif2b/basesuif/basicnodes/basic.hoof Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/basicnodes/basic.hoof Thu May 31 09:00:41 2001 @@ -416,4 +416,4 @@ list information_blocks; }; - } \ No newline at end of file + } diff -ur nci-orig/suif/suif2b/basesuif/iokernel/iokernel_forwarders.h nci/suif/suif2b/basesuif/iokernel/iokernel_forwarders.h --- nci-orig/suif/suif2b/basesuif/iokernel/iokernel_forwarders.h Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/iokernel/iokernel_forwarders.h Thu May 31 09:00:41 2001 @@ -109,7 +109,7 @@ #if defined(USE_STL) || defined(STL_LIST) #include #else -template class list; +template class suif_list; #endif #if USE_STL || USE_VECTOR_STL #include diff -ur nci-orig/suif/suif2b/basesuif/iokernel/list_meta_class.cpp nci/suif/suif2b/basesuif/iokernel/list_meta_class.cpp --- nci-orig/suif/suif2b/basesuif/iokernel/list_meta_class.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/iokernel/list_meta_class.cpp Thu May 31 09:00:41 2001 @@ -180,14 +180,14 @@ // would like to avoid expense of an interator here Iterator* iterator = get_iterator( instance ); if(walk.get_makes_changes()) { - list

elements; + suif_list

elements; if (is_kind_of(_element_meta_class)) { while ( iterator->is_valid() ) { Address* ptr = (Address * ) iterator->current(); elements.push_back(*ptr); iterator->next(); } - list

::iterator iter = elements.begin(); + suif_list

::iterator iter = elements.begin(); while (iter != elements.end()) { Address current = *iter; Walker::ApplyStatus status; @@ -209,7 +209,7 @@ elements.push_back(iterator->current()); iterator->next(); } - list

::iterator iter = elements.begin(); + suif_list

::iterator iter = elements.begin(); while (iter != elements.end()) { Address current = *iter; Walker::ApplyStatus status; diff -ur nci-orig/suif/suif2b/basesuif/iokernel/object_factory.cpp nci/suif/suif2b/basesuif/iokernel/object_factory.cpp --- nci-orig/suif/suif2b/basesuif/iokernel/object_factory.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/iokernel/object_factory.cpp Thu May 31 09:00:46 2001 @@ -599,7 +599,7 @@ struct x_list { char ch; - list field; + suif_list field; }; struct x_searchable_list @@ -676,7 +676,7 @@ list_meta_class->set_alignment(OFFSETOF(x_indexed_list,field)); } else if (lname == String("list")) { - list_meta_class->set_size(sizeof(list)); + list_meta_class->set_size(sizeof(suif_list)); list_meta_class->set_alignment(OFFSETOF(x_list,field)); } else if (lname == String("searchable_list")) { @@ -699,7 +699,13 @@ list_meta_class->set_size(sizeof(suif_vector)); list_meta_class->set_alignment(OFFSETOF(x_vector,field)); } - + else + { + while(1==1) + { + printf(lname); + } + } // else printf(" don't know\n"); enter_meta_class( list_meta_class ); diff -ur nci-orig/suif/suif2b/basesuif/iokernel/object_stream.cpp nci/suif/suif2b/basesuif/iokernel/object_stream.cpp --- nci-orig/suif/suif2b/basesuif/iokernel/object_stream.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/iokernel/object_stream.cpp Thu May 31 09:00:41 2001 @@ -160,7 +160,7 @@ InputStream::InputStream( ObjectFactory* of ) : _of(of), _data(new TempStorageMapType), _address_map(new AddressMapType), - _root_objects(new list), + _root_objects(new suif_list), _last_id(1) { } diff -ur nci-orig/suif/suif2b/basesuif/iokernel/object_stream.h nci/suif/suif2b/basesuif/iokernel/object_stream.h --- nci-orig/suif/suif2b/basesuif/iokernel/object_stream.h Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/iokernel/object_stream.h Thu May 31 09:00:41 2001 @@ -202,7 +202,7 @@ ObjectFactory* _of; TempStorageMapType* _data; AddressMapType* _address_map; - list* _root_objects; + suif_list* _root_objects; size_t _last_id; // used for an optimization InputStream&operator=(const InputStream&); InputStream(const InputStream&); diff -ur nci-orig/suif/suif2b/basesuif/iokernel/string_meta_class.cpp nci/suif/suif2b/basesuif/iokernel/string_meta_class.cpp --- nci-orig/suif/suif2b/basesuif/iokernel/string_meta_class.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/iokernel/string_meta_class.cpp Thu May 31 09:00:46 2001 @@ -23,11 +23,11 @@ const LString& StringMetaClass::get_class_name() {return string_meta_class_class_name;} -size_t hash(const String &s) { +size_t suif_hash(const String &s) { const char* ptr = s.c_str(); unsigned int hash_value = 0; while ( *ptr ) { hash_value+=*ptr;ptr++; } - return hash( hash_value ); + return suif_hash( hash_value ); } diff -ur nci-orig/suif/suif2b/basesuif/macro_suifobj_adapter/MacroObjAdapterBase.cpp nci/suif/suif2b/basesuif/macro_suifobj_adapter/MacroObjAdapterBase.cpp --- nci-orig/suif/suif2b/basesuif/macro_suifobj_adapter/MacroObjAdapterBase.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/macro_suifobj_adapter/MacroObjAdapterBase.cpp Thu May 31 09:00:46 2001 @@ -17,7 +17,7 @@ //FormattedText x; -static int hash(const Address addr) { +static int suif_hash(const Address addr) { int i = (int)addr; return i + (i << 2); } @@ -42,7 +42,7 @@ _address(obj.get_address()),_id(obj.get_meta_class()->get_meta_class_id()) {} int MacroObjectKey::hash() const { - return ::hash(_address) + _id; + return ::suif_hash(_address) + _id; } MacroObjectPtr MacroObjectBuilder::build_macro_object(const ObjectWrapper &obj) diff -ur nci-orig/suif/suif2b/basesuif/macro_suifobj_adapter/MacroObjAdapterBase.h nci/suif/suif2b/basesuif/macro_suifobj_adapter/MacroObjAdapterBase.h --- nci-orig/suif/suif2b/basesuif/macro_suifobj_adapter/MacroObjAdapterBase.h Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/macro_suifobj_adapter/MacroObjAdapterBase.h Thu May 31 09:00:46 2001 @@ -22,7 +22,7 @@ int hash() const; }; -int hash(const MacroObjectKey &x) {return x.hash();} +int suif_hash(const MacroObjectKey &x) {return x.hash();} class MacroObjectBuilder { suif_hash_mapbuilt_ptrs; diff -ur nci-orig/suif/suif2b/basesuif/samples/createnode/create_suif_complex_input.cpp nci/suif/suif2b/basesuif/samples/createnode/create_suif_complex_input.cpp --- nci-orig/suif/suif2b/basesuif/samples/createnode/create_suif_complex_input.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/samples/createnode/create_suif_complex_input.cpp Thu May 31 09:00:41 2001 @@ -158,7 +158,7 @@ _argc_type = _tb->get_integer_type(sizeof(int),sizeof(int)*8,true); _q_argc_type = _tb->get_qualified_type(_argc_type); - list ql; + suif_list ql; _printf_type = _tb->get_c_procedure_type(_argc_type, ql, false,true,sizeof(int)); // ext_table -> append_symbol_table_object( _printf_type ); @@ -182,7 +182,7 @@ _q_argv_type = _tb->get_qualified_type(_argv_type); - list qlist; + suif_list qlist; qlist.push_back(_q_argc_type); qlist.push_back(_q_argv_type); diff -ur nci-orig/suif/suif2b/basesuif/samples/hello_world/create_suif_hello_world.cpp nci/suif/suif2b/basesuif/samples/hello_world/create_suif_hello_world.cpp --- nci-orig/suif/suif2b/basesuif/samples/hello_world/create_suif_hello_world.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/samples/hello_world/create_suif_hello_world.cpp Thu May 31 09:00:41 2001 @@ -89,7 +89,7 @@ PointerType *argv_type = tb->get_pointer_type(q_char_ptr_type); QualifiedType *q_argv_type = tb->get_qualified_type(argv_type); - list ql; + suif_list ql; ql.push_back(q_argc_type); ql.push_back(q_argv_type); CProcedureType *main_type = @@ -114,7 +114,7 @@ main_definition->get_symbol_table()->add_symbol(argv_symbol); main_definition->append_formal_parameter(argv_symbol); - list arg_list; + suif_list arg_list; arg_list.push_back(q_char_ptr_type); CProcedureType *printf_type = tb->get_c_procedure_type(argc_type,arg_list, false,true,sizeof(int)*BITS_PER_BYTE); diff -ur nci-orig/suif/suif2b/basesuif/suifkernel/dll_subsystem.cpp nci/suif/suif2b/basesuif/suifkernel/dll_subsystem.cpp --- nci-orig/suif/suif2b/basesuif/suifkernel/dll_subsystem.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifkernel/dll_subsystem.cpp Thu May 31 09:00:41 2001 @@ -60,7 +60,7 @@ DLLSubSystem::DLLSubSystem( SuifEnv* suif_env ) : SubSystem( suif_env ), - _loaded( new list ) + _loaded( new suif_list ) { } @@ -75,7 +75,7 @@ } bool DLLSubSystem::is_DLL_loaded( const LString& libraryName ) { - for (list::iterator iter = _loaded->begin(); + for (suif_list::iterator iter = _loaded->begin(); iter != _loaded->end(); iter++) { if ((*iter) == libraryName) return(true); } diff -ur nci-orig/suif/suif2b/basesuif/suifkernel/dll_subsystem.h nci/suif/suif2b/basesuif/suifkernel/dll_subsystem.h --- nci-orig/suif/suif2b/basesuif/suifkernel/dll_subsystem.h Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifkernel/dll_subsystem.h Thu May 31 09:00:41 2001 @@ -13,7 +13,7 @@ virtual void require_DLL( const LString& libraryName ); virtual bool is_DLL_loaded( const LString& libraryName ); private: - list *_loaded; + suif_list *_loaded; }; #endif diff -ur nci-orig/suif/suif2b/basesuif/suifkernel/message_buffer.cpp nci/suif/suif2b/basesuif/suifkernel/message_buffer.cpp --- nci-orig/suif/suif2b/basesuif/suifkernel/message_buffer.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifkernel/message_buffer.cpp Thu May 31 09:00:41 2001 @@ -47,7 +47,7 @@ AndMessageBuffer::~AndMessageBuffer(void) { - for (list::iterator it = _msg_list.begin(); + for (suif_list::iterator it = _msg_list.begin(); it != _msg_list.end(); it++ ) { delete (*it); @@ -60,7 +60,7 @@ String AndMessageBuffer::get_string(void) { - list::iterator it = _msg_list.begin(); + suif_list::iterator it = _msg_list.begin(); if (it == _msg_list.end()) return (*it)->get_string(); String str("("); @@ -90,7 +90,7 @@ MessageBuffer *AndMessageBuffer::clone(void) { AndMessageBuffer *abuf = new AndMessageBuffer(); - for (list::iterator it = _msg_list.begin(); + for (suif_list::iterator it = _msg_list.begin(); it != _msg_list.end(); it++) { abuf->add_message(*it); diff -ur nci-orig/suif/suif2b/basesuif/suifkernel/message_buffer.h nci/suif/suif2b/basesuif/suifkernel/message_buffer.h --- nci-orig/suif/suif2b/basesuif/suifkernel/message_buffer.h Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifkernel/message_buffer.h Thu May 31 09:00:41 2001 @@ -34,7 +34,7 @@ virtual MessageBuffer *clone(void); int get_message_count(void); private: - list _msg_list; + suif_list _msg_list; }; diff -ur nci-orig/suif/suif2b/basesuif/suifkernel/module.cpp nci/suif/suif2b/basesuif/suifkernel/module.cpp --- nci-orig/suif/suif2b/basesuif/suifkernel/module.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifkernel/module.cpp Thu May 31 09:00:41 2001 @@ -118,7 +118,7 @@ return((*iter).second); } -void Module::get_supported_interface_list(list &llist) const { +void Module::get_supported_interface_list(suif_list &llist) const { for (suif_hash_map::iterator iter = _interfaces->begin(); iter != _interfaces->end(); iter++) { diff -ur nci-orig/suif/suif2b/basesuif/suifkernel/module.h nci/suif/suif2b/basesuif/suifkernel/module.h --- nci-orig/suif/suif2b/basesuif/suifkernel/module.h Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifkernel/module.h Thu May 31 09:00:41 2001 @@ -114,7 +114,7 @@ /** * write the list of interfaces this module supports to the llist */ - virtual void get_supported_interface_list(list &llist) const; + virtual void get_supported_interface_list(suif_list &llist) const; /** These are callbacks that the module system will give when diff -ur nci-orig/suif/suif2b/basesuif/suifkernel/module_subsystem.cpp nci/suif/suif2b/basesuif/suifkernel/module_subsystem.cpp --- nci-orig/suif/suif2b/basesuif/suifkernel/module_subsystem.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifkernel/module_subsystem.cpp Thu May 31 09:00:41 2001 @@ -18,9 +18,9 @@ protected: LString interfaceName; // These should be maps. - list *listenerModules; - list *producerModuleNames; - list *producerModules; + suif_list *listenerModules; + suif_list *producerModuleNames; + suif_list *producerModules; String _description; public: ModuleInterface(const LString &interface_name); @@ -184,7 +184,7 @@ } void ModuleSubSystem::get_module_list(const LString &interface_filter, - list &mlist) const { + suif_list &mlist) const { for (suif_map::iterator iter = listOfRegisteredModules->begin(); listOfRegisteredModules->end() != iter; @@ -308,7 +308,7 @@ return(mi->get_description()); } -void ModuleSubSystem::get_interface_list(list &ilist) const { +void ModuleSubSystem::get_interface_list(suif_list &ilist) const { for (suif_map::iterator iter = moduleInterfaces->begin(); moduleInterfaces->end() != iter; @@ -334,9 +334,9 @@ ModuleInterface::ModuleInterface(const LString &interface_name) : interfaceName(interface_name), - listenerModules(new list()), - producerModuleNames(new list()), - producerModules(new list()), + listenerModules(new suif_list()), + producerModuleNames(new suif_list()), + producerModules(new suif_list()), _description(emptyString) {} @@ -357,7 +357,7 @@ bool ModuleInterface::exists_listener(Module *listener_module) const { - for (list::iterator iter = listenerModules->begin(); + for (suif_list::iterator iter = listenerModules->begin(); iter != listenerModules->end(); iter++) { if ((*iter) == listener_module) return true; @@ -371,7 +371,7 @@ } bool ModuleInterface::exists_producer_name(const LString &producer_module_name) const { - for (list::iterator iter = producerModuleNames->begin(); + for (suif_list::iterator iter = producerModuleNames->begin(); iter != producerModuleNames->end(); iter++) { if ((*iter) == producer_module_name) return true; @@ -386,7 +386,7 @@ bool ModuleInterface::exists_producer(Module *producer_module) const { - for (list::iterator iter = producerModules->begin(); + for (suif_list::iterator iter = producerModules->begin(); iter != producerModules->end(); iter++) { if ((*iter) == producer_module) return true; @@ -401,7 +401,7 @@ void ModuleInterface::remove_producer(Module *producer_module) { if (!exists_producer(producer_module)) return; - for (list::iterator iter = producerModules->begin(); + for (suif_list::iterator iter = producerModules->begin(); iter != producerModules->end(); iter++) { if ((*iter) == producer_module) { @@ -413,7 +413,7 @@ void ModuleInterface::notify_listener_of_all_producer_names(Module *listening_module) { - for (list::iterator iter = + for (suif_list::iterator iter = producerModuleNames->begin(); iter != producerModuleNames->end(); iter++) { @@ -423,7 +423,7 @@ } void ModuleInterface::notify_listener_of_all_producers(Module *listening_module) { - for (list::iterator iter = + for (suif_list::iterator iter = producerModules->begin(); iter != producerModules->end(); iter++) { @@ -434,7 +434,7 @@ void ModuleInterface::notify_all_listeners_of_producer_name(const LString &name) { - for (list::iterator iter = + for (suif_list::iterator iter = listenerModules->begin(); iter != listenerModules->end(); iter++) { @@ -444,7 +444,7 @@ } void ModuleInterface::notify_all_listeners_of_producer(Module *producer) { - for (list::iterator iter = + for (suif_list::iterator iter = listenerModules->begin(); iter != listenerModules->end(); iter++) { @@ -454,7 +454,7 @@ } void ModuleInterface::notify_all_listeners_of_producer_destruction(Module *producer) { - for (list::iterator iter = + for (suif_list::iterator iter = listenerModules->begin(); iter != listenerModules->end(); iter++) { diff -ur nci-orig/suif/suif2b/basesuif/suifkernel/module_subsystem.h nci/suif/suif2b/basesuif/suifkernel/module_subsystem.h --- nci-orig/suif/suif2b/basesuif/suifkernel/module_subsystem.h Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifkernel/module_subsystem.h Thu May 31 09:00:41 2001 @@ -25,7 +25,7 @@ * write the list of modules to the mlist */ virtual void get_module_list(const LString &interface_filter, - list &mlist) const; + suif_list &mlist) const; // print out a list of the modules that implement the interface // If the interface_filter is the emptyLString then print them all out @@ -66,7 +66,7 @@ /** * write the list of interfaces to the ilist */ - virtual void get_interface_list(list &ilist) const; + virtual void get_interface_list(suif_list &ilist) const; private: SuifEnv* _suif_env; diff -ur nci-orig/suif/suif2b/basesuif/suifkernel/suif_env.cpp nci/suif/suif2b/basesuif/suifkernel/suif_env.cpp --- nci-orig/suif/suif2b/basesuif/suifkernel/suif_env.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifkernel/suif_env.cpp Thu May 31 09:00:41 2001 @@ -93,7 +93,7 @@ _print_subsystem( 0 ), _type_builder( 0 ), _object_factory( 0 ), - factories( new list ), + factories( new suif_list ), _file_set_block( 0 ), rudimentaryAddressMap( 0 ) { @@ -163,7 +163,7 @@ RealObjectFactory* SuifEnv::get_object_factory( const LString& name ) const { - list::iterator it = factories->begin(), end = factories->end(); + suif_list::iterator it = factories->begin(), end = factories->end(); while ( it != end ) { if ( (*it)->getName() == name ) return (*it); ++it; @@ -351,7 +351,7 @@ _print_subsystem( 0 ), _type_builder( 0 ), _object_factory( 0 ), - factories( new list ), + factories( new suif_list ), _file_set_block( 0 ), rudimentaryAddressMap( 0 ) { diff -ur nci-orig/suif/suif2b/basesuif/suifkernel/suif_env.h nci/suif/suif2b/basesuif/suifkernel/suif_env.h --- nci-orig/suif/suif2b/basesuif/suifkernel/suif_env.h Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifkernel/suif_env.h Thu May 31 09:00:41 2001 @@ -145,7 +145,7 @@ String to_string(SuifObject *obj) const; protected: - typedef list FactoryList; + typedef suif_list FactoryList; InputSubSystem* input_sub_system; OutputSubSystem* output_subsystem; CloneSubSystem* cloneSubSystem; diff -ur nci-orig/suif/suif2b/basesuif/suifkernel/suifkernel_forwarders.h nci/suif/suif2b/basesuif/suifkernel/suifkernel_forwarders.h --- nci-orig/suif/suif2b/basesuif/suifkernel/suifkernel_forwarders.h Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifkernel/suifkernel_forwarders.h Thu May 31 09:00:41 2001 @@ -8,7 +8,7 @@ // ------ suifkernel -------- typedef unsigned int s_count_t; -typedef suif_vector bit_vector; +typedef suif_vector suif_bit_vector; class SuifEnv; class SuifObject; diff -ur nci-orig/suif/suif2b/basesuif/suifkernel/utilities.h nci/suif/suif2b/basesuif/suifkernel/utilities.h --- nci-orig/suif/suif2b/basesuif/suifkernel/utilities.h Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifkernel/utilities.h Thu May 31 09:00:41 2001 @@ -75,8 +75,8 @@ * \par Example Usage * * \code - * list* sym_list = collect_object(root); - * for (list::iterator iter = sym_list->begin(); + * suif_list* sym_list = collect_object(root); + * for (suif_list::iterator iter = sym_list->begin(); * iter != sym_list->end(); iter++) * { * ProcedureSymbol *ps = *iter; @@ -93,8 +93,8 @@ */ template -list* collect_objects( const SuifObject* start_object ) { - list* l = new list; +suif_list* collect_objects( const SuifObject* start_object ) { + suif_list* l = new suif_list; if ( start_object ) { MetaClass* what = start_object->get_object_factory()-> find_meta_class( T::get_class_name() ); diff -ur nci-orig/suif/suif2b/basesuif/suifkernel/walking_maps.cpp nci/suif/suif2b/basesuif/suifkernel/walking_maps.cpp --- nci-orig/suif/suif2b/basesuif/suifkernel/walking_maps.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifkernel/walking_maps.cpp Thu May 31 09:00:41 2001 @@ -40,7 +40,7 @@ for (Iter iter = collect_instance_objects(obj); iter.is_valid(); iter.next()) { - // list::iterator iter = the_list->begin(); + // suif_list::iterator iter = the_list->begin(); // for (; iter != the_list->end(); iter++) { SuifObject *child = &iter.current(); diff -ur nci-orig/suif/suif2b/basesuif/suifpasses/standard_modules.cpp nci/suif/suif2b/basesuif/suifpasses/standard_modules.cpp --- nci-orig/suif/suif2b/basesuif/suifpasses/standard_modules.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifpasses/standard_modules.cpp Thu May 31 09:00:41 2001 @@ -302,10 +302,10 @@ void ListModulesModule::execute() { ModuleSubSystem *ms = _suif_env->get_module_subsystem(); LString interface; - list mlist; + suif_list mlist; ms->get_module_list(interface, mlist); - for (list::iterator iter = mlist.begin(); + for (suif_list::iterator iter = mlist.begin(); iter != mlist.end(); iter++) { LString module_name = *iter; Module *m = ms->retrieve_module(module_name); @@ -322,9 +322,9 @@ // supported interfaces bool is_first = true; - list llist; + suif_list llist; m->get_supported_interface_list(llist); - for (list::iterator liter = llist.begin(); + for (suif_list::iterator liter = llist.begin(); liter != llist.end(); liter++) { LString interface = *liter; if (is_first) { @@ -377,10 +377,10 @@ void ListInterfacesModule::execute() { ModuleSubSystem *ms = _suif_env->get_module_subsystem(); // LString interface; - list ilist; + suif_list ilist; ms->get_interface_list(ilist); - for (list::iterator iter = ilist.begin(); + for (suif_list::iterator iter = ilist.begin(); iter != ilist.end(); iter++) { LString interface_name = *iter; cout << "Interface: "; diff -ur nci-orig/suif/suif2b/basesuif/suifprinter/suifprinter.cpp nci/suif/suif2b/basesuif/suifprinter/suifprinter.cpp --- nci-orig/suif/suif2b/basesuif/suifprinter/suifprinter.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifprinter/suifprinter.cpp Thu May 31 09:00:41 2001 @@ -138,8 +138,8 @@ _print_all(false), _use_print_string(true), _use_print_ref_string(true), _initialized(false), output(cout), - //_print_inits(new list) { init(); } - _print_inits(new list) { } + //_print_inits(new suif_list) { init(); } + _print_inits(new suif_list) { } //---------------------------------------------------------------------------- //---------------------------------------------------------------------------- void SuifPrinterModule::initialize() @@ -185,7 +185,7 @@ */ /* // Now do the deferred initialization - for (list::iterator iter = _print_inits->begin(); + for (suif_list::iterator iter = _print_inits->begin(); iter != _print_inits->end(); iter++) { print_init_fn fn = (*iter); diff -ur nci-orig/suif/suif2b/basesuif/suifprinter/suifprinter.h nci/suif/suif2b/basesuif/suifprinter/suifprinter.h --- nci-orig/suif/suif2b/basesuif/suifprinter/suifprinter.h Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/suifprinter/suifprinter.h Thu May 31 09:00:41 2001 @@ -111,7 +111,7 @@ ostream &output; ObjectTags _t; - list *_print_inits; + suif_list *_print_inits; bool parse_and_print(ostream& output,const ObjectWrapper &obj, const LString &name, const String &str, diff -ur nci-orig/suif/suif2b/basesuif/typebuilder/type_builder.cpp nci/suif/suif2b/basesuif/typebuilder/type_builder.cpp --- nci-orig/suif/suif2b/basesuif/typebuilder/type_builder.cpp Thu May 31 09:00:25 2001 +++ nci/suif/suif2b/basesuif/typebuilder/type_builder.cpp Thu May 31 09:00:41 2001 @@ -413,11 +413,11 @@ return get_multi_dim_array_type(size_in_bits,etype->get_bit_alignment(),element_type,lower_bounds,upper_bounds); } -static bool same_qualifiers(QualifiedType *element,list &qualifiers) +static bool same_qualifiers(QualifiedType *element,suif_list &qualifiers) { if ((unsigned)element->get_qualification_count() != qualifiers.length()) return false; - list::iterator iter = qualifiers.begin(); + suif_list::iterator iter = qualifiers.begin(); while (iter != qualifiers.end()) { if (!element->has_qualification_member(*iter)) return false; @@ -427,7 +427,7 @@ } QualifiedType* TypeBuilder::get_qualified_type( DataType *base_type, - list qualifiers) { + suif_list qualifiers) { QualifiedType *element; @@ -466,7 +466,7 @@ element = create_qualified_type(_suif_env,base_type); - list::iterator it = qualifiers.begin(); + suif_list::iterator it = qualifiers.begin(); while (it != qualifiers.end()) { element->append_qualification(*it); @@ -479,27 +479,27 @@ QualifiedType* TypeBuilder::get_qualified_type( DataType *base_type, const LString &qualifier) { - list qualifiers; + suif_list qualifiers; qualifiers.push_back(qualifier); return get_qualified_type(base_type,qualifiers); } QualifiedType* TypeBuilder::get_qualified_type( QualifiedType *base_type, const LString &qualifier) { - list qualifiers; + suif_list qualifiers; qualifiers.push_back(qualifier); return(get_qualified_type(base_type, qualifiers)); } QualifiedType* TypeBuilder::get_qualified_type( QualifiedType *qt, - list qualifiers) { - list all_qualifiers; + suif_list qualifiers) { + suif_list all_qualifiers; for (Iter qualIter = qt->get_qualification_iterator(); qualIter.is_valid(); qualIter.next()) { all_qualifiers.push_back(qualIter.current()); } - for (list::iterator iter = qualifiers.begin(); + for (suif_list::iterator iter = qualifiers.begin(); iter != qualifiers.end(); iter++) { LString qual = *iter; if (!qt->has_qualification_member(qual)) { @@ -514,12 +514,12 @@ if (is_kind_of(base_type)) { return to(base_type); } - list qualifiers; + suif_list qualifiers; return get_qualified_type(to(base_type),qualifiers); } QualifiedType* TypeBuilder::get_qualified_type( DataType *base_type) { - list qualifiers; + suif_list qualifiers; return get_qualified_type(base_type,qualifiers); } @@ -577,9 +577,9 @@ } SymbolTable * -TypeBuilder::most_nested_common_scope(list &tlist, +TypeBuilder::most_nested_common_scope(suif_list &tlist, SymbolTable *table) { - list::iterator iter = tlist.begin(); + suif_list::iterator iter = tlist.begin(); if (iter == tlist.end()) return table; if (table == NULL) @@ -598,10 +598,10 @@ return table; } -bool TypeBuilder::is_argument_types_match(list&argument_list, +bool TypeBuilder::is_argument_types_match(suif_list&argument_list, CProcedureType *typ) { - list::iterator it = argument_list.begin(); + suif_list::iterator it = argument_list.begin(); Iter it2 = typ->get_argument_iterator(); while ((it != argument_list.end()) && it2.is_valid()) { @@ -615,7 +615,7 @@ CProcedureType* TypeBuilder::get_c_procedure_type( DataType * result_type, - list argument_list, + suif_list argument_list, bool has_varargs, bool arguments_known, int bit_alignment) { @@ -663,7 +663,7 @@ type = create_c_procedure_type(_suif_env,result_type,has_varargs, arguments_known, bit_alignment); table->append_symbol_table_object( type ); - list::iterator it = argument_list.begin(); + suif_list::iterator it = argument_list.begin(); while (it != argument_list.end()) { type->append_argument(*it); @@ -811,7 +811,7 @@ SuifEnv *_suif, DataType *base_type, LString qualifier) { - list qualifiers; + suif_list qualifiers; qualifiers.push_back( qualifier ); return (get_type_builder(_suif)->get_qualified_type(base_type, qualifiers)); } @@ -819,7 +819,7 @@ QualifiedType *get_qualified_type( SuifEnv *_suif, DataType *base_type, - list qualifiers) + suif_list qualifiers) { @@ -829,7 +829,7 @@ CProcedureType *get_c_procedure_type( SuifEnv *_suif, DataType * result_type, - list& argument_list, + suif_list& argument_list, bool has_varargs, bool arguments_known, int bit_alignment) @@ -1091,8 +1091,8 @@ } static bool matching_group( GroupType *type, - list&names, - list &type_list) { + suif_list&names, + suif_list &type_list) { GroupSymbolTable *gst = type->get_group_symbol_table(); size_t field_no = 0; size_t field_count = gst->get_symbol_table_object_count(); @@ -1124,9 +1124,9 @@ } GroupType *TypeBuilder::get_group_type( - listsymbol_tables, - list&names, - list &type_list) { + suif_listsymbol_tables, + suif_list&names, + suif_list &type_list) { size_t i; for (i = 0;i < symbol_tables.length();i++) { SymbolTable *symbol_table = symbol_tables[i]; @@ -1167,9 +1167,9 @@ } UnionType *TypeBuilder::get_union_type( - listsymbol_tables, - list