[GME-commit] GMESRC/Paradigms/MetaGME/BonExtension/Rep CodeGenReg.cpp, 1.4, 1.5 CodeGenTemplate.cpp, 1.5, 1.6

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

Update of /project/gme-repository/GMESRC/Paradigms/MetaGME/BonExtension/Rep
In directory escher:/tmp/cvs-serv10395

Modified Files:
	CodeGenReg.cpp CodeGenTemplate.cpp 
Log Message:
In methods like
std::multiset<BON::FCO> N::ElementImpl::getConnectionDsts()
std::multiset<BON::FCO> N::ElementImpl::getConnectionSrcs()
std::multiset<BON::FCO> N::ElementImpl::getConnectionEnds()
kindnames for connections were namespaceless.



CVS User: Zoltan Molnar, ISIS (zolmol)

Index: CodeGenReg.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/BonExtension/Rep/CodeGenReg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CodeGenReg.cpp	22 Sep 2006 16:05:47 -0000	1.4
--- CodeGenReg.cpp	16 Mar 2007 19:25:07 -0000	1.5
***************
*** 373,377 ****
  		// if reference ports may be conn ends than the implementation is so simple
  		nnn  = indent(s_ind + 0) + "{\n";
! 		nnn += indent(s_ind + 1) +   "return BON::ConnectionEndImpl::getInConnEnds(\"" + conn->getName() + "\");\n";
  		nnn += indent(s_ind + 0) + "}\n\n\n";
  
--- 373,377 ----
  		// if reference ports may be conn ends than the implementation is so simple
  		nnn  = indent(s_ind + 0) + "{\n";
! 		nnn += indent(s_ind + 1) +   "return BON::ConnectionEndImpl::getInConnEnds(\"" + conn->getLStrictName() + "\");\n";
  		nnn += indent(s_ind + 0) + "}\n\n\n";
  
***************
*** 389,393 ****
  		mmm += indent(s_ind + 1) +   "{\n";
  		// the name getInConnEnds is confusing but does the right thing
! 		mmm += indent(s_ind + 2) +     "std::multiset<BON::ConnectionEnd> in_ends = BON::ConnectionEndImpl::getInConnEnds(\"" + conn->getName() + "\");\n";
  		mmm += indent(s_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cit = in_ends.begin() ; cit != in_ends.end() ; ++cit )\n";
  		mmm += indent(s_ind + 2) +     "{\n";
--- 389,393 ----
  		mmm += indent(s_ind + 1) +   "{\n";
  		// the name getInConnEnds is confusing but does the right thing
! 		mmm += indent(s_ind + 2) +     "std::multiset<BON::ConnectionEnd> in_ends = BON::ConnectionEndImpl::getInConnEnds(\"" + conn->getLStrictName() + "\");\n";
  		mmm += indent(s_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cit = in_ends.begin() ; cit != in_ends.end() ; ++cit )\n";
  		mmm += indent(s_ind + 2) +     "{\n";
***************
*** 425,429 ****
  	{
  		nnn  = indent(s_ind + 0) + "{\n";
! 		nnn += indent(s_ind + 1) +   "return BON::ConnectionEndImpl::getOutConnEnds(\"" + conn->getName() + "\");\n";
  		nnn += indent(s_ind + 0) + "}\n\n\n";
  
--- 425,429 ----
  	{
  		nnn  = indent(s_ind + 0) + "{\n";
! 		nnn += indent(s_ind + 1) +   "return BON::ConnectionEndImpl::getOutConnEnds(\"" + conn->getLStrictName() + "\");\n";
  		nnn += indent(s_ind + 0) + "}\n\n\n";
  
***************
*** 439,443 ****
  		mmm += indent(s_ind + 1) +   "std::multiset<" + peer_lcd + "> res;\n";
  		mmm += indent(s_ind + 1) +   "{\n";
! 		mmm += indent(s_ind + 2) +     "std::multiset<BON::ConnectionEnd> out_ends = BON::ConnectionEndImpl::getOutConnEnds(\"" + conn->getName() + "\");\n";
  		mmm += indent(s_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cit = out_ends.begin() ; cit != out_ends.end() ; ++cit )\n";
  		mmm += indent(s_ind + 2) +     "{\n";
--- 439,443 ----
  		mmm += indent(s_ind + 1) +   "std::multiset<" + peer_lcd + "> res;\n";
  		mmm += indent(s_ind + 1) +   "{\n";
! 		mmm += indent(s_ind + 2) +     "std::multiset<BON::ConnectionEnd> out_ends = BON::ConnectionEndImpl::getOutConnEnds(\"" + conn->getLStrictName() + "\");\n";
  		mmm += indent(s_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cit = out_ends.begin() ; cit != out_ends.end() ; ++cit )\n";
  		mmm += indent(s_ind + 2) +     "{\n";
***************
*** 475,479 ****
  	{
  		nnn  = indent(s_ind + 0) + "{\n";
! 		nnn += indent(s_ind + 1) +  "return BON::ConnectionEndImpl::getConnEnds(\"" + conn->getName() + "\");\n";
  		nnn += indent(s_ind + 0) + "}\n\n\n";
  
--- 475,479 ----
  	{
  		nnn  = indent(s_ind + 0) + "{\n";
! 		nnn += indent(s_ind + 1) +  "return BON::ConnectionEndImpl::getConnEnds(\"" + conn->getLStrictName() + "\");\n";
  		nnn += indent(s_ind + 0) + "}\n\n\n";
  
***************
*** 489,493 ****
  		mmm += indent(s_ind + 1) +   "std::multiset<" + peer_lcd + "> res;\n";
  		mmm += indent(s_ind + 1) +   "{\n";
! 		mmm += indent(s_ind + 2) +     "std::multiset<BON::ConnectionEnd> in_ends = BON::ConnectionEndImpl::getInConnEnds(\"" + conn->getName() + "\");\n";
  		mmm += indent(s_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cit = in_ends.begin() ; cit != in_ends.end() ; ++cit )\n";
  		mmm += indent(s_ind + 2) +     "{\n";
--- 489,493 ----
  		mmm += indent(s_ind + 1) +   "std::multiset<" + peer_lcd + "> res;\n";
  		mmm += indent(s_ind + 1) +   "{\n";
! 		mmm += indent(s_ind + 2) +     "std::multiset<BON::ConnectionEnd> in_ends = BON::ConnectionEndImpl::getInConnEnds(\"" + conn->getLStrictName() + "\");\n";
  		mmm += indent(s_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cit = in_ends.begin() ; cit != in_ends.end() ; ++cit )\n";
  		mmm += indent(s_ind + 2) +     "{\n";
***************
*** 496,500 ****
  		mmm += indent(s_ind + 3) +       "res.insert( dst);\n";
  		mmm += indent(s_ind + 2) +     "}\n";
! 		mmm += indent(s_ind + 2) +     "std::multiset<BON::ConnectionEnd> out_ends = BON::ConnectionEndImpl::getOutConnEnds(\"" + conn->getName() + "\");\n";
  		mmm += indent(s_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cot = out_ends.begin() ; cot != out_ends.end() ; ++cot )\n";
  		mmm += indent(s_ind + 2) +     "{\n";
--- 496,500 ----
  		mmm += indent(s_ind + 3) +       "res.insert( dst);\n";
  		mmm += indent(s_ind + 2) +     "}\n";
! 		mmm += indent(s_ind + 2) +     "std::multiset<BON::ConnectionEnd> out_ends = BON::ConnectionEndImpl::getOutConnEnds(\"" + conn->getLStrictName() + "\");\n";
  		mmm += indent(s_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cot = out_ends.begin() ; cot != out_ends.end() ; ++cot )\n";
  		mmm += indent(s_ind + 2) +     "{\n";

Index: CodeGenTemplate.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/BonExtension/Rep/CodeGenTemplate.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CodeGenTemplate.cpp	22 Sep 2006 16:05:47 -0000	1.5
--- CodeGenTemplate.cpp	16 Mar 2007 19:25:07 -0000	1.6
***************
*** 398,402 ****
  		sgn  = "get" + conn->getValidName() + "Srcs(TDP)";
  		src  = indent(h_ind + 0) + "{\n";
! 		src += indent(h_ind + 1) +   "std::multiset<BON::ConnectionEnd> ends = BON::ConnectionEndImpl::getInConnEnds(\"" + conn->getName() + "\");\n";
  		src += indent(h_ind + 1) +   "return std::multiset<BON::ConnectionEnd, T>( ends.begin(), ends.end());\n";
  		src += indent(h_ind + 0) + "}\n";
--- 398,402 ----
  		sgn  = "get" + conn->getValidName() + "Srcs(TDP)";
  		src  = indent(h_ind + 0) + "{\n";
! 		src += indent(h_ind + 1) +   "std::multiset<BON::ConnectionEnd> ends = BON::ConnectionEndImpl::getInConnEnds(\"" + conn->getLStrictName() + "\");\n";
  		src += indent(h_ind + 1) +   "return std::multiset<BON::ConnectionEnd, T>( ends.begin(), ends.end());\n";
  		src += indent(h_ind + 0) + "}\n";
***************
*** 420,424 ****
  		src += indent(h_ind + 1) +   "{\n";
  		// the name getInConnEnds is confusing but does the right thing
! 		src += indent(h_ind + 2) +     "std::multiset<BON::ConnectionEnd> in_ends = BON::ConnectionEndImpl::getInConnEnds(\"" + conn->getName() + "\");\n";
  		src += indent(h_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cit = in_ends.begin() ; cit != in_ends.end() ; ++cit )\n";
  		src += indent(h_ind + 2) +     "{\n";
--- 420,424 ----
  		src += indent(h_ind + 1) +   "{\n";
  		// the name getInConnEnds is confusing but does the right thing
! 		src += indent(h_ind + 2) +     "std::multiset<BON::ConnectionEnd> in_ends = BON::ConnectionEndImpl::getInConnEnds(\"" + conn->getLStrictName() + "\");\n";
  		src += indent(h_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cit = in_ends.begin() ; cit != in_ends.end() ; ++cit )\n";
  		src += indent(h_ind + 2) +     "{\n";
***************
*** 460,464 ****
  		sgn  = "get" + conn->getValidName() + "Dsts(TDP)";
  		src  = indent(h_ind + 0) + "{\n";
! 		src += indent(h_ind + 1) +   "std::multiset<BON::ConnectionEnd> ends = BON::ConnectionEndImpl::getOutConnEnds(\"" + conn->getName() + "\");\n";
  		src += indent(h_ind + 1) +   "return std::multiset<BON::ConnectionEnd, T>( ends.begin(), ends.end());\n";
  		src += indent(h_ind + 0) + "}\n";
--- 460,464 ----
  		sgn  = "get" + conn->getValidName() + "Dsts(TDP)";
  		src  = indent(h_ind + 0) + "{\n";
! 		src += indent(h_ind + 1) +   "std::multiset<BON::ConnectionEnd> ends = BON::ConnectionEndImpl::getOutConnEnds(\"" + conn->getLStrictName() + "\");\n";
  		src += indent(h_ind + 1) +   "return std::multiset<BON::ConnectionEnd, T>( ends.begin(), ends.end());\n";
  		src += indent(h_ind + 0) + "}\n";
***************
*** 483,487 ****
  		src += indent(h_ind + 1) +   "{\n";
  		// the name getOutConnEnds is confusing but does the right thing
! 		src += indent(h_ind + 2) +     "std::multiset<BON::ConnectionEnd> out_ends = BON::ConnectionEndImpl::getOutConnEnds(\"" + conn->getName() + "\");\n";
  		src += indent(h_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cit = out_ends.begin() ; cit != out_ends.end() ; ++cit )\n";
  		src += indent(h_ind + 2) +     "{\n";
--- 483,487 ----
  		src += indent(h_ind + 1) +   "{\n";
  		// the name getOutConnEnds is confusing but does the right thing
! 		src += indent(h_ind + 2) +     "std::multiset<BON::ConnectionEnd> out_ends = BON::ConnectionEndImpl::getOutConnEnds(\"" + conn->getLStrictName() + "\");\n";
  		src += indent(h_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cit = out_ends.begin() ; cit != out_ends.end() ; ++cit )\n";
  		src += indent(h_ind + 2) +     "{\n";
***************
*** 524,528 ****
  		sgn  = "get" + conn->getValidName() + "Ends(TDP)";
  		src  = indent(h_ind + 0) + "{\n";
! 		src += indent(h_ind + 1) +   "std::multiset<BON::ConnectionEnd> ends = BON::ConnectionEndImpl::getConnEnds(\"" + conn->getName() + "\");\n";
  		src += indent(h_ind + 1) +   "return std::multiset<BON::ConnectionEnd, T>( ends.begin(), ends.end());\n";
  		src += indent(h_ind + 0) + "}\n";
--- 524,528 ----
  		sgn  = "get" + conn->getValidName() + "Ends(TDP)";
  		src  = indent(h_ind + 0) + "{\n";
! 		src += indent(h_ind + 1) +   "std::multiset<BON::ConnectionEnd> ends = BON::ConnectionEndImpl::getConnEnds(\"" + conn->getLStrictName() + "\");\n";
  		src += indent(h_ind + 1) +   "return std::multiset<BON::ConnectionEnd, T>( ends.begin(), ends.end());\n";
  		src += indent(h_ind + 0) + "}\n";
***************
*** 545,549 ****
  		src += indent(h_ind + 1) +   "std::multiset<" + peer_lcd + ", T> res;\n";
  		src += indent(h_ind + 1) +   "{\n";
! 		src += indent(h_ind + 2) +     "std::multiset<BON::ConnectionEnd> in_ends = BON::ConnectionEndImpl::getInConnEnds(\"" + conn->getName() + "\");\n";
  		src += indent(h_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cit = in_ends.begin() ; cit != in_ends.end() ; ++cit )\n";
  		src += indent(h_ind + 2) +     "{\n";
--- 545,549 ----
  		src += indent(h_ind + 1) +   "std::multiset<" + peer_lcd + ", T> res;\n";
  		src += indent(h_ind + 1) +   "{\n";
! 		src += indent(h_ind + 2) +     "std::multiset<BON::ConnectionEnd> in_ends = BON::ConnectionEndImpl::getInConnEnds(\"" + conn->getLStrictName() + "\");\n";
  		src += indent(h_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cit = in_ends.begin() ; cit != in_ends.end() ; ++cit )\n";
  		src += indent(h_ind + 2) +     "{\n";
***************
*** 552,556 ****
  		src += indent(h_ind + 3) +       "res.insert( dst);\n";
  		src += indent(h_ind + 2) +     "}\n";
! 		src += indent(h_ind + 2) +     "std::multiset<BON::ConnectionEnd> out_ends = BON::ConnectionEndImpl::getOutConnEnds(\"" + conn->getName() + "\");\n";
  		src += indent(h_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cot = out_ends.begin() ; cot != out_ends.end() ; ++cot )\n";
  		src += indent(h_ind + 2) +     "{\n";
--- 552,556 ----
  		src += indent(h_ind + 3) +       "res.insert( dst);\n";
  		src += indent(h_ind + 2) +     "}\n";
! 		src += indent(h_ind + 2) +     "std::multiset<BON::ConnectionEnd> out_ends = BON::ConnectionEndImpl::getOutConnEnds(\"" + conn->getLStrictName() + "\");\n";
  		src += indent(h_ind + 2) +     "for ( std::multiset<BON::ConnectionEnd>::iterator cot = out_ends.begin() ; cot != out_ends.end() ; ++cot )\n";
  		src += indent(h_ind + 2) +     "{\n";