Changeset 426 for cpp/frams/param

Timestamp:

08/27/15 00:06:26 (9 years ago)

Author:

Maciej Komosinski

Message:

Warn about duplicated field values

File:

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

cpp/frams/param/param.cpp

@@ -401 +401 @@
         int fields_loaded = 0;
         int unexpected_line = 0;
+        vector<bool> seen;
+        seen.resize(getPropCount());
         if ((i=findId("beforeLoad"))>=0)
                 call(i,NULL,NULL);
@@ -434 +436 @@
                 if (p_len && ((i = findIdn(p0, p_len)) >= 0))
                 {
+                        if (seen[i])
+                                {
+                                SString fileinfo;
+                                const char* fname=f->VgetPath();
+                                if (fname!=NULL)
+                                        {
+                                        fileinfo=SString::sprintf(" while reading from '%s'",fname);
+                                        if (linenum)
+                                                fileinfo+=SString::sprintf(" (line %d)",*linenum);
+                                        }
+                                logPrintf("ParamInterface", "load", LOG_WARN, "Multiple '%s.%s' fields found%s",getName(),id(i),fileinfo.c_str());
+                                }
+                        else
+                                seen[i]=true;
                         if (!(flags(i)&PARAM_DONTLOAD))
                         {