Changes the default behavior of IfcFile::Init to copy an existing string

Luke Brooks · Luke Brooks · commit c2e867e1c75a · 2017-08-10T12:27:41.000+01:00
instead of creating a new file descriptor.

Creating a method named `Dup` repeatedly fails with a "No member named
'Dup'" error. The implementation is commented out in case a maintained
knows or figures out how to get it working. Same for a `read` method on
the Python wrapper that utilises `Dup`.
diff --git a/src/ifcparse/.IfcFile.h.swp b/src/ifcparse/.IfcFile.h.swp
diff --git a/src/ifcparse/.IfcParse.cpp.swp b/src/ifcparse/.IfcParse.cpp.swp
diff --git a/src/ifcparse/IfcFile.h b/src/ifcparse/IfcFile.h
@@ -106,7 +106,7 @@ class IFC_PARSE_API IfcFile {
 	/// attributes as a flat list. NB: includes the root instance specified
 	/// in the first function argument.
 	IfcEntityList::ptr traverse(IfcUtil::IfcBaseClass* instance, int max_level=-1);
-
+    
 #ifdef USE_MMAP
 	bool Init(const std::string& fn, bool mmap=false);
 #else
@@ -115,6 +115,8 @@ class IFC_PARSE_API IfcFile {
 	bool Init(std::istream& fn, int len);
 	bool Init(void* data, int len);
 	bool Init(IfcParse::IfcSpfStream* f);
+	
+    //bool Dup(const std::string& data);
 
 	IfcEntityList::ptr getInverse(int instance_id, IfcSchema::Type::Enum type, int attribute_index);
 
@@ -142,4 +144,4 @@ class IFC_PARSE_API IfcFile {
 
 }
 
-#endif
+#endif
diff --git a/src/ifcparse/IfcParse.cpp b/src/ifcparse/IfcParse.cpp
@@ -108,6 +108,19 @@ void init_locale() {
 
 #endif
 
+IfcSpfStream::IfcSpfStream()
+	: stream(0)
+	, buffer(0)
+	, valid(false)
+	, eof(false)
+{
+    ptr   = 0;
+    len   = 0;
+    valid = false;
+    eof   = false;
+    size  = 0;
+}
+
 // 
 // Opens the file and gets the filesize
 //
@@ -208,6 +221,18 @@ IfcSpfStream::IfcSpfStream(void* data, int l)
 	len = l;
 }
 
+IfcSpfStream::IfcSpfStream(const std::string& data, unsigned int x)
+	: stream(0)
+	, buffer(0)
+{
+	eof = false;
+	size = (unsigned int) data.length();
+	buffer = data.c_str();
+	valid = true;
+	ptr = 0;
+	len = (unsigned int) data.length();
+}
+
 IfcSpfStream::~IfcSpfStream()
 {
 	Close();
@@ -1219,16 +1244,22 @@ void IfcEntityInstanceData::setArgument(unsigned int i, Argument* a, IfcUtil::Ar
 // Parses the IFC file in fn
 // Creates the maps
 //
+/*
+ * bool IfcFile::Dup(const std::string& data) {
+ *     return IfcFile::Init(new IfcSpfStream(data, (unsigned int) 0));
+ * }
+ */
+
 #ifdef USE_MMAP
 bool IfcFile::Init(const std::string& fn, bool mmap) {
 	return IfcFile::Init(new IfcSpfStream(fn, mmap));
 }
 #else
 bool IfcFile::Init(const std::string& fn) {
+    return IfcFile::Init(new IfcSpfStream(fn, (unsigned int) 0));
 	return IfcFile::Init(new IfcSpfStream(fn));
 }
 #endif
-
 bool IfcFile::Init(std::istream& f, int len) {
 	return IfcFile::Init(new IfcSpfStream(f,len));
 }
@@ -1237,6 +1268,7 @@ bool IfcFile::Init(void* data, int len) {
 	return IfcFile::Init(new IfcSpfStream(data,len));
 }
 
+
 bool IfcFile::Init(IfcParse::IfcSpfStream* s) {
 	// Initialize a "C" locale for locale-independent
 	// number parsing. See comment above on line 41.
diff --git a/src/ifcparse/IfcSpfStream.h b/src/ifcparse/IfcSpfStream.h
@@ -53,6 +53,7 @@ namespace IfcParse {
 		bool valid;
 		bool eof;
 		unsigned int size;
+		IfcSpfStream();
 #ifdef USE_MMAP
 		IfcSpfStream(const std::string& fn, bool mmap=false);
 #else
@@ -61,6 +62,7 @@ namespace IfcParse {
 		IfcSpfStream(std::istream& f, int len);
 		IfcSpfStream(void* data, int len);
 		~IfcSpfStream();
+		IfcSpfStream(const std::string& data, unsigned int x);
 		/// Returns the character at the cursor 
 		char Peek();
 		/// Returns the character at specified offset
diff --git a/src/ifcwrap/IfcParseWrapper.i b/src/ifcwrap/IfcParseWrapper.i
@@ -377,14 +377,21 @@ private:
 
 // The IfcFile* returned by open() is to be freed by SWIG/Python
 %newobject open;
+//%newobject read;
 
 %inline %{
-	IfcParse::IfcFile* open(const std::string& s) {
+	IfcParse::IfcFile* open(const std::string& fn) {
 		IfcParse::IfcFile* f = new IfcParse::IfcFile();
-		f->Init(s);
+		f->Init(fn);
 		return f;
 	}
-
+/*
+    IfcParse::IfcFile* read(const std::string& fn) {
+		IfcParse::IfcFile* f = new IfcParse::IfcFile();
+		f->Dup(fn);
+		return f;
+	}
+*/
 	const char* schema_identifier() {
 		return IfcSchema::Identifier;
 	}
@@ -410,4 +417,4 @@ private:
 		IfcSchema::Type::PopulateDerivedFields(data);
 		return IfcSchema::SchemaEntity(data);
 	}
-%}
+%}
