Changeset 393 for cpp/frams/param/param.h

Timestamp:

06/03/15 17:57:46 (10 years ago)

Author:

sz

Message:

f0 parsing corrections and enhancements:

• f0 genotype becomes invalid if any of its numeric fields can't be parsed
• ParamInterface::set and ParamInterface::load2 return the error flag if a numeric parsing error occured
• fixed a bug in load2 (was failing on quoted fields containing a comma)

File:

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

cpp/frams/param/param.h

@@ -50 +50 @@
 #define PSET_HITMAX     8
 
+#define PSET_NOPROPERTY 16
+
+#define PSET_PARSEFAILED        32
+
 // useful combination: need to get and display the value so that a user knows that the value they tried to set has been rejected or changed
-#define PSET_WARN (PSET_RONLY | PSET_HITMIN | PSET_HITMAX)
-
-#define PSET_NOPROPERTY 16
+#define PSET_WARN (PSET_RONLY | PSET_HITMIN | PSET_HITMAX | PSET_PARSEFAILED)
+
 
 struct ParamEntry;
@@ -162 +165 @@
         int saveprop(VirtFILE*, int i, const char* p, bool force = 0);
         int load(VirtFILE*, bool warn_unknown_fields = true, bool *abortable = NULL, int *linenum = NULL);///< @return the number of fields loaded
-        int load2(const SString &, int &);///< @return the number of fields loaded
+        int load2(const SString &, int &);///< @return the number of fields loaded (or'ed with LOAD2_PARSE_FAILED if a parsing error was detected)
 
         static const char* SERIALIZATION_PREFIX;
+        static const int LOAD2_PARSE_FAILED=(1<<30); ///< this bit is set in return value from load2 if a parse error was detected while loading. usage: if (load2(...) & LOAD2_PARSE_FAILED) ...
+        static const int LOAD2_IGNORE_PARSE_FAILED=(~LOAD2_PARSE_FAILED); ///< bitmask to be used if the parsing error is to be ignored. usage: int number_of_loaded_fields=load2(...) & LOAD2_IGNORE_PARSE_FAILED;
 
 #ifdef DEBUG