We added two new field loop expression tokens <IF GROUP_EXPLICIT> and <IF GROUP_IMPLICIT>. Also, for unexpanded explicit group fields only, we altered the output of three six loop expansion tokens, <FIELD_CSDEFAULT>, <FIELD_CSTYPE>, <FIELD_SNDEFAULT>, <FIELD_SNTYPE>, <FIELD_VBDEFAULT> and <FIELD_VBTYPE> by prefixing the type with the name of the enclosing structure.

Author: SteveIves

CodeGenEngine/ExpressionEvaluators/ExpressionEvaluatorFieldLoop.dbl

@@ -132,6 +132,8 @@ namespace CodeGen.Engine
             fieldLoopExpressionEvaluators.Add("FIRST_UNIQUE_KEY_SEGMENT", evaluateFirstUniqueKeySegment)
             fieldLoopExpressionEvaluators.Add("FORMAT", evaluateFieldFormat)
             fieldLoopExpressionEvaluators.Add("GROUP", evaluateFieldGroup)
+            fieldLoopExpressionEvaluators.Add("GROUP_EXPLICIT", evaluateFieldGroupExplicit)
+            fieldLoopExpressionEvaluators.Add("GROUP_IMPLICIT", evaluateFieldGroupImplicit)
             fieldLoopExpressionEvaluators.Add("GROUP_OVERLAY", evaluateFieldGroupOverlay)
             fieldLoopExpressionEvaluators.Add("GROUP_MEMBER_PREFIX", evaluateFieldGroupMemberPrefix)
             fieldLoopExpressionEvaluators.Add("GROUP_MEMBER_PREFIX_COMPILER", evaluateFieldGroupMemberPrefixCompiler)
@@ -1295,6 +1297,30 @@ namespace CodeGen.Engine
             mreturn EvaluateFieldLoopExpression(tkn, template, loops, doEvaluate)
         endmethod
 
+        private static method evaluateFieldGroupExplicit, boolean
+            tkn, @Token 
+            template, @FileNode 
+            loops, @IEnumerable<LoopNode> 
+            endparams
+        proc
+            lambda doEvaluate(str, field, index)
+            &   field.GroupType != RpsFieldGroup.No
+            &   && String.IsNullOrWhiteSpace(field.GroupStructure)
+            mreturn EvaluateFieldLoopExpression(tkn, template, loops, doEvaluate)
+        endmethod
+
+        private static method evaluateFieldGroupImplicit, boolean
+            tkn, @Token 
+            template, @FileNode 
+            loops, @IEnumerable<LoopNode> 
+            endparams
+        proc
+            lambda doEvaluate(str, field, index)
+            &   field.GroupType != RpsFieldGroup.No
+            &   && !String.IsNullOrWhiteSpace(field.GroupStructure)
+            mreturn EvaluateFieldLoopExpression(tkn, template, loops, doEvaluate)
+        endmethod
+
         private static method evaluateFieldGroupOverlay, boolean
             tkn, @Token 
             template, @FileNode 

CodeGenEngine/RepositoryTools.dbl

@@ -544,15 +544,15 @@ namespace CodeGen.Engine
 
                     if (Field.GroupType==RpsFieldGroup.Yes && String.IsNullOrWhiteSpace(Field.GroupStructure) && context.CurrentTask.ExplicitGroupNoExpand)
                     begin
-                        Field.CsType = Field.Name
-                        Field.CsDefault = String.Format("new {0}()",Field.Name)
+                        Field.CsType = String.Format("{0}_{1}",Struct.Name,Field.Name)
+                        Field.SnDefault = String.Format("new {0}_{1}()",Struct.Name,Field.Name)
                         Field.CsNumericConvert = ""
 
-                        Field.VbType = Field.Name
-                        Field.VbDefault = String.Format("New {0}()",Field.Name)
+                        Field.VbType = String.Format("{0}_{1}",Struct.Name,Field.Name)
+                        Field.VbDefault = String.Format("new {0}_{1}()",Struct.Name,Field.Name)
 
-                        Field.SnType = String.Format("@{0}",Field.Name)
-                        Field.SnDefault = String.Format("new {0}()",Field.Name)
+                        Field.SnType = String.Format("@{0}_{1}",Struct.Name,Field.Name)
+                        Field.SnDefault = String.Format("new {0}_{1}()",Struct.Name,Field.Name)
 
                         Field.SqlType = String.Format("VARCHAR({0})",%string(Field.Size))
 

CodeGenEngine/Tokenizer.dbl

@@ -868,6 +868,8 @@ namespace CodeGen.Engine
             expressions.Add("FUNCTION",                         TokenValidity.MethodLoop)
             expressions.Add("GENERICBUTTON",                    TokenValidity.ButtonLoop)
             expressions.Add("GROUP",                            TokenValidity.FieldLoop)
+            expressions.Add("GROUP_EXPLICIT",                   TokenValidity.FieldLoop)
+            expressions.Add("GROUP_IMPLICIT",                   TokenValidity.FieldLoop)
             expressions.Add("GROUP_MEMBER_PREFIX",              TokenValidity.FieldLoop)
             expressions.Add("GROUP_MEMBER_PREFIX_COMPILER",     TokenValidity.FieldLoop)
             expressions.Add("GROUP_OVERLAY",                    TokenValidity.FieldLoop)

Documentation/CodeGen.chm

@@ -1,5 +1,20 @@
 ;//This template is for development testing. It is not shipped by the installer.
-<CODEGEN_FILENAME>a.txt</CODEGEN_FILENAME>
+<CODEGEN_FILENAME>a.dbl</CODEGEN_FILENAME>
+namespace <NAMESPACE>
+
+    public class <StructureName>
+
 <FIELD_LOOP>
-<FIELD_NAME> <FIELD_SQLNAME>
-</FIELD_LOOP>
+        public readwrite property <FieldSqlName>, <FIELD_SNTYPE> 
+
+  <IF GROUP_EXPLICIT AND NOT GROUP_OVERLAY>
+        public class <STRUCTURE_NAME>_<FIELD_NAME> ;Explicit group
+
+        <FIELD_GROUP_EXPAND>
+        endclass
+
+  </IF>
+</FIELD_LOOP>
+    endclass
+
+endnamespace