bugfixes in parsers, filename in parse location was corrupted, had to introduce reference counts again

Author: svenwoop

common/lexers/stream.h

@@ -33,20 +33,20 @@ namespace embree
   {
   public:
     ParseLocation () : fileName(nullptr), lineNumber(-1), colNumber(-1), charNumber(-1) {}
-    ParseLocation (const char* fileName, ssize_t lineNumber, ssize_t colNumber, ssize_t charNumber)
+    ParseLocation (std::shared_ptr<std::string> fileName, ssize_t lineNumber, ssize_t colNumber, ssize_t charNumber)
       : fileName(fileName), lineNumber(lineNumber), colNumber(colNumber), charNumber(charNumber) {}
 
     std::string str() const
     {
       std::string str = "unknown";
-      if (fileName) str = fileName;
+      if (fileName) str = *fileName;
       if (lineNumber >= 0) str += " line " + toString(lineNumber);
       if (lineNumber >= 0 && colNumber >= 0) str += " character " + toString(colNumber);
       return str;
     }
 
   private:
-    const char* fileName;         /// name of the file (or stream) the token is from
+    std::shared_ptr<std::string> fileName;         /// name of the file (or stream) the token is from
     ssize_t lineNumber;           /// the line number the token is from
     ssize_t colNumber;            /// the character number in the current line
     ssize_t charNumber;           /// the character in the file
@@ -113,10 +113,10 @@ namespace embree
   {
   public:
     StdStream (std::istream& cin, const std::string& name = "std::stream")
-      : cin(cin), lineNumber(1), colNumber(0), charNumber(0), name(name) {}
+      : cin(cin), lineNumber(1), colNumber(0), charNumber(0), name(std::shared_ptr<std::string>(new std::string(name))) {}
     ~StdStream() {}
     ParseLocation location() {
-      return ParseLocation(name.c_str(),lineNumber,colNumber,charNumber);
+      return ParseLocation(name,lineNumber,colNumber,charNumber);
     }
     int next() {
       int c = cin.get();
@@ -129,7 +129,7 @@ namespace embree
     ssize_t lineNumber;           /// the line number the token is from
     ssize_t colNumber;            /// the character number in the current line
     ssize_t charNumber;           /// the character in the file
-    std::string name;             /// name of buffer
+    std::shared_ptr<std::string> name;             /// name of buffer
   };
 
   /*! creates a stream from a file */
@@ -138,10 +138,10 @@ namespace embree
   public:
 
     FileStream (FILE* file, const std::string& name = "file")
-      : file(file), lineNumber(1), colNumber(0), charNumber(0), name(name) {}
+      : file(file), lineNumber(1), colNumber(0), charNumber(0), name(std::shared_ptr<std::string>(new std::string(name))) {}
 
     FileStream (const FileName& fileName)
-      : lineNumber(1), colNumber(0), charNumber(0), name(fileName.str())
+      : lineNumber(1), colNumber(0), charNumber(0), name(std::shared_ptr<std::string>(new std::string(fileName.str())))
     {
       file = fopen(fileName.c_str(),"r");
       if (file == nullptr) THROW_RUNTIME_ERROR("cannot open file " + fileName.str());
@@ -150,7 +150,7 @@ namespace embree
 
   public:
     ParseLocation location() {
-      return ParseLocation(name.c_str(),lineNumber,colNumber,charNumber);
+      return ParseLocation(name,lineNumber,colNumber,charNumber);
     }
 
     int next() {
@@ -165,7 +165,7 @@ namespace embree
     ssize_t lineNumber;           /// the line number the token is from
     ssize_t colNumber;            /// the character number in the current line
     ssize_t charNumber;           /// the character in the file
-    std::string name;             /// name of buffer
+    std::shared_ptr<std::string> name;             /// name of buffer
   };
 
   /*! creates a stream from a string */
@@ -178,7 +178,7 @@ namespace embree
 
   public:
     ParseLocation location() {
-      return ParseLocation(nullptr,lineNumber,colNumber,charNumber);
+      return ParseLocation(std::shared_ptr<std::string>(),lineNumber,colNumber,charNumber);
     }
 
     int next() {
@@ -201,15 +201,15 @@ namespace embree
   {
   public:
     CommandLineStream (int argc, char** argv, const std::string& name = "command line")
-      : i(0), j(0), charNumber(0), name(name)
+      : i(0), j(0), charNumber(0), name(std::shared_ptr<std::string>(new std::string(name)))
     {
       if (argc > 0) charNumber = strlen(argv[0])+1;
       for (ssize_t k=1; k<argc; k++) args.push_back(argv[k]);
     }
     ~CommandLineStream() {}
   public:
     ParseLocation location() {
-      return ParseLocation(name.c_str(),0,charNumber,charNumber);
+      return ParseLocation(name,0,charNumber,charNumber);
     }
     int next() {
       if (i == args.size()) return EOF;
@@ -221,6 +221,6 @@ namespace embree
     size_t i,j;
     std::vector<std::string> args;
     ssize_t charNumber;           /// the character in the file
-    std::string name;             /// name of buffer
+    std::shared_ptr<std::string> name;             /// name of buffer
   };
 }