-

sabudilovskiy · Aug 1, 2023 · 458f048 · 458f048
1 parent a1f8f77
commit 458f048
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 10 deletions.
diff --git a/.gen/objs.txt b/.gen/objs.txt
@@ -76,13 +76,22 @@ src/utils/constexpr_string.hpp
 src/utils/constexpr_optional.hpp
 src/utils/component_list_fwd.hpp
 src/utils/common_errors.hpp
+src/openapi/types/string_type.hpp
+src/openapi/types/object_type.hpp
 src/openapi/types/array_type.hpp
+src/openapi/json/parse/string_property.hpp
+src/openapi/json/parse/object_property.hpp
 src/openapi/json/parse/array_property.hpp
+src/openapi/base/string_traits.hpp
+src/openapi/base/string_property.hpp
 src/openapi/base/reflective_property.hpp
 src/openapi/base/property_base.hpp
 src/openapi/base/preferences.hpp
 src/openapi/base/optional_property.hpp
+src/openapi/base/object_traits.hpp
+src/openapi/base/object_property.hpp
 src/openapi/base/named_traits.hpp
+src/openapi/base/extended_object_property.hpp
 src/openapi/base/array_traits.hpp
 src/openapi/base/array_property.hpp
 src/models/user_type/type.hpp

diff --git a/.gen/unittest.txt b/.gen/unittest.txt
@@ -1,4 +1,6 @@
-utests/openapi/json/parse/basic.cpp
+utests/openapi/json/parse/basic_string.cpp
+utests/openapi/json/parse/basic_object.cpp
+utests/openapi/json/parse/basic_array.cpp
 utests/hello_test.cpp
 utests/dropper_additional.cpp
 utests/dropper.cpp

diff --git a/src/utils/constexpr_string.hpp b/src/utils/constexpr_string.hpp
@@ -23,11 +23,13 @@ struct ConstexprString
     {
         return AsStringView();
     }
-    constexpr const char& operator[](size_t index) const{
+    constexpr const char& operator[](size_t index) const
+    {
         return contents[index];
     }
 
-    constexpr char& operator[](size_t index){
+    constexpr char& operator[](size_t index)
+    {
         return contents[index];
     }
 
@@ -36,7 +38,13 @@ struct ConstexprString
         return {contents.begin(), contents.begin() + Size - 1};
     }
 
-    constexpr bool empty() const{
+    constexpr const char* data() const
+    {
+        return contents.begin();
+    }
+
+    constexpr bool empty() const
+    {
         return Size == 1;
     }
 
@@ -55,13 +63,14 @@ struct ConstexprString
     {
         return string == lhs;
     }
-};  
-template < std::size_t n >
-ConstexprString ( char const(&)[n] ) -> ConstexprString<n>;
+};
+template <std::size_t n>
+ConstexprString(char const (&)[n]) -> ConstexprString<n>;
 
-template<std::array<char, 256> arr_>
-auto consteval MakeConstexprString(){
-    constexpr auto real_end_it= std::find(begin(arr_), end(arr_), '\0');
+template <std::array<char, 256> arr_>
+auto consteval MakeConstexprString()
+{
+    constexpr auto real_end_it = std::find(begin(arr_), end(arr_), '\0');
     constexpr auto len = real_end_it - begin(arr_);
     char buffer[len + 1]{};
     std::copy(begin(arr_), real_end_it, std::begin(buffer));

diff --git a/vsu_timetable.code-workspace b/vsu_timetable.code-workspace
@@ -13,6 +13,7 @@
             "vadimcn.vscode-lldb",
             "ms-vscode.cmake-tools",
             "notskm.clang-tidy",
+            "forbeslindesay.forbeslindesay-taskrunner",
             "ms-vscode.cpptools"
         ]
     },
@@ -25,5 +26,30 @@
             "compile_commands.json" : true
         },
         "clang-tidy.buildPath": "build_debug"
+    },
+    "tasks": {
+        "version": "2.0.0",
+        "tasks": [
+            {
+                "label": "Отформатировать весь код",
+                "command": "make",
+                "type": "shell",
+                "args": ["-s", "format-all"],
+                "presentation": {
+                    "reveal": "always"
+                },
+                "group": "none"
+            },
+            {
+                "label": "Запустить юнит тесты",
+                "command": "make",
+                "type": "shell",
+                "args": ["-s", "utest-debug"],
+                "presentation": {
+                    "reveal": "always"
+                },
+                "group": "none"
+            }
+        ]
     }
 }