Changeset 1278 for cpp/frams

Timestamp:

09/09/23 15:22:45 (15 months ago)

Author:

Maciej Komosinski

Message:

When loading/parsing files, warn about unexpected characters after the multi-line string marker '~'

File:

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

cpp/frams/param/param.cpp

@@ -554 +554 @@
 }
 
+static SString getFileMessageFor(VirtFILE* f, ParamInterface::LoadOptions &options)
+{
+        SString fileinfo;
+        const char* fname = f->VgetPath();
+        if (fname != NULL)
+                {
+                fileinfo = SString::sprintf(" while reading from '%s'", fname);
+                if (options.linenum)
+                        fileinfo += SString::sprintf(" (line %d)", *options.linenum);
+                }
+        return fileinfo;
+}
+
 int ParamInterface::loadMultiLine(VirtFILE* f, LoadOptions &options)
 {
@@ -600 +613 @@
                         if (seen[i])
                         {
-                                SString fileinfo;
-                                const char* fname = f->VgetPath();
-                                if (fname != NULL)
-                                {
-                                        fileinfo = SString::sprintf(" while reading from '%s'", fname);
-                                        if (options.linenum)
-                                                fileinfo += SString::sprintf(" (line %d)", *options.linenum);
-                                }
+                                SString fileinfo = getFileMessageFor(f,options);
                                 logPrintf("ParamInterface", "load", LOG_WARN, "Multiple '%s.%s' properties found%s", getName(), id(i), fileinfo.c_str());
                         }
@@ -616 +622 @@
                                 if (p0[p_len + 1] == '~')
                                 {
+                                        if (p0[p_len+2])
+                                        {
+                                                SString fileinfo = getFileMessageFor(f,options);
+                                                logPrintf("ParamInterface", "load", LOG_WARN, "Ignored unexpected characters after '~': '%s' in '%s:'%s", p0+p_len+1, id(i), fileinfo.c_str());
+                                        }
+                                
                                         SString s;
                                         if (!readUntilTilde(f, s))