Changeset 18018 for trunk/Mars

Timestamp:

11/17/14 18:42:01 (10 years ago)

Author:

dneise

Message:

ticket:#11 MEnv, will now check if the last line ends with a \n ,and if not, it will throw an exception, print an explanation and stop fatally. This will hopefully make the user to add an empty line to the file and be happy.

Location:

trunk/Mars/mbase

Files:

• MEnv.cc (modified) (3 diffs)
• MEnv.h (modified) (1 diff)

trunk/Mars/mbase/MEnv.cc

@@ -51 +51 @@
 #include "MEnv.h"
 
+#include <fstream>
+#include <exception>
+
 #include <Gtypes.h>
 #include <TObjString.h>
@@ -97 +100 @@
 
     SetRcName(fname);
+    
+    if (!IsTEnvCompliant(name)){
+        throw "This file can't be correctly parsed by TEnv";
+        return;
+    }
 
     // No file found
@@ -189 +197 @@
 
     return 0;
+}
+
+//---------------------------------------------------------------------------
+//
+// Check if the input file is compatible to the way TEnv parses a resource file.
+// 
+// Returns true in case everything is file and
+//         false in case there is a problem with the file.
+//
+// Background:
+//      This check has been introduced as a workaround for a ROOT feature.
+//      TEnv will not see the last line in a text file, when this last line 
+//      does not end with a \n.
+//
+//      In addition we check for the occurence of \r, since some editors would
+//      place \r instead of \n (unlike windows that uses \n\r), which would
+//      also result in problems.
+//      FIXME: So currently we also complain about "\n\r" and "\r\n" as well as 
+//      "\r  \t   \n" or "\n      \t\t\t\r", which would in fact not be a problem at 
+//      all.
+Bool_t MEnv::IsTEnvCompliant(const char *fname)
+{
+    ifstream ifs(fname);
+    bool printable_char_since_last_lf = false;
+    char c;
+    while (ifs.good()){
+        ifs.get(c);
+
+        if (c==13){
+            gLog << err << "Menv::IsTEnvCompliant - file:" << fname 
+                << " contains \\r this might lead to parsing errors. "
+                <<"Please exchange \\r by \\n everywhere in that file." 
+                << endl;
+            return false;
+        }
+        if (c=='\n'){
+            printable_char_since_last_lf = false;
+        }
+        if (isgraph(c)){
+            printable_char_since_last_lf = true;
+        }
+    }
+    if (printable_char_since_last_lf){
+        gLog << err << "Menv::IsTEnvCompliant - file:" << fname 
+            << " must have \\n at the end of the file. "
+            <<"Please make sure this is the case." 
+            << endl;
+        return false;
+    }
+    return true;
 }
 

trunk/Mars/mbase/MEnv.h

@@ -27 +27 @@
     TString Compile(TString str, const char *post) const;
     Int_t   ReadInclude();
+    Bool_t  IsTEnvCompliant(const char *fname);
 
 public: