feat!: start on large rewrite

I didn't bother with cleaning it yet

Author: DexrnZacAttack

.clang-format

@@ -116,7 +116,7 @@ BreakFunctionDefinitionParameters: false
 BreakInheritanceList: BeforeColon
 BreakStringLiterals: true
 BreakTemplateDeclarations: MultiLine
-ColumnLimit: 80
+ColumnLimit: 150
 CommentPragmas: "^ IWYU pragma:"
 CompactNamespaces: false
 ConstructorInitializerIndentWidth: 4

CMakeLists.txt

@@ -15,16 +15,45 @@ if (NOT TARGET bio)
 endif ()
 
 set(FILES
-        include/JavaObject/JavaSerializedClassParser.h
-        src/JavaSerializedClassParser.cpp
-        include/JavaObject/EJavaTypeCode.h
-        include/JavaObject/EJavaFieldDescriptorType.h
+        include/JavaObject/EObjectTypeCode.h
+        include/JavaObject/EPrimitiveTypeCode.h
         src/stream/ObjectOutputStream.cpp
         include/JavaObject/stream/ObjectOutputStream.h
         src/stream/ObjectInputStream.cpp
         include/JavaObject/stream/ObjectInputStream.h
         src/io/Serializable.cpp
         include/JavaObject/io/Serializable.h
+        include/JavaObject/type/TypeCodeParser.cpp
+        include/JavaObject/type/TypeCodeParser.h
+        include/JavaObject/type/parser/IObjectParser.cpp
+        include/JavaObject/type/parser/IObjectParser.h
+        include/JavaObject/type/object/IObject.cpp
+        include/JavaObject/type/object/IObject.h
+        include/JavaObject/type/object/NullObject.h
+        include/JavaObject/type/parser/StringParser.cpp
+        include/JavaObject/type/parser/StringParser.h
+        include/JavaObject/type/object/StringObject.cpp
+        include/JavaObject/type/object/StringObject.h
+        include/JavaObject/type/parser/ObjectParser.cpp
+        include/JavaObject/type/parser/ObjectParser.h
+        include/JavaObject/type/object/Object.cpp
+        include/JavaObject/type/object/Object.h
+        include/JavaObject/type/parser/descriptor/ClassDescriptorParser.cpp
+        include/JavaObject/type/parser/descriptor/ClassDescriptorParser.h
+        include/JavaObject/type/object/descriptor/ClassDescriptorObject.cpp
+        include/JavaObject/type/object/descriptor/ClassDescriptorObject.h
+        include/JavaObject/type/parser/descriptor/ClassDescriptorInfoParser.cpp
+        include/JavaObject/type/parser/descriptor/ClassDescriptorInfoParser.h
+        include/JavaObject/type/parser/descriptor/FieldDescriptorParser.cpp
+        include/JavaObject/type/parser/descriptor/FieldDescriptorParser.h
+        include/JavaObject/type/object/descriptor/FieldDescriptorObject.cpp
+        include/JavaObject/type/object/descriptor/FieldDescriptorObject.h
+        include/JavaObject/type/object/descriptor/PrimitiveDescriptorObject.cpp
+        include/JavaObject/type/object/descriptor/PrimitiveDescriptorObject.h
+        include/JavaObject/type/parser/descriptor/PrimitiveDescriptorParser.cpp
+        include/JavaObject/type/parser/descriptor/PrimitiveDescriptorParser.h
+        include/JavaObject/util/SmartPointerCast.cpp
+        include/JavaObject/util/SmartPointerCast.h
 )
 
 add_library(JavaObjectStreams SHARED ${FILES})

include/JavaObject/EJavaTypeCode.h

@@ -0,0 +1,35 @@
+/** @file EJavaTypeCode.h
+ *
+ * @author DexrnZacAttack
+ * @date 3/23/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_EJAVATYPECODE_H
+#define JAVAOBJECTSTREAMS_EJAVATYPECODE_H
+
+enum class EObjectTypeCode : signed char {
+  TC_NULL = 0x70,
+  TC_REFERENCE = 0x71,
+  TC_CLASSDESC = 0x72,
+  TC_OBJECT = 0x73,
+  TC_STRING = 0x74,
+  TC_ARRAY = 0x75,
+  TC_CLASS = 0x76,
+  TC_BLOCKDATA = 0x77,
+  TC_ENDBLOCKDATA = 0x78,
+  TC_RESET = 0x79,
+  TC_BLOCKDATALONG = 0x7a,
+  TC_EXCEPTION = 0x7B,
+  TC_LONGSTRING = 0x7C,
+  TC_PROXYCLASSDESC = 0x7D,
+  TC_ENUM = 0x7E,
+
+  TC_BASE = TC_NULL, // lowest value
+  TC_MAX = TC_ENUM // highest value
+};
+
+#endif // JAVAOBJECTSTREAMS_EJAVATYPECODE_H

include/JavaObject/EObjectTypeCode.h

@@ -11,17 +11,17 @@
 #ifndef JAVAOBJECTSTREAMS_EJAVAFIELDDESCRIPTORTYPE_H
 #define JAVAOBJECTSTREAMS_EJAVAFIELDDESCRIPTORTYPE_H
 
-enum EJavaFieldDescriptorType : signed char {
-    TYPE_BYTE = 'B',
-    TYPE_CHARACTER = 'C',
-    TYPE_DOUBLE = 'D',
-    TYPE_FLOAT = 'F',
-    TYPE_INT = 'I',
-    TYPE_LONG = 'J',
-    TYPE_OBJECT = 'L',
-    TYPE_SHORT = 'S',
-    TYPE_BOOLEAN = 'Z',
-    TYPE_ARRAY = '['
+enum class EPrimitiveTypeCode : signed char {
+  TYPE_BYTE = 'B',
+  TYPE_CHARACTER = 'C',
+  TYPE_DOUBLE = 'D',
+  TYPE_FLOAT = 'F',
+  TYPE_INT = 'I',
+  TYPE_LONG = 'J',
+  TYPE_OBJECT = 'L',
+  TYPE_SHORT = 'S',
+  TYPE_BOOLEAN = 'Z',
+  TYPE_ARRAY = '['
 };
 
-#endif // JAVAOBJECTSTREAMS_EJAVAFIELDDESCRIPTORTYPE_H
+#endif // JAVAOBJECTSTREAMS_EJAVAFIELDDESCRIPTORTYPE_H

…de/JavaObject/EJavaFieldDescriptorType.h include/JavaObject/EPrimitiveTypeCode.hinclude/JavaObject/EJavaFieldDescriptorType.h renamed to include/JavaObject/EPrimitiveTypeCode.h include/JavaObject/EJavaFieldDescriptorType.h renamed to include/JavaObject/EPrimitiveTypeCode.h

@@ -10,18 +10,17 @@
  */
 #ifndef JAVAOBJECTSTREAMS_SERIALIZABLE_H
 #define JAVAOBJECTSTREAMS_SERIALIZABLE_H
-#include "JavaObject/JavaSerializedClassParser.h"
+// #include "JavaObject/JavaSerializedClassParser.h"
+//
+// namespace javaobject::io {
+//     class Serializable {
+//     public:
+//         virtual ~Serializable() = default;
+//
+//         virtual SerializedClass serializeObject() = 0;
+//         // todo deserialize func too I think?
+//         // or maybe we should be able to create a definition type (just types and names, no values) and pass that into deserializeObject with template to return correct class type
+//     };
+// }
 
-namespace javaobject::io {
-    class Serializable {
-    public:
-        virtual ~Serializable() = default;
-
-        virtual SerializedClass serializeObject() = 0;
-
-        // todo deserialize func too I think?
-        // or maybe we should be able to create a definition type (just types and names, no values) and pass that into deserializeObject with template to return correct class type
-    };
-}
-
-#endif // JAVAOBJECTSTREAMS_SERIALIZABLE_H
+#endif // JAVAOBJECTSTREAMS_SERIALIZABLE_H

include/JavaObject/JavaSerializedClassParser.h

@@ -10,7 +10,11 @@
  */
 #ifndef JAVAOBJECTSTREAMS_OBJECTINPUTSTREAM_H
 #define JAVAOBJECTSTREAMS_OBJECTINPUTSTREAM_H
+#include "JavaObject/type/TypeCodeParser.h"
+#include "JavaObject/type/object/IObject.h"
+
 #include <iostream>
+#include <memory>
 
 // TODO
 
@@ -19,10 +23,12 @@ namespace javaobject::stream {
     public:
         explicit ObjectInputStream(std::istream &input);
 
-        //todo
-        // ObjectInputStream &operator>>(? value);
+        std::unique_ptr<type::object::IObject> readObject();
     private:
         std::istream &m_input;
+        bio::stream::BinaryInputStream m_stream;
+
+        type::TypeCodeParser m_parser;
     };
 
     //some people might prefer STL naming scheme for this, so why not:

include/JavaObject/io/Serializable.h

@@ -0,0 +1,50 @@
+/** @file TypeCode.cpp
+ *
+ * @author DexrnZacAttack
+ * @date 3/24/26
+ *
+ * @device zPc-i2
+ */
+#include "TypeCodeParser.h"
+
+#include "JavaObject/type/object/NullObject.h"
+#include "JavaObject/type/parser/ObjectParser.h"
+#include "JavaObject/type/parser/StringParser.h"
+#include "JavaObject/type/parser/descriptor/ClassDescriptorParser.h"
+
+#include <istream>
+
+namespace javaobject {
+    namespace type {
+        TypeCodeParser::TypeCodeParser(std::istream &input) : m_input(input) {
+            this->m_parsers[EObjectTypeCode::TC_STRING] = std::make_unique<parser::StringParser>();
+            this->m_parsers[EObjectTypeCode::TC_OBJECT] = std::make_unique<parser::ObjectParser>();
+            this->m_parsers[EObjectTypeCode::TC_CLASSDESC] = std::make_unique<parser::descriptor::ClassDescriptorParser>();
+        }
+
+        std::unique_ptr<object::IObject> TypeCodeParser::readNext() {
+            const EObjectTypeCode tc = static_cast<EObjectTypeCode>(this->m_input.readByte());
+
+            const auto it = m_parsers.find(tc);
+            if (it != this->m_parsers.end()) {
+                return (*it->second)(*this);
+            }
+
+            return std::make_unique<object::NullObject>();
+        }
+
+        parser::IObjectParser *
+        TypeCodeParser::getParser(const EObjectTypeCode typeCode) {
+            const auto it = m_parsers.find(typeCode);
+            if (it != this->m_parsers.end()) {
+                return it->second.get();
+            }
+
+            return nullptr;
+        }
+
+        bio::stream::BinaryInputStream &TypeCodeParser::stream() {
+            return this->m_input;
+        }
+    } // namespace type
+} // namespace javaobject