Changeset 413 for cpp/frams/param/multiparamload.cpp

Timestamp:

07/12/15 00:47:33 (10 years ago)

Author:

Maciej Komosinski

Message:

Print messages when unexpected lines are encountered in param/multiparam loaders

File:

• cpp/frams/param/multiparamload.cpp (modified) (6 diffs)

cpp/frams/param/multiparamload.cpp

@@ -94 +94 @@
 SString buf;
 if (status==OnError) return status;
+int unexpected_line = 0;
 while (!finished())
         {
@@ -103 +104 @@
                 if ((status!=Finished) && maybeBreak(AfterObject))
                         break;
+                unexpected_line = 0;
                 continue;
                 }
@@ -113 +115 @@
         if (!loadSStringLine(file,buf))
                 {
+                unexpected_line = 0;
                 if (!returnFromIncluded())
                         {
@@ -124 +127 @@
         if (buf[0]=='#')
                 {
+                unexpected_line = 0;
                 if (buf.startsWith("#include"))
                         {
@@ -150 +154 @@
                 }
         buf=trim(buf);
-        if ((buf.len()>1)&&(buf[buf.len()-1]==':'))
-                {
+        if (buf.len()==0)
+                unexpected_line = 0;
+        else if ((buf.len()>1)&&(buf[buf.len()-1]==':'))
+                {
+                unexpected_line = 0;
                 lastunknown=0;
                 lastunknown=buf.substr(0,buf.len()-1);
@@ -170 +177 @@
                                 }
                 
+                }
+        else
+                {
+                switch(unexpected_line)
+                        {
+                        case 0:
+                        {
+                        const char* thisfilename=file->VgetPath();
+                        logPrintf("MultiParamLoader","go", LOG_WARN, "Ignored unexpected line %d%s", 
+                                  linenum,
+                                  thisfilename ? SString::sprintf(" while reading '%s'",thisfilename).c_str():"");
+                        }
+                        break;
+
+                        case 1:
+                        logPrintf("MultiParamLoader","go", LOG_WARN, "The following line(s) were also unexpected and were ignored");
+                        break;
+                        }
+                unexpected_line++;
                 }
         }