feat: array parsing, nested array parsing!!!!

Author: DexrnZacAttack

.gitignore

@@ -39,3 +39,5 @@
 
 # debug information files
 *.dwo
+/.idea
+/tests/java/.idea

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION VERSION 3.30)
-project(JavaObjectStreams VERSION 1.3.1)
+project(JavaObjectStreams VERSION 1.3.2)
 
 set(CMAKE_CXX_STANDARD 20)
 
@@ -133,6 +133,11 @@ set(FILES
         src/type/object/types/NullObject.cpp
         src/type/object/parsers/NullObjectParser.cpp
         include/JavaObject/type/object/parsers/NullObjectParser.h
+        src/type/object/types/ArrayObject.cpp
+        include/JavaObject/type/object/types/ArrayObject.h
+        include/JavaObject/type/object/types/descriptor/NewClassDescriptorObject.h
+        src/type/object/parsers/ArrayObjectParser.cpp
+        include/JavaObject/type/object/parsers/ArrayObjectParser.h
 )
 
 add_library(JavaObjectStreams SHARED ${FILES})

include/JavaObject/stream/ObjectInputStream.h

@@ -24,6 +24,8 @@ namespace javaobject::stream {
         explicit ObjectInputStream(std::istream &input);
 
         std::shared_ptr<type::object::IObject> readObject();
+
+        ObjectInputStream &operator>>(std::shared_ptr<type::object::IObject> &object);
     private:
         type::HandleContainer m_handleContainer;
 

include/JavaObject/type/object/parsers/ArrayObjectParser.h

@@ -0,0 +1,22 @@
+/** @file ArrayObjectParser.h
+ *
+ * @author Dexrn ZacAttack
+ * @date 3/25/26
+ *
+ * @device zPc-i2
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the MIT license, see the LICENSE file for details.
+ */
+#ifndef JAVAOBJECTSTREAMS_ARRAYOBJECTPARSER_H
+#define JAVAOBJECTSTREAMS_ARRAYOBJECTPARSER_H
+#include "JavaObject/type/object/parsers/IObjectParser.h"
+
+namespace javaobject::type::object::parsers {
+    // the c lion does not concern itself with compiler errors
+    struct ArrayObjectParser : IObjectParser {
+        std::shared_ptr<object::IObject> operator()(type::object::ObjectTypeCodeParser &parser) const override;
+    };
+} // namespace javaobject::type::object::parsers
+
+#endif // JAVAOBJECTSTREAMS_ARRAYOBJECTPARSER_H

include/JavaObject/type/object/types/ArrayObject.h

@@ -0,0 +1,36 @@
+/** @file ArrayObject.h
+ *
+ * @author Dexrn ZacAttack
+ * @date 3/25/26
+ *
+ * @device zPc-i2
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the MIT license, see the LICENSE file for details.
+ */
+#ifndef JAVAOBJECTSTREAMS_ARRAYOBJECT_H
+#define JAVAOBJECTSTREAMS_ARRAYOBJECT_H
+#include "BinaryIO/container/FixedArray.h"
+#include "JavaObject/type/object/types/IObject.h"
+#include "JavaObject/type/object/types/descriptor/NewClassDescriptorObject.h"
+#include "JavaObject/type/primitive/types/IPrimitiveObject.h"
+
+#include <memory>
+#include <vector>
+
+namespace javaobject::type::object::types {
+    struct ArrayObject : IObject {
+        ArrayObject(const std::shared_ptr<descriptor::NewClassDescriptorObject> &typeDescriptor, const std::vector<std::shared_ptr<primitive::types::IPrimitiveObject>> &values)
+            : typeDescriptor(typeDescriptor), values(values) {}
+
+        explicit ArrayObject(const std::shared_ptr<descriptor::NewClassDescriptorObject> &typeDescriptor)
+            : typeDescriptor(typeDescriptor) {}
+
+        std::string toString() override;
+
+        std::shared_ptr<descriptor::NewClassDescriptorObject> typeDescriptor;
+        std::vector<std::shared_ptr<primitive::types::IPrimitiveObject>> values;
+    };
+} // namespace javaobject::type::object::types
+
+#endif // JAVAOBJECTSTREAMS_ARRAYOBJECT_H

src/type/object/ObjectTypeCodeParser.cpp

@@ -7,6 +7,8 @@
  */
 #include "JavaObject/type/object/ObjectTypeCodeParser.h"
 
+#include "JavaObject/type/object/parsers/ArrayObjectParser.h"
+
 #include <cassert>
 #include <format>
 
@@ -35,6 +37,7 @@ namespace javaobject::type::object {
         this->m_parsers[EObjectTypeCode::TC_BLOCKDATA] = std::make_unique<object::parsers::ShortBlockDataObjectParser>();
         this->m_parsers[EObjectTypeCode::TC_BLOCKDATALONG] = std::make_unique<object::parsers::LongBlockDataObjectParser>();
         this->m_parsers[EObjectTypeCode::TC_NULL] = std::make_unique<parsers::NullObjectParser>();
+        this->m_parsers[EObjectTypeCode::TC_ARRAY] = std::make_unique<parsers::ArrayObjectParser>();
     }
 
     std::shared_ptr<object::IObject> ObjectTypeCodeParser::readNext() {

src/type/object/parsers/ArrayObjectParser.cpp

@@ -0,0 +1,40 @@
+/** @file ArrayObjectParser.cpp
+ *
+ * @author Dexrn ZacAttack
+ * @date 3/25/26
+ *
+ * @device zPc-i2
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the MIT license, see the LICENSE file for details.
+ */
+#include "JavaObject/type/object/parsers/ArrayObjectParser.h"
+
+#include "JavaObject/type/object/types/ArrayObject.h"
+
+#include "JavaObject/type/object/ObjectTypeCodeParser.h"
+#include "JavaObject/type/primitive/PrimitiveTypeCodeParser.h"
+
+namespace javaobject::type::object::parsers {
+    std::shared_ptr<object::IObject> ArrayObjectParser::operator()(type::object::ObjectTypeCodeParser &parser) const {
+        auto dc = std::dynamic_pointer_cast<descriptor::NewClassDescriptorObject>(parser.readNext());
+
+        if (!dc) {
+            throw std::runtime_error("Array type descriptor is TC_NULL!!!!!");
+        }
+
+        auto obj = std::make_shared<types::ArrayObject>(dc);
+        parser.handleContainer().registerHandle(obj);
+
+        const int32_t size = parser.stream().readBE<int32_t>();
+        obj->values.resize(size);
+
+        const auto primitiveParser = parser.parserStorage().primitiveParser;
+        const auto parserClass = primitiveParser->getParser(static_cast<EPrimitiveTypeCode>(dc->name.at(1)));
+        for (int32_t i = 0; i < size; i++) {
+            obj->values[i] = primitiveParser->readUsingParser(*parserClass);
+        }
+
+        return obj;
+    }
+} // namespace javaobject::type::object::parsers

src/type/object/types/ArrayObject.cpp

@@ -0,0 +1,19 @@
+/** @file ArrayObject.cpp
+ *
+ * @author Dexrn ZacAttack
+ * @date 3/25/26
+ *
+ * @device zPc-i2
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the MIT license, see the LICENSE file for details.
+ */
+#include "JavaObject/type/object/types/ArrayObject.h"
+
+#include <format>
+
+namespace javaobject::type::object::types {
+    std::string ArrayObject::toString() {
+        return std::format("Array(type={}, size={})", typeDescriptor->toString(), this->values.size());
+    }
+} // namespace javaobject::type::object::types

src/type/primitive/PrimitiveTypeCodeParser.cpp

@@ -11,6 +11,7 @@
 #include "JavaObject/type/primitive/PrimitiveTypeCodeParser.h"
 
 #include "JavaObject/type/object/ObjectTypeCodeParser.h"
+#include "JavaObject/type/primitive/parsers/PrimitiveArrayObjectParser.h"
 #include "JavaObject/type/primitive/parsers/PrimitiveBooleanObjectParser.h"
 #include "JavaObject/type/primitive/parsers/PrimitiveByteObjectParser.h"
 #include "JavaObject/type/primitive/parsers/PrimitiveCharObjectParser.h"
@@ -32,7 +33,7 @@ namespace javaobject::type::primitive {
         this->m_parsers[EPrimitiveTypeCode::TYPE_INT] = std::make_unique<parsers::PrimitiveIntegerObjectParser>();
         this->m_parsers[EPrimitiveTypeCode::TYPE_LONG] = std::make_unique<parsers::PrimitiveLongObjectParser>();
         this->m_parsers[EPrimitiveTypeCode::TYPE_SHORT] = std::make_unique<parsers::PrimitiveShortObjectParser>();
-        // this->m_parsers[EPrimitiveTypeCode::TYPE_ARRAY] = std::make_unique<parsers::PrimitiveByteObjectParser>();
+        this->m_parsers[EPrimitiveTypeCode::TYPE_ARRAY] = std::make_unique<parsers::PrimitiveArrayObjectParser>();
         this->m_parsers[EPrimitiveTypeCode::TYPE_OBJECT] = std::make_unique<parsers::PrimitiveJavaObjectParser>();
     }
 

src/type/primitive/parsers/PrimitiveArrayObjectParser.cpp

@@ -1,20 +1,22 @@
 /** @file PrimitiveArrayObjectParser.cpp
-*
-* @author Zero_DSRS_VX
-* @date 3/25/26
-*
-* @device mac-8
-*
-* @copyright Copyright (c) 2026 Team Lodestone
-* @license This project is licensed under the LGPL 3.0 license, see the LICENSE file for details.
-*/
-#include "../../../../include/JavaObject/type/primitive/parsers/PrimitiveArrayObjectParser.h"
+ *
+ * @author Zero_DSRS_VX
+ * @date 3/25/26
+ *
+ * @device mac-8
+ *
+ * @copyright Copyright (c) 2026 Team Lodestone
+ * @license This project is licensed under the LGPL 3.0 license, see the LICENSE file for details.
+ */
+#include "JavaObject/type/primitive/parsers/PrimitiveArrayObjectParser.h"
 
-namespace javaobject {
-    namespace type {
-        namespace primitive {
-            namespace parsers {
-            } // parsers
-        } // primitive
-    } // type
-} // javaobject
+#include "JavaObject/type/object/ObjectTypeCodeParser.h"
+#include "JavaObject/type/primitive/PrimitiveTypeCodeParser.h"
+#include "JavaObject/type/primitive/types/PrimitiveArrayObject.h"
+#include "JavaObject/type/primitive/types/PrimitiveJavaObject.h"
+
+namespace javaobject::type::primitive::parsers {
+    std::shared_ptr<types::IPrimitiveObject> PrimitiveArrayObjectParser::operator()(PrimitiveTypeCodeParser &parser) const {
+        return std::make_shared<types::PrimitiveJavaObject>(parser.parserStorage().objectParser->readNext());
+    }
+} // namespace javaobject::type::primitive::parsers