[GME-commit] GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep Dumper.cpp, 1.33, 1.34 FCO.cpp, 1.15, 1.16

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

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

Modified Files:
	Dumper.cpp FCO.cpp 
Log Message:
Dumper.cpp: checkAllFCOs can't stop on the first error (as previously) because default aspects must be generated for aspectless models. (Bool Variable assigment does not executes completely if the first part of an AND (&&) expression is false).

FCO.cpp : don't dump out empty regnodes from parsed GeneralPreference.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: FCO.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/FCO.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** FCO.cpp	21 Jul 2006 19:31:18 -0000	1.15
--- FCO.cpp	8 Mar 2007 19:48:02 -0000	1.16
***************
*** 853,857 ****
  				tok.trimRight( prefPair[1]);
  				//mmm += indStr() + "<regnode name = \"" + (LPCTSTR)prefPair[0] + "\" value =\"" + (LPCTSTR)prefPair[1] + "\"></regnode>\n";
! 				mmm += indStr() + "<regnode name = \"" + prefPair[0] + "\" value =\"" + prefPair[1] + "\"></regnode>\n";
  			}
  			else {
--- 853,860 ----
  				tok.trimRight( prefPair[1]);
  				//mmm += indStr() + "<regnode name = \"" + (LPCTSTR)prefPair[0] + "\" value =\"" + (LPCTSTR)prefPair[1] + "\"></regnode>\n";
! 				if( prefPair[0].empty())
! 					global_vars.err << MSG_ERROR << "Empty General Preference token found at " << m_ptr << " with \"" << prefPair[1] << "\" as value.\n";
! 				else
! 					mmm += indStr() + "<regnode name = \"" + prefPair[0] + "\" value =\"" + prefPair[1] + "\"></regnode>\n";
  			}
  			else {

Index: Dumper.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/Paradigms/MetaGME/MetaInterpreter2004/Rep/Dumper.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Dumper.cpp	30 Oct 2006 22:35:59 -0000	1.33
--- Dumper.cpp	8 Mar 2007 19:48:02 -0000	1.34
***************
*** 1188,1192 ****
  
  		if (!(*it2)->isAbstract())
! 			res = res && (*it2)->checkMyAspects( this);
  
  		if (!(*it2)->isAbstract() && !(*it2)->checkIsPartOfFinal() && !m_rootFolder.isInRoot( *it2) && !findInFolders(*it2)) 
--- 1188,1193 ----
  
  		if (!(*it2)->isAbstract())
! 			if( !(*it2)->checkMyAspects( this))
! 				res = false;
  
  		if (!(*it2)->isAbstract() && !(*it2)->checkIsPartOfFinal() && !m_rootFolder.isInRoot( *it2) && !findInFolders(*it2)) 
***************
*** 1203,1207 ****
  		if (!(*it3)->checkInheritance())
  			res = false;
! 		res = res && (*it3)->checkConnectionTargets();
  		if (!(*it3)->isAbstract() && !(*it3)->checkIsPartOfFinal()) 
  		{ 
--- 1204,1209 ----
  		if (!(*it3)->checkInheritance())
  			res = false;
! 		if (!(*it3)->checkConnectionTargets())
! 			res = false;
  		if (!(*it3)->isAbstract() && !(*it3)->checkIsPartOfFinal()) 
  		{ 
***************
*** 1216,1220 ****
  		if (!(*it4)->checkInheritance())
  			res = false;
! 		res = res && (*it4)->checkSetElements();
  		if (!(*it4)->isAbstract() && !(*it4)->checkIsPartOfFinal()) 
  		{ 
--- 1218,1223 ----
  		if (!(*it4)->checkInheritance())
  			res = false;
! 		if( !(*it4)->checkSetElements())
! 			res = false;
  		if (!(*it4)->isAbstract() && !(*it4)->checkIsPartOfFinal()) 
  		{