parse

CMakeLists.txt

@@ -45,6 +45,10 @@ else()
     set(PARSE_FILES "")
 endif()
 
+if(EXISTS libraries/parallel-hashmap)
+    include_directories(libraries/parallel-hashmap)
+endif()
+
 #include zlib if the user has it.
 find_package(ZLIB QUIET)
 
@@ -69,6 +73,10 @@ target_include_directories(BLT PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/config/)
 if(${ZLIB_FOUND})
      target_link_libraries(BLT PUBLIC ZLIB::ZLIB)
 endif()
+if(EXISTS ${CMAKE_SOURCE_DIR}/libraries/parallel-hashmap)
+    message("Including phmap")
+    target_include_directories(BLT PUBLIC libraries/parallel-hashmap)
+endif()
 
 if(MSVC)
     #target_compile_options(BLT PRIVATE /W4)

include/blt/nbt/nbt.h

@@ -17,13 +17,30 @@
 #include "blt/std/filesystem.h"
 #include "blt/std/logging.h"
 
-namespace blt::nbt {
 #ifndef HASHMAP
-    #define HASHMAP HASHMAP
+    #if defined __has_include && __has_include(<parallel_hashmap/phmap.h>)
-    template<typename K, typename V>
+        #define HASHMAP HASHMAP
-    using HASHMAP = std::unordered_map<K, V>;
+        #include <parallel_hashmap/phmap.h>
+        #include <parallel_hashmap/phmap_fwd_decl.h>
+        template<typename K, typename V>
+        using HASHMAP = phmap::flat_hash_map<K, V>();
+        template<typename K>
+        using HASHSET = phmap::flat_hash_set<K>();
+    #else
+        #define HASHMAP HASHMAP
+        #include <unordered_map>
+        #include <set>
+    
+        template<typename K, typename V>
+        using HASHMAP = std::unordered_map<K, V>();
+    
+        template<typename K>
+        using HASHSET = std::unordered_set<K>();
+    #endif
 #endif
 
+namespace blt::nbt {
+    
     void writeUTF8String(blt::fs::block_writer& stream, const std::string& str);
     
     std::string readUTF8String(blt::fs::block_reader& stream);

include/blt/parse/argparse.h

@@ -11,27 +11,44 @@
 #include <string>
 #include <initializer_list>
 #include <optional>
-#include <unordered_map>
+
+#ifndef HASHMAP
+    #if defined __has_include && __has_include(<parallel_hashmap/phmap.h>)
+        #define HASHMAP HASHMAP
+        
+        #include <parallel_hashmap/phmap.h>
+        #include <parallel_hashmap/phmap_fwd_decl.h>
+
+template<typename K, typename V>
+using HASHMAP = phmap::flat_hash_map<K, V>();
+template<typename K>
+using HASHSET = phmap::flat_hash_set<K>();
+    #else
+        #define HASHMAP HASHMAP
+        #include <unordered_map>
+        #include <set>
+
+template<typename K, typename V>
+using HASHMAP = std::unordered_map<K, V>();
+
+template<typename K>
+using HASHSET = std::unordered_set<K>();
+    #endif
+#endif
 
 namespace blt::parser {
     
-#ifndef HASHMAP
-    #define HASHMAP HASHMAP
-    template<typename K, typename V>
-    using HASHMAP = std::unordered_map<K, V>();
-#endif
-
     enum class arg_action {
-            STORE,
+        STORE,
-            STORE_CONST,
+        STORE_CONST,
-            STORE_TRUE,
+        STORE_TRUE,
-            STORE_FALSE,
+        STORE_FALSE,
-            APPEND,
+        APPEND,
-            APPEND_CONST,
+        APPEND_CONST,
-            COUNT,
+        COUNT,
-            HELP,
+        HELP,
-            VERSION,
+        VERSION,
-            EXTEND
+        EXTEND
     };
     
     class arg_t {
@@ -47,22 +64,31 @@ namespace blt::parser {
             std::vector<std::string> flags;
             
             void insertAndSort(const std::string& str);
+        
         public:
             arg_vector() = default;
-            arg_vector(std::vector<std::string> args);
+            
+            arg_vector(const std::vector<std::string>& args);
+            
             arg_vector(std::initializer_list<std::string> args);
+            
             arg_vector(const std::string& arg);
+            
             arg_vector(const char* arg);
             
             arg_vector& operator=(const std::string& arg);
+            
             arg_vector& operator=(const char* arg);
+            
             arg_vector& operator=(std::initializer_list<std::string>& args);
+            
             arg_vector& operator=(std::vector<std::string>& args);
             
-            [[nodiscard]] inline std::vector<std::string>& getNames(){
+            [[nodiscard]] inline std::vector<std::string>& getNames() {
                 return names;
             }
-            [[nodiscard]] inline std::vector<std::string>& getFlags(){
+            
+            [[nodiscard]] inline std::vector<std::string>& getFlags() {
                 return flags;
             }
     };
@@ -74,20 +100,30 @@ namespace blt::parser {
             static constexpr int ALL_REQUIRED = 0x4;
             int args = 0;
             int flags = 0;
+            
             void decode(char c);
+        
         public:
             arg_nargs() = default;
+            
             arg_nargs(int args): args(args) {}
+            
             arg_nargs(char c);
+            
             arg_nargs(std::string s);
+            
             arg_nargs(const char* s);
+            
             arg_nargs& operator=(const std::string& s);
+            
             arg_nargs& operator=(const char* s);
+            
             arg_nargs& operator=(char c);
+            
             arg_nargs& operator=(int args);
     };
     
-    struct args_properties {
+    struct arg_properties {
         private:
         public:
             arg_vector a_flags;
@@ -101,12 +137,69 @@ namespace blt::parser {
             bool a_required = false;
     };
     
-    class argparse {
+    class arg_tokenizer {
+        private:
+            static constexpr char FLAG = '-';
+            std::vector<std::string> args;
+            size_t nextIndex = 0;
+            
+            inline const std::string& get(size_t i){
+                return args[i];
+            }
+            inline const std::string& next(size_t& i){
+                return args[i++];
+            }
+            inline bool hasNext(size_t i){
+                return (size_t)i < args.size();
+            }
+            inline bool isFlag(size_t i){
+                return get(i).starts_with(FLAG);
+            }
+        public:
+            arg_tokenizer() = default;
+            
+            arg_tokenizer(const char** argv, size_t argc);
+            
+            inline void forward() {
+                nextIndex++;
+            }
+            
+            inline const std::string& get() {
+                return get(nextIndex);
+            }
+            
+            inline const std::string& next() {
+                return next(nextIndex);
+            }
+            
+            inline bool hasNext() {
+                return hasNext(nextIndex);
+            }
+            
+            inline bool isFlag() {
+                return isFlag(nextIndex);
+            }
+            
+            inline bool isValue() {
+                return isValue(nextIndex);
+            }
+    };
+    
+    struct arg_results {
         private:
         
         public:
+        
+    };
+    
+    class argparse {
+        private:
+            arg_tokenizer tokenizer;
+        public:
             argparse() = default;
             
+            void addArgument(const arg_properties& args);
+        
     };
     
 }

src/blt/parse/argparse.cpp

@@ -7,7 +7,7 @@
 
 namespace blt::parser {
     
-    arg_vector::arg_vector(std::vector<std::string> args) {
+    arg_vector::arg_vector(const std::vector<std::string>& args) {
         for (auto& arg : args)
             insertAndSort(arg);
     }
@@ -94,4 +94,13 @@ namespace blt::parser {
         if (c == '*')
             flags |= ALL;
     }
+    
+    arg_tokenizer::arg_tokenizer(const char** argv, size_t argc) {
+        for (size_t i = 0; i < argc; i++)
+            args.emplace_back(argv[i]);
+    }
+    
+    void argparse::addArgument(const arg_properties& args) {
+    
+    }
 }