[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004 BON2Engine.cpp,1.1,1.2

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

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

Modified Files:
	BON2Engine.cpp 
Log Message:
Better notification about null proxies.


CVS User: zolmol

Index: BON2Engine.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/BON2Engine.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BON2Engine.cpp	30 Jul 2004 20:24:45 -0000	1.1
--- BON2Engine.cpp	2 Aug 2004 18:28:21 -0000	1.2
***************
*** 143,146 ****
--- 143,148 ----
  			if ( referred) // if not a null reference
  				this->m_equivBag[ referred].insert( *ref_it);
+ 			else // notify about null proxies
+ 				global_vars.err << MSG_ERROR << "Null proxy object found: " << BON::FCO( *ref_it) << "\n";
  		}
  		catch( ... )
***************
*** 380,391 ****
  			rel_it->getOperation() == Relation::EQUIVALENCE_OP)
  		{
- 			/*std::string n1 = rel_it->getOp1()->getName();
- 			std::string n2 = rel_it->getOp2()->getName();
- 			if ( n1 == n2 ) // the names are the same no selection needed
- 			{ }
- 			else*/
  			{
! 				bool is_proxy_first = isProxy( rel_it->getOp1()) == 1;
! 				bool is_proxy_second = isProxy( rel_it->getOp2()) == 1;
  				
  				ObjPointer selected_ptr = 0;
--- 382,396 ----
  			rel_it->getOperation() == Relation::EQUIVALENCE_OP)
  		{
  			{
! 				int p1 = isProxy( rel_it->getOp1());
! 				int p2 = isProxy( rel_it->getOp2());
! 				if( p1 == 2 || p2 == 2) // check for Null proxies
! 				{
! 					global_vars.err << MSG_ERROR << rel_it->getOperationStr() << " relation disregarded between " << rel_it->getOp1() << " and " << rel_it->getOp2() << ".\n";
! 					continue;
! 				}
! 
! 				bool is_proxy_first  = p1 == 1;
! 				bool is_proxy_second = p2 == 1;
  				
  				ObjPointer selected_ptr = 0;
***************
*** 887,890 ****
--- 892,898 ----
  		}
  	}
+ 	if( !correct)
+ 		global_vars.err << MSG_ERROR << "Some objects/relations disregarded by the Proxy Checker.\n";
+ 
  	return correct;
  }