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

Timestamp:

01/14/18 11:24:22 (7 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.cpp (modified) (14 diffs)

cpp/frams/param/param.cpp

@@ -10 +10 @@
 #include "common/log.h"
 #include <frams/util/sstringutils.h>
+#include <common/virtfile/stringfile.h>
 
 //#define SAVE_ALL_NAMES
@@ -356 +357 @@
 }
 
-void SimpleAbstractParam::save2(SString& f, void *defdata, bool addcr, bool all_names)
+void SimpleAbstractParam::saveSingleLine(SString& f, void *defdata, bool addcr, bool all_names)
 { // defdata!=NULL -> does not save default values
         const char *p;
@@ -421 +422 @@
 }
 
-int ParamInterface::load(VirtFILE* f, bool warn_unknown_fields, bool *abortable, int *linenum)
+int ParamInterface::load(FileFormat format, VirtFILE* f, LoadOptions *options)
+{
+        LoadOptions default_options;
+        if (options == NULL)
+                options = &default_options;
+        switch (format)
+        {
+        case FormatMultiLine:
+                return loadMultiLine(f, *options);
+
+        case FormatSingleLine:
+        {
+                StringFILE *sf = dynamic_cast<StringFILE*>(f);
+                SString s;
+                if (sf)
+                {
+                        s = sf->getString().c_str();
+                        options->offset += sf->Vtell();
+                }
+                else
+                {
+                        if (!loadSStringLine(f, s))
+                                return -1;
+                }
+                return loadSingleLine(s, *options);
+        }
+        }
+        return -1;
+}
+
+int ParamInterface::load(FileFormat format, const SString &s, LoadOptions *options)
+{
+        LoadOptions default_options;
+        if (options == NULL)
+                options = &default_options;
+        switch (format)
+        {
+        case FormatMultiLine:
+        {
+                string std_string(s.c_str());
+                StringFILE f(std_string);
+                return loadMultiLine(&f, *options);
+        }
+
+        case FormatSingleLine:
+                return loadSingleLine(s, *options);
+        }
+        return -1;
+}
+
+int ParamInterface::loadMultiLine(VirtFILE* f, LoadOptions &options)
 {
         SString buf;
@@ -434 +485 @@
         if ((i = findId("beforeLoad")) >= 0)
                 call(i, NULL, NULL);
-        while (((!abortable) || (!*abortable)) && loadSStringLine(f, buf))
-        {
-                if (linenum) (*linenum)++;
+        while (((!options.abortable) || (!*options.abortable)) && loadSStringLine(f, buf))
+        {
+                if (options.linenum) (*options.linenum)++;
                 const char* t = buf.c_str();
                 p0 = t; while (isblank(*p0)) p0++;
@@ -448 +499 @@
                         case 0:
                                 logPrintf("ParamInterface", "load", LOG_WARN, "Ignored unexpected line %s while reading object '%s'",
-                                        linenum ?
-                                        SString::sprintf("%d", *linenum).c_str()
+                                        options.linenum ?
+                                        SString::sprintf("%d", *options.linenum).c_str()
                                         : SString::sprintf("'%s'", p0).c_str(),
                                         getName());
@@ -472 +523 @@
                                 {
                                         fileinfo = SString::sprintf(" while reading from '%s'", fname);
-                                        if (linenum)
-                                                fileinfo += SString::sprintf(" (line %d)", *linenum);
+                                        if (options.linenum)
+                                                fileinfo += SString::sprintf(" (line %d)", *options.linenum);
                                 }
                                 logPrintf("ParamInterface", "load", LOG_WARN, "Multiple '%s.%s' fields found%s", getName(), id(i), fileinfo.c_str());
@@ -496 +547 @@
                                         int ch; while ((ch = f->Vgetc()) != EOF) if (ch == '\n') break;
                                         unquoteTilde(s);
-                                        if (linenum && (flags(i)&PARAM_LINECOMMENT))
-                                                s = SString::sprintf("@file %s\n@line %d\n", f->VgetPath(), *linenum + 1) + s;
+                                        if (options.linenum && (flags(i)&PARAM_LINECOMMENT))
+                                                s = SString::sprintf("@file %s\n@line %d\n", f->VgetPath(), *options.linenum + 1) + s;
                                         set(i, s.c_str());
-                                        if (linenum)
-                                                (*linenum) += lfcount;
+                                        if (options.linenum)
+                                                (*options.linenum) += lfcount;
                                 }
                                 else
@@ -510 +561 @@
                         }
                 }
-                else if (warn_unknown_fields)
+                else if (options.warn_unknown_fields)
                 {
                         SString name(p0, p_len);
@@ -521 +572 @@
                         if (!readUntilTilde(f, s))
                                 closingTildeError(this, f, -1);
-                        if (linenum)
+                        if (options.linenum)
                         {
                                 const char* tmp = s.c_str();
@@ -530 +581 @@
                                         lfcount++; tmp++;
                                         }
-                                (*linenum) += lfcount;
+                                (*options.linenum) += lfcount;
                         }
                         int ch; while ((ch = f->Vgetc()) != EOF) if (ch == '\n') break;
@@ -705 +756 @@
 {
         const char *t;
-        if (((*(t = type(i))) == 'd') && (strchr(t, '~')!=NULL)) //type is int and contains enum labels
+        if (((*(t = type(i))) == 'd') && (strchr(t, '~') != NULL)) //type is int and contains enum labels
         {
                 paInt mn, mx, def;
@@ -1131 +1182 @@
 }
 
-int ParamInterface::load2(const SString &s, int &poz)
+int ParamInterface::loadSingleLine(const SString &s, LoadOptions &options)
 {
         int i; // the index number of the parameter
@@ -1145 +1196 @@
         SString tmpvalue;
         bool parse_failed = false;
-        if (poz >= s.len()) return fields_loaded;
-        t = s.c_str() + poz;
-
-        lin = getline(s, poz, len); // all fields must be encoded in a single line
+        if (options.offset >= s.len()) return fields_loaded;
+        t = s.c_str() + options.offset;
+
+        lin = getline(s, options.offset, len); // all fields must be encoded in a single line
         if (!len) return fields_loaded; // empty line = end
         i = 0;
@@ -1241 +1292 @@
 #endif
         }
-        return fields_loaded | (parse_failed ? LOAD2_PARSE_FAILED : 0);
+        if (parse_failed) options.parse_failed = true;
+        return fields_loaded;
 }