Changeset 914 for cpp

Timestamp:

04/20/20 23:29:51 (5 years ago)

Author:

Maciej Komosinski

Message:

Param "single line" loader improved: misleading error message when parsing unnamed fields after a field with unrecognized name (typically, loading new genotypes by an older loader unaware of the current definitions of properties)

File:

• cpp/frams/param/param.cpp (modified) (2 diffs)

cpp/frams/param/param.cpp

@@ -1295 +1295 @@
                 if (field_end == t)     // skip empty value
                 {
-                        t++; i++;
+                        t++; if (i>=0) i++;
                         continue;
                 }
@@ -1310 +1310 @@
                 }
 #ifdef WARN_MISSING_NAME
-                else
+                else // no parameter name
+                        {
 #ifdef SAVE_SELECTED_NAMES
-                        if ((i >= getPropCount()) || !(flags(i)&PARAM_CANOMITNAME))
+                        if ((i < 0) // field after unknown field
+                            || (i >= getPropCount()) // field after last field
+                            || !(flags(i)&PARAM_CANOMITNAME)) // valid field but it can't be skipped
 #endif
                         {
-                                if (id(i))
-                                        logPrintf("Param", "loadSingleLine", LOG_WARN, "Missing property name in '%s' (assuming '%s')", getName(), id(i));
-                                else
+                                if (i < getPropCount())
+                                        logPrintf("Param", "loadSingleLine", LOG_WARN, "Missing property name in '%s'", getName());
+                                else // 'i' can go past PropCount because of moving to subsequent properties by i++, id(i) is then NULL
                                         logPrintf("Param", "loadSingleLine", LOG_WARN, "Value after the last property of '%s'", getName());
                         }
+                        }
+                //else skipping a skippable field
 #endif
-                if ((i >= 0) && id(i))
+                if ((i >= 0) && id(i)) // shared by name and skippped name cases
                 {
                         value = t;