Improved <RELATION_TOSTRUCTURE>, <RELATION_TOSTRUCTURE_NOPLURAL> and <RELATION_TOSTRUCTURE_PLURAL> by adding support for structure aliasing.

Author: Steve Ives

CodeGenEngine/LoopExpander.dbl

@@ -397,12 +397,13 @@ namespace CodeGen.Engine
 				loop.CurrentRelation = template.Context.CurrentStructure.Relations[ix]
 				loop.CurrentIndex = ix
 
-				;;Load the "from key" information
+				;;Locate the "from key" information
 				lambda isFromKey(k) k.Name == loop.CurrentRelation.FromKey
 				loop.FromKey = template.Context.CurrentStructure.Keys.First(isFromKey)
 
-				;;Load the "to structure" information
-				loop.ToStructure = new RpsStructure(loop.CurrentRelation.ToStructure)
+				;;Locate the "to structure" information
+                lambda isToStructure(s) s.Name == loop.CurrentRelation.ToStructure
+                loop.ToStructure = template.Context.Structures.First(isToStructure)
 
 				;Load the "to key" information
 				lambda isToKey(k) k.Name == loop.CurrentRelation.ToKey

CodeGenEngine/TokenExpanders/TokenExpanderRelationLoop.dbl

@@ -162,7 +162,7 @@ namespace CodeGen.Engine
             loops, @IEnumerable<LoopNode> 
             endparams
         proc
-			lambda doExpand(str, relation, index, fromkey, tostr, tokey) relation.ToStructure
+            lambda doExpand(str, relation, index, fromkey, tostr, tokey) tostr.Alias
             mreturn ExpandRelationLoopToken(tkn, template, loops, doExpand)
 		endmethod
 
@@ -172,7 +172,10 @@ namespace CodeGen.Engine
 			loops, @IEnumerable<LoopNode> 
 			endparams
 		proc
-			lambda doExpand(str, relation, index, fromkey, tostr, tokey) relation.ToStructure.EndsWith("S") ? relation.ToStructure : String.Format("{0}S",relation.ToStructure)
+            lambda doExpand(str, relation, index, fromkey, tostr, tokey)
+            begin
+                mreturn tostr.Alias.EndsWith("S") ? tostr.Alias : String.Format("{0}S",tostr.Alias)
+            end
 			mreturn ExpandRelationLoopToken(tkn, template, loops, doExpand)
 		endmethod
 
@@ -182,7 +185,10 @@ namespace CodeGen.Engine
 			loops, @IEnumerable<LoopNode> 
 			endparams
 		proc
-			lambda doExpand(str, relation, index, fromkey, tostr, tokey) relation.ToStructure.EndsWith("S") ? relation.ToStructure.Substring(0,relation.ToStructure.Length-1) : relation.ToStructure
+            lambda doExpand(str, relation, index, fromkey, tostr, tokey)
+            begin
+                mreturn tostr.Alias.EndsWith("S") ? tostr.Alias.Substring(0,tostr.Alias.Length-1) : tostr.Alias
+            end
 			mreturn ExpandRelationLoopToken(tkn, template, loops, doExpand)
 		endmethod
 

Documentation/CodeGen.chm

@@ -2055,7 +2055,7 @@ namespace CodeGen.RepositoryAPI
 		;;              Set to the same as Name if no alternate name is defined
 		;;              Could change to include paths and array dimensions after CheckStructure
 		;;
-		;;BaseName      Starts off as the alternate name of the field per repository
+		;;BaseName      Starts off as the base name of the field per repository
 		;;              Could change to include paths and array dimensions after CheckStructure
 		;;              For arrays, BaseName does NOT include any final array element number
 		;;