ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/io/Globals.cpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/io/Globals.cpp (file contents):
Revision 2371 by tim, Fri Oct 14 21:43:13 2005 UTC vs.
Revision 2372 by tim, Mon Oct 17 00:51:16 2005 UTC

# Line 144 | Line 144 | int Globals::globalAssign( event* the_event ){
144   int Globals::globalAssign( event* the_event ){
145    
146    int key;
147  int token;
147    interface_assign_type the_type =  the_event->evt.asmt.asmt_type;
148    char* lhs = the_event->evt.asmt.lhs;
149    std::string keyword(lhs);
150  
151 <  bool result;
151 >  bool result = false;
152  
154
153    ParamMap::iterator i =parameters_.find(keyword);
154    if (i != parameters_.end()) {
155      if( the_type == STRING ){
156         result = i->second->setData(std::string(the_event->evt.asmt.rhs.sval));
157         if (!result ) {
158 <            sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a string.\n", keyword.c_str() );
158 >            sprintf(the_event->err_msg, "Error in parsing %s: expect %s, but get %s.\n", keyword.c_str(), i->second->getParamType(), the_event->evt.asmt.rhs.sval);
159         }
160      } else if( the_type == DOUBLE ){
161        result = i->second->setData(the_event->evt.asmt.rhs.dval);
162         if (!result )
163 <         sprintf(the_event->err_msg, "Error in parsing meta-data file!\n\t%s must be a double.\n", keyword.c_str() );
163 >         sprintf(the_event->err_msg, "Error in parsing %s: expect %s, but get %f.\n", keyword.c_str(), i->second->getParamType(), the_event->evt.asmt.rhs.dval );
164      }      
165      else if (the_type == INT ){
166        result = i->second->setData(the_event->evt.asmt.rhs.ival);
167         if (!result )
168 <         sprintf(the_event->err_msg,  "Error in parsing meta-data file!\n\t%s must be an int.\n", keyword.c_str() );
168 >         sprintf(the_event->err_msg,  "Error in parsing %s: expect %s, but get %d.\n", keyword.c_str(), i->second->getParamType(), the_event->evt.asmt.rhs.ival );
169        
170      } else {
171 <    
171 >        sprintf(the_event->err_msg,  "%s is an unrecognized keyword\n", keyword.c_str() );
172      }
173    }
174  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines