added cpp20 mode and fixed a output format bug

beached · beached · commit f1cda01c84cc · 2019-04-29T21:14:06.000-04:00
diff --git a/include/json_to_cpp.h b/include/json_to_cpp.h
@@ -38,6 +38,7 @@ namespace daw::json_to_cpp {
 		std::vector<std::vector<std::string>> kv_paths;
 		bool hide_null_only;
 		bool use_string_view;
+		bool has_cpp20;
 
 		std::ostream &header_file( );
 		std::ostream &cpp_file( );
diff --git a/include/ti_array.h b/include/ti_array.h
@@ -60,7 +60,7 @@ namespace daw::json_to_cpp::types {
 		ti_array &operator=( ti_array const &rhs );
 
 		std::string name( ) const;
-		std::string json_name( daw::string_view member_name ) const;
+		std::string json_name( daw::string_view member_name, bool use_cpp20 ) const;
 		std::string array_member_info( ) const;
 	};
 } // namespace daw::json_to_cpp::types
diff --git a/include/ti_base.h b/include/ti_base.h
@@ -27,6 +27,7 @@
 #include <variant>
 
 #include <daw/cpp_17.h>
+#include <daw/daw_string_view.h>
 
 namespace daw::json_to_cpp::types::impl {
 	inline constexpr size_t ti_null_pos = 0;
@@ -62,4 +63,11 @@ namespace daw::json_to_cpp::types::impl {
 		}
 		return ( std::is_same_v<Args0, Args1> and ... );
 	}
+
+	inline std::string format_member_name( daw::string_view name, bool use_cpp20 ) {
+		if( use_cpp20 ) {
+			return "\"" + name + "\"";
+		}
+		return name;
+	}
 } // namespace daw::json_to_cpp::types::impl
diff --git a/include/ti_boolean.h b/include/ti_boolean.h
@@ -45,9 +45,10 @@ namespace daw::json_to_cpp::types {
 			return "json_bool<no_name>";
 		}
 
-		inline static std::string
-		json_name( daw::string_view member_name ) noexcept {
-			return "json_bool<" + member_name + ">";
+		inline static std::string json_name( daw::string_view member_name,
+		                                     bool use_cpp20 ) noexcept {
+			return "json_bool<" + impl::format_member_name( member_name, use_cpp20 ) +
+			       ">";
 		}
 	};
 } // namespace daw::json_to_cpp::types
diff --git a/include/ti_integral.h b/include/ti_integral.h
@@ -28,6 +28,8 @@
 #include <daw/daw_string_view.h>
 #include <daw/json/daw_json_value_t.h>
 
+#include "ti_base.h"
+
 namespace daw::json_to_cpp::types {
 	struct ti_integral {
 		bool is_optional = false;
@@ -45,8 +47,8 @@ namespace daw::json_to_cpp::types {
 			return "json_number<no_name, int64_t>";
 		}
 
-		inline static std::string json_name( daw::string_view member_name ) noexcept {
-			return "json_number<" + member_name + ", int64_t>";
+		inline static std::string json_name( daw::string_view member_name, bool use_cpp20 ) noexcept {
+			return "json_number<" + impl::format_member_name( member_name, use_cpp20 ) + ", int64_t>";
 		}
 	};
 } // namespace daw::json_to_cpp::types
diff --git a/include/ti_kv.h b/include/ti_kv.h
@@ -65,6 +65,6 @@ namespace daw::json_to_cpp::types {
 		std::string name( ) const;
 		std::string array_member_info( ) const;
 
-		std::string json_name( daw::string_view member_name ) const;
+		std::string json_name( daw::string_view member_name, bool use_cpp20 ) const;
 	};
 } // namespace daw::json_to_cpp::types
diff --git a/include/ti_null.h b/include/ti_null.h
@@ -47,8 +47,8 @@ namespace daw::json_to_cpp::types {
 			return "json_custom<no_name>";
 		}
 
-		static inline std::string json_name( daw::string_view member_name ) noexcept {
-			return "json_custom<" + member_name + ">";
+		static inline std::string json_name( daw::string_view member_name, bool use_cpp20 ) noexcept {
+			return "json_custom<" + impl::format_member_name( member_name, use_cpp20 ) + ">";
 		}
 	};
 } // namespace daw::json_to_cpp::types
diff --git a/include/ti_object.h b/include/ti_object.h
@@ -62,7 +62,7 @@ namespace daw::json_to_cpp::types {
 		ti_object &operator=( ti_object const &rhs );
 
 		std::string name( ) const;
-		std::string json_name( daw::string_view member_name ) const;
+		std::string json_name( daw::string_view member_name, bool use_cpp20 ) const;
 		std::string array_member_info( ) const;
 	};
 } // namespace daw::json_to_cpp::types
diff --git a/include/ti_real.h b/include/ti_real.h
@@ -28,6 +28,8 @@
 #include <daw/daw_string_view.h>
 #include <daw/json/daw_json_value_t.h>
 
+#include "ti_base.h"
+
 namespace daw::json_to_cpp::types {
 	struct ti_real {
 		bool is_optional = false;
@@ -45,8 +47,8 @@ namespace daw::json_to_cpp::types {
 			return "json_number<no_name>";
 		}
 
-		inline static std::string json_name( daw::string_view member_name ) noexcept {
-			return "json_number<" + member_name + ">";
+		inline static std::string json_name( daw::string_view member_name, bool use_cpp20 ) noexcept {
+			return "json_number<" + impl::format_member_name( member_name, use_cpp20 ) + ">";
 		}
 	};
 } // namespace daw::json_to_cpp::types
diff --git a/include/ti_string.h b/include/ti_string.h
@@ -28,6 +28,8 @@
 #include <daw/daw_string_view.h>
 #include <daw/json/daw_json_value_t.h>
 
+#include "ti_base.h"
+
 namespace daw::json_to_cpp::types {
 	class ti_string {
 		bool m_use_string_view;
@@ -54,11 +56,11 @@ namespace daw::json_to_cpp::types {
 			return "json_string<no_name>";
 		}
 
-		inline std::string json_name( daw::string_view member_name ) const noexcept {
+		inline std::string json_name( daw::string_view member_name, bool use_cpp20 ) const noexcept {
 			if( m_use_string_view ) {
-				return "json_string<" + member_name + ", std::string_view>";
+				return "json_string<" + impl::format_member_name( member_name, use_cpp20 ) + ", std::string_view>";
 			}
-			return "json_string<" + member_name + ">";
+			return "json_string<" + impl::format_member_name( member_name, use_cpp20 ) + ">";
 		}
 	};
 } // namespace daw::json_to_cpp::types
diff --git a/include/ti_value.h b/include/ti_value.h
@@ -57,9 +57,9 @@ namespace daw::json_to_cpp::types {
 			                      []( auto const &item ) { return item.name( ); } );
 		}
 
-		inline std::string json_name( std::string member_name ) const noexcept {
-			return daw::visit_nt( value, [&member_name]( auto const &item ) {
-				return item.json_name( member_name );
+		inline std::string json_name( std::string member_name, bool use_cpp20 ) const noexcept {
+			return daw::visit_nt( value, [&member_name, use_cpp20]( auto const &item ) {
+				return item.json_name( member_name, use_cpp20 );
 			} );
 		}
 
diff --git a/src/json_to_cpp.cpp b/src/json_to_cpp.cpp
@@ -358,20 +358,22 @@ namespace daw::json_to_cpp {
 				config.cpp_file( ) << "auto describe_json_class( "
 				                   << cur_obj.object_name
 				                   << " ) {\n\tusing namespace daw::json;\n";
-				for( auto const &child : *cur_obj.children ) {
-					if( config.hide_null_only and is_null( child.second ) ) {
-						continue;
-					}
-					config.cpp_file( )
-					  << "\tstatic constexpr char const " << child.first << "[] = \"";
-					if( daw::string_view( child.first.data( ), child.first.size( ) )
-					      .starts_with( "_json" ) ) {
+				if( !config.has_cpp20 ) {
+					for( auto const & child : *cur_obj.children ) {
+						if( config.hide_null_only and is_null( child.second )) {
+							continue;
+						}
 						config.cpp_file( )
-						  << daw::string_view( child.first.data( ), child.first.size( ) )
-						       .substr( 5 )
-						  << "\";\n";
-					} else {
-						config.cpp_file( ) << child.first << "\";\n";
+								<< "\tstatic constexpr char const " << child.first << "[] = \"";
+						if( daw::string_view( child.first.data( ), child.first.size( ))
+								.starts_with( "_json" )) {
+							config.cpp_file( )
+									<< daw::string_view( child.first.data( ), child.first.size( ))
+											.substr( 5 )
+									<< "\";\n";
+						} else {
+							config.cpp_file( ) << child.first << "\";\n";
+						}
 					}
 				}
 
@@ -393,14 +395,14 @@ namespace daw::json_to_cpp {
 						config.cpp_file( ) << "json_nullable<";
 					}
 					config.cpp_file( )
-					  << types::ti_value( child.second ).json_name( child.first );
+					  << types::ti_value( child.second ).json_name( child.first, config.has_cpp20 );
 					if( is_optional( child.second ) ) {
 						config.cpp_file( ) << ">\n";
 					} else {
 						config.cpp_file( ) << '\n';
 					}
 				}
-				config.cpp_file( ) << ">{};\n}\n\n";
+				config.cpp_file( ) << "\t>{};\n}\n\n";
 
 				config.cpp_file( ) << "auto to_json_data( "
 				                   << cur_obj.object_name << " const & value ) {\n";
diff --git a/src/main.cpp b/src/main.cpp
@@ -91,6 +91,8 @@ int main( int argc, char **argv ) {
 	  "use_jsonlink",
 	  boost::program_options::value<bool>( )->default_value( true ),
 	  "Use JsonLink serializaion/deserialization" )(
+	  "has_cpp20", boost::program_options::value<bool>( )->default_value( false ),
+	  "Enables use of non-type class template arguments" )(
 	  "output_file", boost::program_options::value<boost::filesystem::path>( ),
 	  "output goes to c++ header file." )(
 	  "allow_overwrite",
@@ -175,6 +177,7 @@ int main( int argc, char **argv ) {
 	config.enable_jsonlink = vm["use_jsonlink"].as<bool>( );
 	config.hide_null_only = vm["hide_null_only"].as<bool>( );
 	config.use_string_view = vm["use_string_view"].as<bool>( );
+	config.has_cpp20 = vm["has_cpp20"].as<bool>( );
 	auto cpp_file = std::ofstream( );
 	auto header_file = std::ofstream( );
 
diff --git a/src/ti_array.cpp b/src/ti_array.cpp
@@ -27,6 +27,7 @@
 #include <daw/json/daw_json_value_t.h>
 
 #include "ti_array.h"
+#include "ti_base.h"
 #include "ti_types.h"
 
 namespace daw::json_to_cpp::types {
@@ -64,19 +65,22 @@ namespace daw::json_to_cpp::types {
 		       ::daw::json_to_cpp::types::name( children->front( ).second ) + ">";
 	}
 
-	std::string ti_array::json_name( daw::string_view member_name ) const {
+	std::string ti_array::json_name( daw::string_view member_name,
+	                                 bool use_cpp20 ) const {
 		if( children->empty( ) ) {
-			return "json_array<" + member_name + ", " + name( ) + ", " +
-			       ti_null::array_member_info( ) + ">";
+			return "json_array<" +
+			       impl::format_member_name( member_name, use_cpp20 ) + ", " +
+			       name( ) + ", " + ti_null::array_member_info( ) + ">";
 		}
-		return "json_array<" + member_name + ", " + name( ) + ", " +
+		return "json_array<" + impl::format_member_name( member_name, use_cpp20 ) +
+		       ", " + name( ) + ", " +
 		       ::daw::json_to_cpp::types::array_member_info(
 		         children->front( ).second ) +
 		       ">";
 	}
 
 	std::string ti_array::array_member_info( ) const {
-		return json_name( "no_name" );
+		return json_name( "no_name", false );
 	}
 
 	ti_array::ti_array( )
diff --git a/src/ti_kv.cpp b/src/ti_kv.cpp
@@ -20,6 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include "ti_base.h"
 #include "ti_kv.h"
 #include "ti_array.h"
 #include "ti_object.h"
@@ -56,12 +57,11 @@ namespace daw::json_to_cpp::types {
 	}
 
 	std::string ti_kv::array_member_info( ) const {
-		return json_name( "no_name" );
+		return json_name( "no_name", false );
 	}
 
-	std::string ti_kv::json_name( daw::string_view member_name ) const {
-		std::string result =
-		  "json_key_value<" + member_name + ", " + name( ) + ", ";
+	std::string ti_kv::json_name( daw::string_view member_name, bool use_cpp20 ) const {
+		std::string result = "json_key_value<" + impl::format_member_name( member_name, use_cpp20 ) + ", " + name( ) + ", ";
 		if( value ) {
 			result += daw::visit_nt(
 			  value->front( ).second,
diff --git a/src/ti_object.cpp b/src/ti_object.cpp
@@ -25,6 +25,7 @@
 
 #include <daw/json/daw_json_value_t.h>
 
+#include "ti_base.h"
 #include "ti_object.h"
 #include "ti_types.h"
 
@@ -38,12 +39,12 @@ namespace daw::json_to_cpp::types {
 	  : children( std::make_unique<child_t>( ) )
 	  , object_name( std::move( obj_name ) ) {}
 
-	std::string ti_object::json_name( daw::string_view member_name ) const {
-		return "json_class<" + member_name + ", " + name( ) + ">";
+	std::string ti_object::json_name( daw::string_view member_name, bool use_cpp20 ) const {
+		return "json_class<" + impl::format_member_name( member_name, use_cpp20 ) + ", " + name( ) + ">";
 	}
 
 	std::string ti_object::array_member_info( ) const {
-		return json_name( "no_name" );
+		return json_name( "no_name", false );
 	}
 
 	ti_object::ti_object( ti_object const &other )

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,10 @@ namespace daw::json_to_cpp::types {`
`45`	`45`	`return "json_bool<no_name>";`
`46`	`46`	`}`
`47`	`47`
`48`		`- inline static std::string`
`49`		`- json_name( daw::string_view member_name ) noexcept {`
`50`		`- return "json_bool<" + member_name + ">";`
	`48`	`+ inline static std::string json_name( daw::string_view member_name,`
	`49`	`+ bool use_cpp20 ) noexcept {`
	`50`	`+ return "json_bool<" + impl::format_member_name( member_name, use_cpp20 ) +`
	`51`	`+ ">";`
`51`	`52`	`}`
`52`	`53`	`};`
`53`	`54`	`} // namespace daw::json_to_cpp::types`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ namespace daw::json_to_cpp::types {`
`47`	`47`	`return "json_custom<no_name>";`
`48`	`48`	`}`
`49`	`49`
`50`		`- static inline std::string json_name( daw::string_view member_name ) noexcept {`
`51`		`- return "json_custom<" + member_name + ">";`
	`50`	`+ static inline std::string json_name( daw::string_view member_name, bool use_cpp20 ) noexcept {`
	`51`	`+ return "json_custom<" + impl::format_member_name( member_name, use_cpp20 ) + ">";`
`52`	`52`	`}`
`53`	`53`	`};`
`54`	`54`	`} // namespace daw::json_to_cpp::types`