Changeset 268 for cpp/frams/param/param.cpp

Timestamp:

12/16/14 01:48:21 (9 years ago)

Author:

Maciej Komosinski

Message:

ParamInterface::load warns on unknown fields and skips comments

File:

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

cpp/frams/param/param.cpp

@@ -371 +371 @@
 }
 
-int ParamInterface::load(VirtFILE* f)
+int ParamInterface::load(VirtFILE* f,bool warn_unknown_fields)
 {
         SString buf;
@@ -384 +384 @@
                 p0 = t; while ((*p0 == ' ') || (*p0 == '\t')) p0++;
                 if (!*p0) break;
+                if (p0[0]=='#') continue;
                 p = strchr(p0, ':'); if (!p) continue;
                 p_len = (int)(p - p0);
                 loaded = false;
-                if (p_len && ((i = findIdn(p0, p_len)) >= 0) && (!(flags(i)&PARAM_DONTLOAD)))
-                {
+                if (p_len && ((i = findIdn(p0, p_len)) >= 0))
+                {
+                if (!(flags(i)&PARAM_DONTLOAD))
+                   {
                         if (p0[p_len + 1] == '~')
                         {
@@ -404 +407 @@
                         fields_loaded++;
                         loaded = true;
-                }
+                   }
+                }
+                else if (warn_unknown_fields)
+                        {
+                        SString name(p0,p_len);
+                        FMprintf("ParamInterface","load",FMLV_WARN,"Unknown property '%s' while loading object '%s'",(const char*)name,getName());
+                        }
+
                 if ((!loaded) && (p0[p_len + 1] == '~'))
                 { // eat unrecognized multiline field