Make sure that <PARAMETER_SIZE> works with structure parameters.

Author: Steve Ives

CodeGenEngine/LoopExpander.dbl

@@ -844,7 +844,7 @@ namespace CodeGen.Engine
 				begin
 					try
 					begin
-						context.CurrentStructure = new RpsStructure(loop.CurrentParameter.StructureName)
+						loop.CurrentStructure = new RpsStructure(loop.CurrentParameter.StructureName)
 					end
 					catch (ex, @Exception)
 					begin
@@ -853,7 +853,7 @@ namespace CodeGen.Engine
 					endtry
 				end
 				else
-					context.CurrentStructure = ^null
+					loop.CurrentStructure = ^null
 
 				data child, @ITreeNode
 				foreach child in node.Body

CodeGenEngine/TokenExpanders/TokenExpanderParameterLoop.dbl

@@ -172,7 +172,21 @@ namespace CodeGen.Engine
 			loops, @IEnumerable<LoopNode> 
 			endparams
 		proc
-			lambda doExpand(catalog,iface,meth,param) param.Size.ToString()
+			lambda doExpand(catalog,iface,meth,param)
+			begin
+				using param.Type select
+				(ParameterType.Alpha,ParameterType.Decimal,ParameterType.ImpliedDecimal,ParameterType.Integer,ParameterType.Enumeration),
+					mreturn param.Size.ToString()
+				(ParameterType.Handle,ParameterType.BinaryHandle,ParameterType.String),
+					mreturn 0
+				(ParameterType.Structure),
+				begin
+					lambda isParameterLoop(node) (node .is. ParameterLoopNode)
+					data loop, @ParameterLoopNode, ^as(loops.First(isParameterLoop), ParameterLoopNode)
+					mreturn loop.CurrentStructure.Length.ToString()
+				end
+				endusing
+			end
 			mreturn ExpandParameterLoopToken(tkn, template, loops, doExpand)
 		endmethod
 

CodeGenEngine/TreeNodes.dbl

@@ -208,6 +208,7 @@ namespace CodeGen.Engine
 		public CurrentInterface, @SmcInterface
 		public CurrentMethod, @SmcMethod
 		public CurrentParameter, @SmcParameter
+		public CurrentStructure, @RpsStructure
 	endclass
 
 	;;; <summary>