[Mobies-commit] [commit] r4072 - GReAT/trunk/Tools/CodeGenerator/CodeGenerator

[fengshi at redhat1.isis.vanderbilt.edu]

Author: fengshi
Date: Tue Jul 17 10:24:27 2012
New Revision: 4072

Log:
Bug fix for getting the Object full path

Modified:
   GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PE.CPP
   GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PatternMatcher.cpp

Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PE.CPP
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PE.CPP	Fri Jul  6 09:40:14 2012	(r4071)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PE.CPP	Tue Jul 17 10:24:27 2012	(r4072)
@@ -683,7 +683,7 @@
 				ns_path.replace(i, i+1, "_");
 				i = ns_path.find(delim);
 			}
-			_initValue= parent+ "."+ ns_path+"_"+type+ "_children()";
+			_initValue= parent+ "."+ ns_path+"_"+type+ "_kind_children()";
 		}
 	}
 }

Modified: GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PatternMatcher.cpp
==============================================================================
--- GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PatternMatcher.cpp	Fri Jul  6 09:40:14 2012	(r4071)
+++ GReAT/trunk/Tools/CodeGenerator/CodeGenerator/PatternMatcher.cpp	Tue Jul 17 10:24:27 2012	(r4072)
@@ -880,7 +880,8 @@
 		_currCode->add( *typeCheck);
 		// Create 'cast unbound object'.
 		Definition* castUnboundDef= new Definition;
-		std::string unboundType= ( std::string)unbound.paradigmName()+ RES+ ( std::string)unbound.classType();
+		//std::string unboundType= ( std::string)unbound.paradigmName()+ RES+ ( std::string)unbound.classType();
+		std::string unboundType = PE::getFullType(unbound);
 		castUnboundDef->_type= unboundType;
 		castUnboundDef->_variable= PE::createUniqueName( "curr"+ ( std::string)unbound.name());
 		castUnboundDef->_initValue= unboundType+ RES+ "Cast("+ SEP+ lowerBegin( unboundDef->_variable)+ ")";