Merge branch 'framework'

Conflicts:
	.gitignore

1 files changed, 35 insertions, 0 deletions

diff --git a/Source/Library/Common/StringStream.class.h b/Source/Library/Common/StringStream.class.h
new file mode 100644
index 0000000..814b539
--- /dev/null
+++ b/Source/Library/Common/StringStream.class.h
@@ -0,0 +1,35 @@
+#ifndef DEF_STRINGSTREAM_CLASS_H
+#define DEF_STRINGSTREAM_CLASS_H
+
+#include <IStream.proto.h>
+#include <OStream.proto.h>
+
+class StringIStream : public IStream {
+	private:
+	SimpleList<String> *m_elements;
+
+	String read();
+
+	public:
+	StringIStream(const String &e);
+	StringIStream();
+	~StringIStream();
+
+	void append(const String &e);
+};
+
+class StringOStream : public OStream {
+	private:
+	String m_str;
+
+	void write(const String& s) { m_str += s; }
+
+	public:
+	
+	const String &str() const { return m_str; }
+	void clear() { m_str = ""; }
+};
+
+
+#endif
+