[GME-commit]
GMESRC/Paradigms/MetaGME/BonExtension/Rep CodeGenReg.cpp,1.2,1.3
CodeGenTemplate.cpp,1.3,1.4
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Mon May 22 22:20:45 CDT 2006
Update of /project/gme-repository/GMESRC/Paradigms/MetaGME/BonExtension/Rep
In directory escher:/tmp/cvs-serv13434
Modified Files:
CodeGenReg.cpp CodeGenTemplate.cpp
Log Message:
Template getter method fixed for sets.
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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CodeGenReg.cpp 6 Sep 2005 19:52:06 -0000 1.2
--- CodeGenReg.cpp 22 May 2006 21:20:42 -0000 1.3
***************
*** 12,16 ****
src = indent(s_ind + 0) + "{\n";
src += indent(s_ind + 1) + "std::set<" + retval_folderkind + "> res;\n";
! src += indent(s_ind + 1) + "std::set<BON::Folder> l = getChildFolders();\n";
src += indent(s_ind + 1) + "for( std::set<BON::Folder>::iterator i = l.begin(); i != l.end(); ++i)\n";
src += indent(s_ind + 1) + "{\n";
--- 12,16 ----
src = indent(s_ind + 0) + "{\n";
src += indent(s_ind + 1) + "std::set<" + retval_folderkind + "> res;\n";
! src += indent(s_ind + 1) + "std::set<BON::Folder> l = FolderImpl::getChildFolders();\n";
src += indent(s_ind + 1) + "for( std::set<BON::Folder>::iterator i = l.begin(); i != l.end(); ++i)\n";
src += indent(s_ind + 1) + "{\n";
***************
*** 45,49 ****
src = indent(s_ind + 0) + "{\n";
src += indent(s_ind + 1) + "std::set<" + retval_kind + "> res;\n";
! src += indent(s_ind + 1) + "std::set<BON::Object> kinds = getChildObjects";
src += "(\"" + kind + "\");\n";
src += indent(s_ind + 1) + "for( std::set<BON::Object>::iterator i = kinds.begin(); i != kinds.end(); ++i)\n";
--- 45,49 ----
src = indent(s_ind + 0) + "{\n";
src += indent(s_ind + 1) + "std::set<" + retval_kind + "> res;\n";
! src += indent(s_ind + 1) + "std::set<BON::Object> kinds = FolderImpl::getChildObjects";
src += "(\"" + kind + "\");\n";
src += indent(s_ind + 1) + "for( std::set<BON::Object>::iterator i = kinds.begin(); i != kinds.end(); ++i)\n";
***************
*** 82,86 ****
{
char k_s[10]; sprintf( k_s, "%i", k); std::string k_str( k_s);
! src += indent(s_ind + 1) + "kinds_vec[" + k_str + "] = getChildObjects";
src += "(\"" + kind_vec[k] + "\");\n";
}
--- 82,86 ----
{
char k_s[10]; sprintf( k_s, "%i", k); std::string k_str( k_s);
! src += indent(s_ind + 1) + "kinds_vec[" + k_str + "] = FolderImpl::getChildObjects";
src += "(\"" + kind_vec[k] + "\");\n";
}
***************
*** 115,119 ****
src = "{\n";
src += " std::set<" + retval_kind + "> res;\n";
! src += " std::set<Object> l = getChildObjects";
src += "(\"" + kind + "\");\n";
src += " for( std::set<Object>::iterator i = l.begin(); i != l.end(); ++i)\n";
--- 115,119 ----
src = "{\n";
src += " std::set<" + retval_kind + "> res;\n";
! src += " std::set<Object> l = FolderImpl::getChildObjects";
src += "(\"" + kind + "\");\n";
src += " for( std::set<Object>::iterator i = l.begin(); i != l.end(); ++i)\n";
***************
*** 140,144 ****
src = indent(s_ind + 0) + "{\n";
src += indent(s_ind + 1) + "std::set<" + retval_kind + "> res;\n";
! src += indent(s_ind + 1) + "std::set<BON::FCO> roles = getChildFCOsAs";
src += "(\"" + inquire + "\");\n";
src += indent(s_ind + 1) + "for( std::set<BON::FCO>::iterator i = roles.begin(); i != roles.end(); ++i)\n";
--- 140,144 ----
src = indent(s_ind + 0) + "{\n";
src += indent(s_ind + 1) + "std::set<" + retval_kind + "> res;\n";
! src += indent(s_ind + 1) + "std::set<BON::FCO> roles = ModelImpl::getChildFCOsAs";
src += "(\"" + inquire + "\");\n";
src += indent(s_ind + 1) + "for( std::set<BON::FCO>::iterator i = roles.begin(); i != roles.end(); ++i)\n";
***************
*** 170,174 ****
src = indent(s_ind + 0) + "{\n";
src += indent(s_ind + 1) + "std::set<" + retval_kind + "> res;\n";
! src += indent(s_ind + 1) + "std::set<BON::FCO> roles = getChildFCOsAs";
src += "(\"" + inquire + "\");\n";
src += indent(s_ind + 1) + "for( std::set<BON::FCO>::iterator i = roles.begin(); i != roles.end(); ++i)\n";
--- 170,174 ----
src = indent(s_ind + 0) + "{\n";
src += indent(s_ind + 1) + "std::set<" + retval_kind + "> res;\n";
! src += indent(s_ind + 1) + "std::set<BON::FCO> roles = ModelImpl::getChildFCOsAs";
src += "(\"" + inquire + "\");\n";
src += indent(s_ind + 1) + "for( std::set<BON::FCO>::iterator i = roles.begin(); i != roles.end(); ++i)\n";
***************
*** 208,212 ****
{
char k_s[10]; sprintf( k_s, "%i", k); std::string k_str( k_s);
! src += indent(s_ind + 1) + "roles_vec[" + k_str + "] = getChildFCOsAs";
src += "(\"";
src += roles[k];
--- 208,212 ----
{
char k_s[10]; sprintf( k_s, "%i", k); std::string k_str( k_s);
! src += indent(s_ind + 1) + "roles_vec[" + k_str + "] = ModelImpl::getChildFCOsAs";
src += "(\"";
src += roles[k];
***************
*** 243,247 ****
src = indent(s_ind + 0) + "{\n";
src += indent(s_ind + 1) + "std::set<" + retval_kind + "> res;\n";
! src += indent(s_ind + 1) + "std::set<BON::FCO> roles = getChildFCOsAs";
src += "(\"";
src += desc_k_name + role_name;
--- 243,247 ----
src = indent(s_ind + 0) + "{\n";
src += indent(s_ind + 1) + "std::set<" + retval_kind + "> res;\n";
! src += indent(s_ind + 1) + "std::set<BON::FCO> roles = ModelImpl::getChildFCOsAs";
src += "(\"";
src += desc_k_name + role_name;
Index: CodeGenTemplate.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/BonExtension/Rep/CodeGenTemplate.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CodeGenTemplate.cpp 6 Sep 2005 19:52:06 -0000 1.3
--- CodeGenTemplate.cpp 22 May 2006 21:20:42 -0000 1.4
***************
*** 14,18 ****
src = indent(h_ind + 0) + "{\n";
src += indent(h_ind + 1) + "std::set<" + retval_folderkind + ", T> res;\n";
! src += indent(h_ind + 1) + "std::set<BON::Folder> l = getChildFolders();\n";
src += indent(h_ind + 1) + "for( std::set<BON::Folder>::iterator i = l.begin(); i != l.end(); ++i)\n";
src += indent(h_ind + 1) + "{\n";
--- 14,18 ----
src = indent(h_ind + 0) + "{\n";
src += indent(h_ind + 1) + "std::set<" + retval_folderkind + ", T> res;\n";
! src += indent(h_ind + 1) + "std::set<BON::Folder> l = FolderImpl::getChildFolders();\n";
src += indent(h_ind + 1) + "for( std::set<BON::Folder>::iterator i = l.begin(); i != l.end(); ++i)\n";
src += indent(h_ind + 1) + "{\n";
***************
*** 50,54 ****
src = indent(h_ind + 0) + "{\n";
src += indent(h_ind + 1) + "std::set<" + retval_kind + ", T> res;\n";
! src += indent(h_ind + 1) + "std::set<BON::Object> kinds = getChildObjects(\"" + kind + "\");\n";
src += indent(h_ind + 1) + "for( std::set<BON::Object>::iterator i = kinds.begin(); i != kinds.end(); ++i)\n";
src += indent(h_ind + 1) + "{\n";
--- 50,54 ----
src = indent(h_ind + 0) + "{\n";
src += indent(h_ind + 1) + "std::set<" + retval_kind + ", T> res;\n";
! src += indent(h_ind + 1) + "std::set<BON::Object> kinds = FolderImpl::getChildObjects(\"" + kind + "\");\n";
src += indent(h_ind + 1) + "for( std::set<BON::Object>::iterator i = kinds.begin(); i != kinds.end(); ++i)\n";
src += indent(h_ind + 1) + "{\n";
***************
*** 90,94 ****
{
char k_s[10]; sprintf( k_s, "%i", k); std::string k_str( k_s);
! src += indent(h_ind + 1) + "kinds_vec[" + k_str + "] = getChildObjects";
src += "(\"" + kind_vec[k] + "\");\n";
}
--- 90,94 ----
{
char k_s[10]; sprintf( k_s, "%i", k); std::string k_str( k_s);
! src += indent(h_ind + 1) + "kinds_vec[" + k_str + "] = FolderImpl::getChildObjects";
src += "(\"" + kind_vec[k] + "\");\n";
}
***************
*** 123,127 ****
src = indent(h_ind + 0) + "{\n";
src += indent(h_ind + 1) + " std::set<" + retval_kind + ", T> res;\n";
! src += indent(h_ind + 1) + " std::set<Object> l = getChildObjects(\"" + kind + "\");\n";
src += indent(h_ind + 1) + " for( std::set<Object>::iterator i = l.begin(); i != l.end(); ++i)\n";
src += indent(h_ind + 1) + " {\n";
--- 123,127 ----
src = indent(h_ind + 0) + "{\n";
src += indent(h_ind + 1) + " std::set<" + retval_kind + ", T> res;\n";
! src += indent(h_ind + 1) + " std::set<Object> l = FolderImpl::getChildObjects(\"" + kind + "\");\n";
src += indent(h_ind + 1) + " for( std::set<Object>::iterator i = l.begin(); i != l.end(); ++i)\n";
src += indent(h_ind + 1) + " {\n";
***************
*** 154,158 ****
src = indent(h_ind + 0) + "{\n";
src += indent(h_ind + 1) + "std::set<" + retval_kind + ", T> res;\n";
! src += indent(h_ind + 1) + "std::set<BON::FCO> roles = getChildFCOsAs(\"" + inquire + "\");\n";
src += indent(h_ind + 1) + "for( std::set<BON::FCO>::iterator i = roles.begin(); i != roles.end(); ++i)\n";
src += indent(h_ind + 1) + "{\n";
--- 154,158 ----
src = indent(h_ind + 0) + "{\n";
src += indent(h_ind + 1) + "std::set<" + retval_kind + ", T> res;\n";
! src += indent(h_ind + 1) + "std::set<BON::FCO> roles = ModelImpl::getChildFCOsAs(\"" + inquire + "\");\n";
src += indent(h_ind + 1) + "for( std::set<BON::FCO>::iterator i = roles.begin(); i != roles.end(); ++i)\n";
src += indent(h_ind + 1) + "{\n";
***************
*** 185,189 ****
src = indent(h_ind + 0) + "{\n";
src += indent(h_ind + 1) + "std::set<" + retval_kind + ", T> res;\n";
! src += indent(h_ind + 1) + "std::set<BON::FCO> roles = getChildFCOsAs(\"" + inquire + "\");\n";
src += indent(h_ind + 1) + "for( std::set<BON::FCO>::iterator i = roles.begin(); i != roles.end(); ++i)\n";
src += indent(h_ind + 1) + "{\n";
--- 185,189 ----
src = indent(h_ind + 0) + "{\n";
src += indent(h_ind + 1) + "std::set<" + retval_kind + ", T> res;\n";
! src += indent(h_ind + 1) + "std::set<BON::FCO> roles = ModelImpl::getChildFCOsAs(\"" + inquire + "\");\n";
src += indent(h_ind + 1) + "for( std::set<BON::FCO>::iterator i = roles.begin(); i != roles.end(); ++i)\n";
src += indent(h_ind + 1) + "{\n";
***************
*** 224,228 ****
{
char k_s[10]; sprintf( k_s, "%i", k); std::string k_str( k_s);
! src += indent(h_ind + 1) + "roles_vec[" + k_str + "] = getChildFCOsAs(\"" + roles[k] + "\");\n";
}
--- 224,228 ----
{
char k_s[10]; sprintf( k_s, "%i", k); std::string k_str( k_s);
! src += indent(h_ind + 1) + "roles_vec[" + k_str + "] = ModelImpl::getChildFCOsAs(\"" + roles[k] + "\");\n";
}
***************
*** 258,262 ****
src = indent(h_ind + 0) + "{\n";
src += indent(h_ind + 1) + "std::set<" + retval_kind + ", T> res;\n";
! src += indent(h_ind + 1) + "std::set<BON::FCO> roles = getChildFCOsAs(\"" + desc_k_name + role_name + "\");\n";
src += indent(h_ind + 1) + "for( std::set<BON::FCO>::iterator i = roles.begin(); i != roles.end(); ++i)\n";
src += indent(h_ind + 1) + "{\n";
--- 258,262 ----
src = indent(h_ind + 0) + "{\n";
src += indent(h_ind + 1) + "std::set<" + retval_kind + ", T> res;\n";
! src += indent(h_ind + 1) + "std::set<BON::FCO> roles = ModelImpl::getChildFCOsAs(\"" + desc_k_name + role_name + "\");\n";
src += indent(h_ind + 1) + "for( std::set<BON::FCO>::iterator i = roles.begin(); i != roles.end(); ++i)\n";
src += indent(h_ind + 1) + "{\n";
***************
*** 602,609 ****
rtv = indent(h_ind + 0) + "template <class T>\n";
! rtv += indent(h_ind + 0) + "std::set<" + retval_kind + ">";
sgn = cont->setGetterTemplate( fco) + "(" + (dummy_par?" int dummy, ":"") + "TDP)";
src = indent(h_ind + 0) + "{\n";
! src += indent(h_ind + 1) + "std::set<" + retval_kind + "> res;\n";
src += indent(h_ind + 1) + "std::set<BON::FCO> elems = BON::SetImpl::getMembers();\n";
src += indent(h_ind + 1) + "std::set<BON::FCO>::iterator elem = elems.begin();\n";
--- 602,609 ----
rtv = indent(h_ind + 0) + "template <class T>\n";
! rtv += indent(h_ind + 0) + "std::set<" + retval_kind + ", T>";
sgn = cont->setGetterTemplate( fco) + "(" + (dummy_par?" int dummy, ":"") + "TDP)";
src = indent(h_ind + 0) + "{\n";
! src += indent(h_ind + 1) + "std::set<" + retval_kind + ", T> res;\n";
src += indent(h_ind + 1) + "std::set<BON::FCO> elems = BON::SetImpl::getMembers();\n";
src += indent(h_ind + 1) + "std::set<BON::FCO>::iterator elem = elems.begin();\n";
More information about the GME-commit
mailing list