[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep AttributeRep.cpp,1.7,1.8

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep
In directory braindrain:/tmp/cvs-serv1079/MetaInterpreter2004/Rep

Modified Files:
	AttributeRep.cpp 
Log Message:
BONExt: MOF handling changed
MetaInterpreter: better handling of EnumAttribute formatting errors


CVS User: zolmol

Index: AttributeRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/AttributeRep.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AttributeRep.cpp	21 Oct 2004 16:18:21 -0000	1.7
--- AttributeRep.cpp	31 Dec 2004 19:51:20 -0000	1.8
***************
*** 150,154 ****
--- 150,157 ----
  					m_items.push_back(items.substr( st, end - st + 1));
  				else
+ 				{
  					m_items.push_back("Error");
+ 					global_vars.err << MSG_ERROR << "Error: Enumitem #" << 1 + m_noOfItems << " of " << getPtr() << " has wrong format. (If comma is used a second value is required.)\n";
+ 				}
  				
  				// from comma_i+1 to i
***************
*** 158,165 ****
  				while( end > comma_i+1 && whitespace.find( items[end]) != std::string::npos) --end; //tailing whsp
  				
! 				if ( end>=st)
  					m_itemsVal.push_back(items.substr( st, end - st + 1));
  				else
! 					m_items.push_back("Error");
  
  				comma_i = 0;
--- 161,171 ----
  				while( end > comma_i+1 && whitespace.find( items[end]) != std::string::npos) --end; //tailing whsp
  				
! 				if ( end>=st && comma_i+1 < i)
  					m_itemsVal.push_back(items.substr( st, end - st + 1));
  				else
! 				{
! 					m_itemsVal.push_back("Error");
! 					global_vars.err << MSG_ERROR << "Error: Enumitem #" << 1 + m_noOfItems << " of " << getPtr() << " has wrong format. (If comma is used a second value is required.)\n";
! 				}
  
  				comma_i = 0;