Added a new field loop expression <IF RELATION> that can be used to determine whether the current field is associated with the only segment of a relations FROM key. In other words, whether there is a direct outbound relation from the field to another structure.

Added a new generic expression <IF ENUMS> that can be used to determine whether any enumerations are defined in the repository.

Changed the way that CodeGen behaves while processing various types of loops. Previously, if certain types of loop had no supporting data, then an error would be generated and code generation would fail. For example, if a key loop was encountered when processing a structure that had no keys, code generation would fail. Now code generation will continue, and the loop in question will be ignored. The loops affected by this change are key loops, unique key loops, alternate key loops, unique alternate key loops, primary key blocks, unique key blocks, relation loops, enumeration loops, structure enumeration loops, and file loops.

Added a new command line option -elf which overrides the behavior described in the previous item, reverting to the original behavior of failing if a loop is encountered with no supporting data.

Author: SteveIves

CodeGen/CodeGen.dbl

@@ -460,6 +460,14 @@ proc
         endusing
     end
 
+    ;;-------------------------------------------------------------------------
+    ;;Should code generation fail if empty loops are encountered?
+
+    if (ok && CommandLineParser.Parse("elf"))
+    begin
+        taskSet.EmptyLoopFail = true
+    end
+
     ;;-------------------------------------------------------------------------
     ;;Do we have a custom database type specified?
     ;;If not the default will be SqlDatabaseType.SQLServer.

CodeGen/Usage.dbl

@@ -187,6 +187,12 @@ proc
     Console.WriteLine("          starting CodeGen from batch files.")
     Console.WriteLine("")
 
+    ;;Limit for text   -------------------------------------------------------------------------------
+    Console.WriteLine("    -elf  Restores the original CodeGen behavior failing if certain types of")
+    Console.WriteLine("          loop are encountered with no supporting data. For example, if a key")
+    Console.WriteLine("          loop is encountered when processing a structure with no keys.")
+    Console.WriteLine("")
+
     ;;Limit for text   -------------------------------------------------------------------------------
     Console.WriteLine("    -f [o] [l] [t] [r] [w]")
     Console.WriteLine("          Override default field loop processing rules.")

CodeGenEngine/CodeGenTaskSet.dbl

@@ -142,6 +142,14 @@ namespace CodeGen.Engine
         ;;; </summary>
         public readwrite property EchoCommands, Boolean
 
+        ;;;	<summary>
+        ;;; This option restores the original CodeGen behavior of causing a failure if 
+        ;;;	certain types of loop are encountered with no supporting data. For example, if 
+        ;;; a key loop is encountered when processing a structure with no keys.
+        ;;; Setting this property to true is equivalent to using the -elf command line option.
+        ;;;	</summary>
+        public readwrite property EmptyLoopFail, Boolean
+
         ;;;	<summary>
         ;;;	List the names of the output files generated.
         ;;; Setting this property to true is equivalent to using the -lf command line option.

CodeGenEngine/ExpressionEvaluators/ExpressionEvaluatorFieldLoop.dbl

@@ -228,6 +228,7 @@ namespace CodeGen.Engine
             fieldLoopExpressionEvaluators.Add("RANGE", evaluateFieldRange)
             fieldLoopExpressionEvaluators.Add("READONLY", evaluateFieldReadOnly)
             fieldLoopExpressionEvaluators.Add("READWRITE", evaluateFieldReadWrite)
+            fieldLoopExpressionEvaluators.Add("RELATION", evaluateFieldRelation)
             fieldLoopExpressionEvaluators.Add("REPORT", evaluateFieldReport)
             fieldLoopExpressionEvaluators.Add("REPORT_CENTER", evaluateFieldReportCenter)
             fieldLoopExpressionEvaluators.Add("REPORT_LEFT", evaluateFieldReportLeft)
@@ -2220,6 +2221,30 @@ namespace CodeGen.Engine
             mreturn EvaluateFieldLoopExpression(tkn, template, loops, doEvaluate)
         endmethod
 
+        private static method evaluateFieldRelation, boolean
+            tkn, @Token 
+            template, @FileNode 
+            loops, @IEnumerable<LoopNode> 
+            endparams
+        proc
+            lambda doEvaluate(str, field, index)
+            begin
+                ;;Return true if the field is associated with the only segment of a relations FROM key
+                data rel, @RpsRelation
+                foreach rel in str.Relations
+                begin
+                    ;;Is this relations FROM KEY based on the current field?
+                    data fromKey, @RpsKey, str.Keys.FirstOrDefault(lambda(k) { k.Segments.Count==1 && k.Segments[0].SegmentType==RpsKeySegmentType.Field && k.Segments[0].field==field.Name })
+                    if (fromKey != ^null)
+                    begin
+                        mreturn true
+                    end
+                end
+                mreturn false
+            end
+            mreturn EvaluateFieldLoopExpression(tkn, template, loops, doEvaluate)
+        endmethod
+
         private static method evaluateFieldReport, boolean
             tkn, @Token 
             template, @FileNode 

CodeGenEngine/ExpressionEvaluators/ExpressionEvaluatorGeneric.dbl

@@ -69,6 +69,7 @@ namespace CodeGen.Engine
             genericExpressionEvaluators.Add("DATABASE_POSTGRESQL", evaluateDatabase)
             genericExpressionEvaluators.Add("DATABASE_SQLSERVER", evaluateDatabase)
             genericExpressionEvaluators.Add("DEBUG_LOGGING", evaluateVerboseLogging)
+            genericExpressionEvaluators.Add("ENUMS", evaluateEnums)
             genericExpressionEvaluators.Add("FIELD_PREFIX", evaluateFieldPrefix)
             genericExpressionEvaluators.Add("FIELD_SUBSET", evaluateFieldSubset)
             genericExpressionEvaluators.Add("MULTIPLE_STRUCTURES", evaluateMultipleStructures)
@@ -78,7 +79,7 @@ namespace CodeGen.Engine
             genericExpressionEvaluators.Add("VERBOSE_LOGGING", evaluateVerboseLogging)
 
             ;;Structure expressions
-			
+
             genericExpressionEvaluators.Add("STRUCTURE_ASCII", evaluateStructureAscii)
             genericExpressionEvaluators.Add("STRUCTURE_FILES", evaluateStructureFiles)
             genericExpressionEvaluators.Add("STRUCTURE_HAS_UNIQUE_KEY", evaluateStructureHasUniqueKey)
@@ -286,6 +287,15 @@ namespace CodeGen.Engine
             mreturn (template.Context.VerboseLoggingEnabled)
         endmethod
 
+        private static method evaluateEnums, boolean
+            tkn, @Token 
+            template, @FileNode 
+            loops, @IEnumerable<LoopNode> 
+            endparams
+        proc
+            mreturn (template.Context.Repository != ^null ? (template.Context.Repository.Enumerations.Count > 0) : false)
+        endmethod
+
         ;; -------------------------------------------------------------------------------------------------------------------------------
         ;; Structure expressions