Implement stream_reader

4 files changed, 81 insertions, 4 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d30f8a820c..39de6c6715 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,9 @@ add_library(nbt++ STATIC
     src/tag_primitive.cpp
     src/tag_string.cpp
     src/value.cpp
-    src/value_initializer.cpp)
+    src/value_initializer.cpp
+    
+    src/io/stream_reader.cpp)
 
 enable_testing()
 add_subdirectory(test)
diff --git a/include/io/stream_reader.h b/include/io/stream_reader.h
index ab07f83ad9..5d10e021ed 100644
--- a/include/io/stream_reader.h
+++ b/include/io/stream_reader.h
@@ -65,8 +65,7 @@ public:
 
     /**
      * @brief Reads a binary number from the stream
-     *
-     * Does not check if the reading actually succeeds
+     * @throw input_error on failure
      */
     template<class T>
     void read_num(T& x);
@@ -85,6 +84,12 @@ private:
     const endian::endian endian;
 };
 
+template<class T>
+void stream_reader::read_num(T& x)
+{
+    endian::read(is, x, endian);
+}
+
 }
 }
 
diff --git a/src/io/stream_reader.cpp b/src/io/stream_reader.cpp
new file mode 100644
index 0000000000..7605d62776
--- /dev/null
+++ b/src/io/stream_reader.cpp
@@ -0,0 +1,70 @@
+/*
+ * libnbt++ - A library for the Minecraft Named Binary Tag format.
+ * Copyright (C) 2013, 2015  ljfa-ag
+ *
+ * This file is part of libnbt++.
+ *
+ * libnbt++ is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * libnbt++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with libnbt++.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "io/stream_reader.h"
+#include <istream>
+
+namespace nbt
+{
+namespace io
+{
+
+stream_reader::stream_reader(std::istream& is, endian::endian e) noexcept:
+    is(is), endian(e)
+{}
+
+std::istream& stream_reader::get_istr() const
+{
+    return is;
+}
+
+endian::endian stream_reader::get_endian() const
+{
+    return endian;
+}
+
+tag_type stream_reader::read_type(bool allow_end)
+{
+    int type = is.get();
+    if(!is)
+        throw input_error("Error reading tag type");
+    if(!is_valid_type(type, allow_end))
+    {
+        is.setstate(std::ios::failbit);
+        throw input_error("Invalid tag type: " + std::to_string(type));
+    }
+    return static_cast<tag_type>(type);
+}
+
+std::string stream_reader::read_string()
+{
+    uint16_t len;
+    read_num(len);
+    if(!is)
+        throw input_error("Error reading string");
+
+    std::string ret(len, '\0');
+    is.read(&ret[0], len); //C++11 allows us to do this
+    if(!is)
+        throw input_error("Error reading string");
+    return ret;
+}
+
+}
+}
diff --git a/test/io/read_test.cpp b/test/io/read_test.cpp
index aaed5e4471..2b37846f2f 100644
--- a/test/io/read_test.cpp
+++ b/test/io/read_test.cpp
@@ -65,7 +65,7 @@ void test_stream_reader_big()
 
     //Test for unexpcted EOF on numbers (input too short for int32_t)
     is.str("\x03\x04");
-    EXPECT_EXCEPTION(reader.read_num(i), io::stream_reader::input_error);
+    reader.read_num(i);
     ASSERT(!is);
 }