Changeset 268 for cpp/frams

Timestamp:

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

Author:

Maciej Komosinski

Message:

ParamInterface::load warns on unknown fields and skips comments

Location:

cpp/frams/param

Files:

• multiparamload.cpp (modified) (3 diffs)
• multiparamload.h (modified) (2 diffs)
• param.cpp (modified) (3 diffs)
• param.h (modified) (1 diff)

cpp/frams/param/multiparamload.cpp

@@ -103 +103 @@
         else if (status==BeforeUnknown)
                 {
-                loadObjectNow(&emptyparam);
+                FMprintf("MultiParamLoader","go",FMLV_WARN,"Skipping object '%s'",(const char*)lastunknown);
+                loadObjectNow(&emptyparam,false);
                 continue;
                 }
@@ -141 +142 @@
                         break;
                         }
+                continue;
                 }
         buf=trim(buf);
@@ -236 +238 @@
 }
 
-int MultiParamLoader::loadObjectNow(const ExtObject& o)
+int MultiParamLoader::loadObjectNow(const ExtObject& o,bool warn_unknown_fields)
 {
 Param tmp_param;
 ParamInterface *pi=o.getParamInterface(tmp_param);
-pi->load(file);
+pi->load(file,warn_unknown_fields);
 status=AfterObject;
 return 0;

cpp/frams/param/multiparamload.h

@@ -12 +12 @@
 
 /** This is the general "framsticks-format" file parser for loading multiple objects.
-    The loader can be configured to recognize multiple object types from object headers
+        http://www.framsticks.com/common/formatspec.html
+        The loader can be configured to recognize multiple object types from object headers
     and automatically call ParamInterface::load for the matching class.
     
@@ -123 +124 @@
 const SString& getError() {return lasterror;}
 /** Can be used BeforeObject and BeforeUnknown */
-int loadObjectNow(ParamInterface *pi) {return loadObjectNow(ExtObject(pi));}
-int loadObjectNow(const ExtObject &o);
+int loadObjectNow(ParamInterface *pi,bool warn_unknown_fields=true) {return loadObjectNow(ExtObject(pi),warn_unknown_fields);}
+int loadObjectNow(const ExtObject &o,bool warn_unknown_fields=true);
 /** Can be used BeforeObject */
 int loadObjectNow() {return loadObjectNow(getObject());}
 /** Can be used BeforeObject and BeforeUnknown.
     Object data will not be loaded. */
-int skipObject() {return loadObjectNow(&emptyparam);}
+int skipObject() {return loadObjectNow(&emptyparam,false);}
 /** @return 1 if no errors */
 int run();

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

cpp/frams/param/param.h

@@ -158 +158 @@
         int save(VirtFILE*, const char* altname = NULL, bool force = 0);
         int saveprop(VirtFILE*, int i, const char* p, bool force = 0);
-        int load(VirtFILE*);///< @return the number of fields loaded
+        int load(VirtFILE*,bool warn_unknown_fields=true);///< @return the number of fields loaded
         int load2(const SString &, int &);///< @return the number of fields loaded