Changeset 413

Timestamp:

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

Author:

Maciej Komosinski

Message:

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

Location:

cpp/frams/param

Files:

• multiparamload.cpp (modified) (6 diffs)
• param.cpp (modified) (2 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++;
                 }
         }

cpp/frams/param/param.cpp

@@ -400 +400 @@
         bool loaded;
         int fields_loaded = 0;
+        int unexpected_line = 0;
         if ((i=findId("beforeLoad"))>=0)
                 call(i,NULL,NULL);
@@ -406 +407 @@
                 if (linenum) (*linenum)++;
                 const char* t = buf.c_str();
-                p0 = t; while ((*p0 == ' ') || (*p0 == '\t')) p0++;
+                p0 = t; while (isblank(*p0)) p0++;
                 if (!*p0) break;
-                if (p0[0] == '#') continue;
-                p = strchr(p0, ':'); if (!p) continue;
+                if (p0[0] == '#') { unexpected_line = 0; continue; }
+                p = strchr(p0, ':');
+                if (!p)
+                        {
+                        switch(unexpected_line)
+                                {
+                                case 0:
+                                        logPrintf("ParamInterface", "load", LOG_WARN, "Ignored unexpected line %s while reading object '%s'", 
+                                          linenum ?
+                                          SString::sprintf("%d",*linenum).c_str()
+                                        : SString::sprintf("'%s'", p0).c_str(),
+                                          getName());
+                                        break;
+                                case 1:
+                                        logPrintf("ParamInterface", "load", LOG_WARN, "The following line(s) were also unexpected and were ignored");
+                                        break;
+                                }
+                        unexpected_line++;
+                        continue;
+                        }
+                unexpected_line = 0;
                 p_len = (int)(p - p0);
                 loaded = false;