Corrected an issue that was causing field loop expansion tokens and field loop expression tokens to be incorrectly processed when a key segment loop was embedded within a key loop, which was in turn embedded within a field loop. When field loop tokens are used within the context of a key segment loop they are supposed to be processed in the context of the field associated with the current key segment being processed by the key segment loop that immediately contains the tokens. However they were actually being processed in the context of the current field in the outer field loop.

Author: Steve Ives

CodeGenEngine/ExpressionEvaluators/ExpressionEvaluatorFieldLoop.dbl

@@ -266,7 +266,7 @@ namespace CodeGen.Engine
         proc
 
             lambda isFieldOrSegmentLoop(node) (node .is. FieldLoopNode || node .is. SegmentLoopNode)
-            data loop, @LoopNode, loops.First(isFieldOrSegmentLoop)
+            data loop, @LoopNode, loops.Last(isFieldOrSegmentLoop)
 
             data str, @RpsStructure, ^null
             data field, @RpsField, ^null
@@ -296,7 +296,7 @@ namespace CodeGen.Engine
                 ;;Now get a handle on the full definition of the key segment we're dealing with
                 data segment, @RpsKeySegment, ((@RelationSegmentLoopNode)loop).CurrentSegment
 
-                ;;And get a hangle on the field associated with the current segment
+                ;;And get a handle on the field associated with the current segment
                 ;;Could return null if it a "literal" segment
                 lambda isSegmentField(fld) (fld.Name == segment.Field)
                 field = str.Fields.FirstOrDefault(isSegmentField)
@@ -306,17 +306,9 @@ namespace CodeGen.Engine
             else if (loop .is. SegmentLoopNode)
             begin
                 ;;We're in a regular key segment loop
-				
-                ;;Get a handle on the structure being processed
+                ;;Get handles on the current structure, field, and index
                 str = template.Context.CurrentStructure
-
-                ;;Amd the current key segment
-                data segment, @RpsKeySegment, ((@SegmentLoopNode)loop).CurrentSegment
-
-                ;;And the field associated with the key segment
-                lambda isSegmentField(fld) (fld.Name == segment.Field)
-                field = str.Fields.First(isSegmentField)
-
+                field = ((@SegmentLoopNode)loop).CurrentField
                 index = ((@SegmentLoopNode)loop).CurrentIndex
             end
 

CodeGenEngine/TokenExpanders/TokenExpanderFieldLoop.dbl

@@ -170,15 +170,43 @@ namespace CodeGen.Engine
             specific, @Func<RpsStructure, RpsField, string> 
             endparams
         proc
-            lambda isFieldLoop(node) node .is. FieldLoopNode
-            data fieldLoop, @FieldLoopNode, ^as(loops.FirstOrDefault(isFieldLoop), FieldLoopNode)
-			
-            if (fieldLoop != ^null) then
-                mreturn specific(template.Context.CurrentStructure, fieldLoop.CurrentField)
-            else
+
+            lambda isFieldOrSegmentLoop(node) (node .is. FieldLoopNode || node .is. SegmentLoopNode)
+            data loop, @LoopNode, loops.Last(isFieldOrSegmentLoop)
+
+            data str, @RpsStructure
+            data fld, @RpsField
+
+            if (loop .is. FieldLoopNode) then
             begin
-                lambda isSegmentLoop(node) node .is. SegmentLoopNode
-                data segloop, @SegmentLoopNode, ^as(loops.FirstOrDefault(isSegmentLoop), SegmentLoopNode)
+                ;;We're in a field loop
+                str = template.Context.CurrentStructure
+                fld = ((@FieldLoopNode)loop).CurrentField
+            end
+            else if (loop .is. RelationSegmentLoopNode) then
+            begin
+                ;;We're in a relation key segment loop
+
+                ;;First get a handle on the outer relation loop that must be above us in the tree
+                lambda isRelationLoop(node) (node .is. RelationLoopNode)
+                data relationLoop, @RelationLoopNode, ^as(loops.First(isRelationLoop), @RelationLoopNode)
+
+                ;;Determine which structure we're dealing with, based on the TYPE of relation segment loop (FROM_KEY_SEGMENT_LOOP or TO_KEY_SEGMENT_LOOP)
+                str = loop.OpenToken.Value.StartsWith("FROM_KEY_SEGMENT_LOOP") ? template.Context.CurrentStructure : relationLoop.ToStructure
+
+                ;;Now get a handle on the full definition of the key segment we're dealing with
+                data segment, @RpsKeySegment, ((@RelationSegmentLoopNode)loop).CurrentSegment
+
+                ;;And get a handle on the field associated with the current segment
+                ;;Could return null if it a "literal" segment
+                lambda isSegmentField(f) (f.Name == segment.Field)
+                fld = str.Fields.FirstOrDefault(isSegmentField)
+
+            end
+            else if (loop .is. SegmentLoopNode)
+            begin
+                ;;We're in a regular key segment loop
+                data segloop = (@SegmentLoopNode)loop
 
                 ;;There are some scenarios where field loop tokens are theoretically valid,
                 ;;But where in some specific scenarios there may be no current field.
@@ -189,9 +217,12 @@ namespace CodeGen.Engine
                 if (segloop.CurrentField == ^null)
                     throw new ApplicationException(String.Format("Can't use field loop token in segment loop for structure {0} key {1} segment {2}. No associated field!",template.Context.CurrentStructure.Name, segloop.CurrentKey.Name, segloop.CurrentIndex + 1))
 
-                mreturn specific(template.Context.CurrentStructure, segloop.CurrentField)
+                str = template.Context.CurrentStructure
+                fld = segloop.CurrentField
             end
 
+            mreturn specific(str, fld)
+
         endmethod
 
         private static method expandFieldAltName, string