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

Timestamp:

01/14/18 11:24:22 (5 years ago)

Author:

Maciej Komosinski

Message:

Param::save2() renamed to saveSingleLine(); unified Param::load() so that it gets a single-line/multi-line format selector

File:

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

cpp/frams/param/param.h

@@ -28 +28 @@
 #define PARAM_NOSTATIC  256     //< (FramScript) don't access this member in a static object (ClassName.field)
 #define PARAM_CONST     512     //< (FramScript) constant value
-#define PARAM_CANOMITNAME 1024  //< affects Param::save2()/load2() - for example one-liners in f0 genetic encoding
+#define PARAM_CANOMITNAME 1024  //< affects Param::saveSingleLine()/loadSingleLine() - for example one-liners in f0 genetic encoding
 #define PARAM_DONTLOAD    2048  //< Param::load() skips this field
 #define PARAM_NOISOLATION 4096  //< don't use proxy object in master/slave interactions
@@ -170 +170 @@
         void quickCopyFrom(ParamInterface *src);
 
+        enum FileFormat { FormatMultiLine, FormatSingleLine }; // FormatJSON in the future?
+        struct LoadOptions {
+                bool warn_unknown_fields; bool *abortable; int *linenum; int offset; bool parse_failed;
+                LoadOptions() : warn_unknown_fields(false), abortable(NULL), linenum(NULL), offset(0), parse_failed(false) {}
+        };
+
         int save(VirtFILE*, const char* altname = NULL, bool force = 0);
         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 (or'ed with LOAD2_PARSE_FAILED if a parsing error was detected)
+
+        int load(FileFormat format, VirtFILE*, LoadOptions *load_options = NULL);///< @return the number of fields loaded
+        int load(FileFormat format, const SString &, LoadOptions *load_options = NULL);///< @return the number of fields loaded
+protected:
+        int loadMultiLine(VirtFILE*, LoadOptions &options);///< @return the number of fields loaded
+        int loadSingleLine(const SString &, LoadOptions &options);///< @return the number of fields loaded
+public:
 
         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;
 
         static bool isValidTypeDescription(const char* t);
@@ -299 +308 @@
 
         int isequal(int i, void* defdata);
-        void save2(SString&, void *defdata, bool addcr = true, bool all_names = true);
+        void saveSingleLine(SString&, void *defdata, bool addcr = true, bool all_names = true);
 
         virtual void setDefault();