[Avida-SVN] r2400 - in branches/uml: Avida.xcodeproj source/main

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-02-29 10:55:08 -0500 (Fri, 29 Feb 2008)
New Revision: 2400

Modified:
   branches/uml/Avida.xcodeproj/project.pbxproj
   branches/uml/source/main/cMDECompoundExpression.h
   branches/uml/source/main/cMDESimpleAttAttExpression.h
   branches/uml/source/main/cMDESimpleAttValExpression.h
   branches/uml/source/main/cMDESimpleOperationExpression.h
Log:


Modified: branches/uml/Avida.xcodeproj/project.pbxproj
===================================================================
--- branches/uml/Avida.xcodeproj/project.pbxproj	2008-02-29 15:43:42 UTC (rev 2399)
+++ branches/uml/Avida.xcodeproj/project.pbxproj	2008-02-29 15:55:08 UTC (rev 2400)
@@ -37,7 +37,6 @@
 		3E36C88C0D78538500802E27 /* cMDEExpressionAttribute.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3E36C8850D78538500802E27 /* cMDEExpressionAttribute.h */; };
 		3E36C88D0D78538500802E27 /* cMDESimpleAttAttExpression.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3E36C8860D78538500802E27 /* cMDESimpleAttAttExpression.h */; };
 		3E36C88E0D78538500802E27 /* cMDESimpleAttValExpression.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3E36C8870D78538500802E27 /* cMDESimpleAttValExpression.h */; };
-		3E36C88F0D78538500802E27 /* cMDESimpleExpression.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3E36C8880D78538500802E27 /* cMDESimpleExpression.h */; };
 		3E36C8900D78538500802E27 /* cMDESimpleOperationExpression.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3E36C8890D78538500802E27 /* cMDESimpleOperationExpression.h */; };
 		3E54F4170CFB147300FC5B63 /* cMDEProperty.cc in Sources */ = {isa = PBXBuildFile; fileRef = 3E54F4160CFB147300FC5B63 /* cMDEProperty.cc */; };
 		3E849FD60D4A7ECB003DE1BF /* cMDEExistenceProperty.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3E849FD50D4A7ECB003DE1BF /* cMDEExistenceProperty.h */; };
@@ -362,7 +361,6 @@
 				3E36C88C0D78538500802E27 /* cMDEExpressionAttribute.h in CopyFiles */,
 				3E36C88D0D78538500802E27 /* cMDESimpleAttAttExpression.h in CopyFiles */,
 				3E36C88E0D78538500802E27 /* cMDESimpleAttValExpression.h in CopyFiles */,
-				3E36C88F0D78538500802E27 /* cMDESimpleExpression.h in CopyFiles */,
 				3E36C8900D78538500802E27 /* cMDESimpleOperationExpression.h in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -406,7 +404,6 @@
 		3E36C8850D78538500802E27 /* cMDEExpressionAttribute.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cMDEExpressionAttribute.h; sourceTree = "<group>"; };
 		3E36C8860D78538500802E27 /* cMDESimpleAttAttExpression.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cMDESimpleAttAttExpression.h; sourceTree = "<group>"; };
 		3E36C8870D78538500802E27 /* cMDESimpleAttValExpression.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cMDESimpleAttValExpression.h; sourceTree = "<group>"; };
-		3E36C8880D78538500802E27 /* cMDESimpleExpression.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cMDESimpleExpression.h; sourceTree = "<group>"; };
 		3E36C8890D78538500802E27 /* cMDESimpleOperationExpression.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cMDESimpleOperationExpression.h; sourceTree = "<group>"; };
 		3E54F4160CFB147300FC5B63 /* cMDEProperty.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cMDEProperty.cc; sourceTree = "<group>"; };
 		3E849FD50D4A7ECB003DE1BF /* cMDEExistenceProperty.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cMDEExistenceProperty.h; sourceTree = "<group>"; };
@@ -1447,7 +1444,6 @@
 				3E36C8850D78538500802E27 /* cMDEExpressionAttribute.h */,
 				3E36C8860D78538500802E27 /* cMDESimpleAttAttExpression.h */,
 				3E36C8870D78538500802E27 /* cMDESimpleAttValExpression.h */,
-				3E36C8880D78538500802E27 /* cMDESimpleExpression.h */,
 				3E36C8890D78538500802E27 /* cMDESimpleOperationExpression.h */,
 				3EDCA0150C46C9B70078778D /* cUMLModel.cc */,
 				3EDCA0160C46C9B70078778D /* cUMLModel.h */,

Modified: branches/uml/source/main/cMDECompoundExpression.h
===================================================================
--- branches/uml/source/main/cMDECompoundExpression.h	2008-02-29 15:43:42 UTC (rev 2399)
+++ branches/uml/source/main/cMDECompoundExpression.h	2008-02-29 15:55:08 UTC (rev 2400)
@@ -24,7 +24,7 @@
 		_exp_2 = e2;
 		// Op must be either && or ||
 		_exp_op = op;
-		_expr = getInEnglish();
+		_expr = getInPromela();
 	}
 // 	~cMDECompoundExpression() {}
 	

Modified: branches/uml/source/main/cMDESimpleAttAttExpression.h
===================================================================
--- branches/uml/source/main/cMDESimpleAttAttExpression.h	2008-02-29 15:43:42 UTC (rev 2399)
+++ branches/uml/source/main/cMDESimpleAttAttExpression.h	2008-02-29 15:55:08 UTC (rev 2400)
@@ -27,7 +27,7 @@
 		_att_1 = a1;
 		_att_2 = a2;
 		_att_operator = op;
-		_expr = getInEnglish();
+		_expr = getInPromela();
 	}
  	~cMDESimpleAttAttExpression() {}
 	

Modified: branches/uml/source/main/cMDESimpleAttValExpression.h
===================================================================
--- branches/uml/source/main/cMDESimpleAttValExpression.h	2008-02-29 15:43:42 UTC (rev 2399)
+++ branches/uml/source/main/cMDESimpleAttValExpression.h	2008-02-29 15:55:08 UTC (rev 2400)
@@ -24,7 +24,7 @@
 		_att_1 = a1;
 		_att_val = val;
 		_att_operator = op;
-		_expr = getInEnglish();
+		_expr = getInPromela();
 	}
  	~cMDESimpleAttValExpression() {}
 	

Modified: branches/uml/source/main/cMDESimpleOperationExpression.h
===================================================================
--- branches/uml/source/main/cMDESimpleOperationExpression.h	2008-02-29 15:43:42 UTC (rev 2399)
+++ branches/uml/source/main/cMDESimpleOperationExpression.h	2008-02-29 15:55:08 UTC (rev 2400)
@@ -18,7 +18,7 @@
 	
 public:
 	cMDESimpleOperationExpression (std::string n, std::string c) { 
-		_op_name =n; _op_class=c; _expr = getInEnglish();}
+		_op_name =n; _op_class=c; _expr = getInPromela();}
 	~cMDESimpleOperationExpression() {}
 	
 	// get functions