.

beached · beached · commit 3471ef5e7a88 · 2019-04-21T15:49:03.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -68,7 +68,6 @@ set( HEADER_FILES
 set( SOURCE_FILES
 	${SOURCE_FOLDER}/curl_t.cpp
 	${SOURCE_FOLDER}/json_to_cpp.cpp
-	${SOURCE_FOLDER}/ti_value.cpp
 	${SOURCE_FOLDER}/ti_array.cpp
 	${SOURCE_FOLDER}/ti_object.cpp
 )
diff --git a/dependent_projects/CMakeListsCompiler.txt b/dependent_projects/CMakeListsCompiler.txt
@@ -4,7 +4,8 @@ if( ${CMAKE_CXX_COMPILER_ID} STREQUAL 'MSVC' )
 	add_definitions( -DNOMINMAX -DD_WIN32_WINNT=0x0601 )
 else( )
 	if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" )
-		add_compile_options( -march=native -ffast-math -ftemplate-backtrace-limit=0 -Wall	-Wextra -pedantic -Weverything -Wno-c++98-compat -Wno-covered-switch-default -Wnull-dereference -Wno-padded -Wno-exit-time-destructors -Wno-c++98-compat-pedantic -Wno-unused-parameter -Wno-missing-noreturn -Wno-missing-prototypes -Wno-disabled-macro-expansion -Wno-missing-braces -Wno-return-std-move-in-c++11 )
+		add_compile_options( -march=native -ffast-math -ftemplate-backtrace-limit=0 -Wall	-Wextra -pedantic -Weverything -Wno-c++98-compat -Wno-covered-switch-default -Wnull-dereference -Wno-padded -Wno-exit-time-destructors -Wno-c++98-compat-pedantic -Wno-missing-prototypes -Wno-disabled-macro-expansion -Wno-return-std-move-in-c++11 )
+		#add_compile_options( -march=native -ffast-math -ftemplate-backtrace-limit=0 -Wall	-Wextra -pedantic -Weverything -Wno-c++98-compat -Wno-covered-switch-default -Wnull-dereference -Wno-padded -Wno-exit-time-destructors -Wno-c++98-compat-pedantic -Wno-unused-parameter -Wno-missing-noreturn -Wno-missing-prototypes -Wno-disabled-macro-expansion -Wno-missing-braces -Wno-return-std-move-in-c++11 )
 		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 -DDEBUG -fsanitize=undefined")
 		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -g -DNDEBUG")
 	elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" )
diff --git a/include/ti_array.h b/include/ti_array.h
@@ -62,7 +62,7 @@ namespace daw::json_to_cpp::types {
 		}
 
 		std::string name( ) const;
-		std::string json_name( std::string member_name ) const;
+		std::string json_name( daw::string_view member_name ) const;
 		std::string array_member_info( ) const;
 	};
 } // namespace daw::json_to_cpp::types
diff --git a/include/ti_boolean.h b/include/ti_boolean.h
@@ -51,7 +51,6 @@ namespace daw::json_to_cpp::types {
 
 		inline static std::string
 		json_name( daw::string_view member_name ) noexcept {
-
 			return "json_bool<" + member_name + ">";
 		}
 	};
diff --git a/include/ti_integral.h b/include/ti_integral.h
@@ -49,7 +49,7 @@ namespace daw::json_to_cpp::types {
 			return "json_number<no_name, int64_t>";
 		}
 
-		inline static std::string json_name( std::string member_name ) noexcept {
+		inline static std::string json_name( daw::string_view member_name ) noexcept {
 			return "json_number<" + member_name + ", intmax_t>";
 		}
 	};
diff --git a/include/ti_null.h b/include/ti_null.h
@@ -49,7 +49,7 @@ namespace daw::json_to_cpp::types {
 			return "json_custom<no_name>";
 		}
 
-		inline static std::string json_name( std::string member_name ) noexcept {
+		inline static std::string json_name( daw::string_view member_name ) noexcept {
 			return "json_custom<" + member_name + ">";
 		}
 	};
diff --git a/include/ti_object.h b/include/ti_object.h
@@ -64,6 +64,9 @@ namespace daw::json_to_cpp::types {
 
 		std::string name( ) const;
 		std::string array_member_info( ) const;
-		std::string json_name( std::string member_name ) const;
+
+		std::string json_name( daw::string_view member_name ) const {
+			return "json_class<" + member_name + ", " + name( ) + ">";
+		}
 	};
 } // namespace daw::json_to_cpp::types
diff --git a/include/ti_real.h b/include/ti_real.h
@@ -49,7 +49,7 @@ namespace daw::json_to_cpp::types {
 			return "json_number<no_name>";
 		}
 
-		inline static std::string json_name( std::string member_name ) noexcept {
+		inline static std::string json_name( daw::string_view member_name ) noexcept {
 			return "json_number<" + member_name + ">";
 		}
 	};
diff --git a/include/ti_string.h b/include/ti_string.h
@@ -58,7 +58,7 @@ namespace daw::json_to_cpp::types {
 			return "json_string<no_name>";
 		}
 
-		inline std::string json_name( std::string member_name ) const noexcept {
+		inline std::string json_name( daw::string_view member_name ) const noexcept {
 			if( m_use_string_view ) {
 				return "json_string<" + member_name + ", std::string_view>";
 			}
diff --git a/include/ti_value.h b/include/ti_value.h
@@ -52,13 +52,51 @@ namespace daw::json_to_cpp::types {
 			return *this;
 		}
 
-		std::string name( ) const noexcept;
-		std::string json_name( std::string member_name ) const noexcept;
-		std::string array_member_info( ) const;
+		inline std::string name( ) const noexcept {
+			return daw::visit_nt( value,
+			                      []( 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 );
+			} );
+		}
 
-		daw::ordered_map<std::string, ti_types_t> const &children( ) const;
-		daw::ordered_map<std::string, ti_types_t> &children( );
+		inline std::string array_member_info( ) const {
+			return daw::visit_nt(
+			  value, []( auto const &item ) { return item.array_member_info( ); } );
+		}
 
+		inline daw::ordered_map<std::string, ti_types_t> const &children( ) const {
+			return daw::visit_nt(
+			  value,
+			  []( ti_array const &v )
+			    -> daw::ordered_map<std::string, ti_types_t> const & {
+				  return *v.children;
+			  },
+			  []( ti_object const &v )
+			    -> daw::ordered_map<std::string, ti_types_t> const & {
+				  return *v.children;
+			  },
+			  []( ... ) -> daw::ordered_map<std::string, ti_types_t> const & {
+				  std::terminate( );
+			  } );
+		}
+
+		inline daw::ordered_map<std::string, ti_types_t> &children( ) {
+			return daw::visit_nt(
+			  value,
+			  []( ti_array &v ) -> daw::ordered_map<std::string, ti_types_t> & {
+				  return *v.children;
+			  },
+			  []( ti_object &v ) -> daw::ordered_map<std::string, ti_types_t> & {
+				  return *v.children;
+			  },
+			  []( ... ) -> daw::ordered_map<std::string, ti_types_t> & {
+				  std::terminate( );
+			  } );
+		}
 		template<typename Function>
 		constexpr void on_children( Function ) const {}
 
diff --git a/src/json_to_cpp.cpp b/src/json_to_cpp.cpp
@@ -185,12 +185,6 @@ namespace daw::json_to_cpp {
 			                      []( auto &&item ) { return item.is_null; } );
 		}
 
-		template<typename Variant>
-		constexpr decltype( auto ) ti_type( Variant &&v ) {
-			return daw::visit_nt( std::forward<Variant>( v ),
-			                      []( auto &&item ) { return item.type; } );
-		}
-
 		void add_or_merge( std::vector<types::ti_object> &obj_info,
 		                   types::ti_object &obj ) {
 			auto pos =
@@ -271,7 +265,7 @@ namespace daw::json_to_cpp {
 					  child.second, child_name, obj_info, obj_state, config );
 				}
 				add_or_merge( obj_info, result );
-				return result;
+				return {result};
 			}
 			if( current_item.is_array( ) ) {
 				obj_state.has_arrays = true;
@@ -328,7 +322,7 @@ namespace daw::json_to_cpp {
 			}
 			if( !definition ) {
 				using daw::json::json_value_t;
-				config.cpp_file( ) << " auto describe_json_class( "
+				config.cpp_file( ) << "inline auto describe_json_class( "
 				                   << cur_obj.object_name
 				                   << " ) {\n\tusing namespace daw::json;\n";
 				for( auto const &child : *cur_obj.children ) {
@@ -375,7 +369,7 @@ namespace daw::json_to_cpp {
 				}
 				config.cpp_file( ) << ">{};\n}\n\n";
 
-				config.cpp_file( ) << " auto to_json_data( " << cur_obj.object_name
+				config.cpp_file( ) << " inline auto to_json_data( " << cur_obj.object_name
 				                   << " const & value ) {\n";
 				config.cpp_file( ) << "\treturn std::forward_as_tuple( ";
 				is_first = true;
@@ -438,7 +432,7 @@ namespace daw::json_to_cpp {
 		}
 
 		void generate_declarations( std::vector<types::ti_object> const &obj_info,
-		                            config_t &config, state_t const &obj_state ) {
+		                            config_t &config ) {
 			for( auto const &cur_obj : obj_info ) {
 				auto const obj_type = cur_obj.name( );
 				config.header_file( ) << "struct " << obj_type << " {\n";
@@ -465,7 +459,7 @@ namespace daw::json_to_cpp {
 		}
 
 		void generate_definitions( std::vector<types::ti_object> const &obj_info,
-		                           config_t &config, state_t const &obj_state ) {
+		                           config_t &config ) {
 			if( !config.enable_jsonlink ) {
 				return;
 			}
@@ -478,8 +472,8 @@ namespace daw::json_to_cpp {
 		                    config_t &config, state_t const &obj_state ) {
 			generate_includes( true, config, obj_state );
 			generate_includes( false, config, obj_state );
-			generate_declarations( obj_info, config, obj_state );
-			generate_definitions( obj_info, config, obj_state );
+			generate_declarations( obj_info, config );
+			generate_definitions( obj_info, config );
 		}
 	} // namespace
 
diff --git a/src/ti_array.cpp b/src/ti_array.cpp
@@ -64,7 +64,7 @@ namespace daw::json_to_cpp::types {
 		       ::daw::json_to_cpp::types::name( children->front( ).second ) + ">";
 	}
 
-	std::string ti_array::json_name( std::string member_name ) const {
+	std::string ti_array::json_name( daw::string_view member_name ) const {
 		if( children->empty( ) ) {
 			return "json_array<" + member_name + ", " + name( ) + ", " +
 			       ti_null::array_member_info( ) + ">";
diff --git a/src/ti_object.cpp b/src/ti_object.cpp
@@ -42,10 +42,6 @@ namespace daw::json_to_cpp::types {
 		return "json_class<no_name, " + name( ) + ">";
 	}
 
-	std::string ti_object::json_name( std::string member_name ) const {
-		return "json_class<" + member_name + ", " + name( ) + ">";
-	}
-
 	ti_object::ti_object( ti_object const &other ) noexcept
 	  : children( std::make_unique<child_t>( *other.children ) )
 	  , is_optional( other.is_optional )
diff --git a/src/ti_value.cpp b/src/ti_value.cpp

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ set( HEADER_FILES`
`68`	`68`	`set( SOURCE_FILES`
`69`	`69`	`${SOURCE_FOLDER}/curl_t.cpp`
`70`	`70`	`${SOURCE_FOLDER}/json_to_cpp.cpp`
`71`		`- ${SOURCE_FOLDER}/ti_value.cpp`
`72`	`71`	`${SOURCE_FOLDER}/ti_array.cpp`
`73`	`72`	`${SOURCE_FOLDER}/ti_object.cpp`
`74`	`73`	`)`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ namespace daw::json_to_cpp::types {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`std::string name( ) const;`
`65`		`- std::string json_name( std::string member_name ) const;`
	`65`	`+ std::string json_name( daw::string_view member_name ) const;`
`66`	`66`	`std::string array_member_info( ) const;`
`67`	`67`	`};`
`68`	`68`	`} // namespace daw::json_to_cpp::types`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ namespace daw::json_to_cpp::types {`
`51`	`51`
`52`	`52`	`inline static std::string`
`53`	`53`	`json_name( daw::string_view member_name ) noexcept {`
`54`		`-`
`55`	`54`	`return "json_bool<" + member_name + ">";`
`56`	`55`	`}`
`57`	`56`	`};`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ namespace daw::json_to_cpp::types {`
`49`	`49`	`return "json_number<no_name, int64_t>";`
`50`	`50`	`}`
`51`	`51`
`52`		`- inline static std::string json_name( std::string member_name ) noexcept {`
	`52`	`+ inline static std::string json_name( daw::string_view member_name ) noexcept {`
`53`	`53`	`return "json_number<" + member_name + ", intmax_t>";`
`54`	`54`	`}`
`55`	`55`	`};`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ namespace daw::json_to_cpp::types {`
`58`	`58`	`return "json_string<no_name>";`
`59`	`59`	`}`
`60`	`60`
`61`		`- inline std::string json_name( std::string member_name ) const noexcept {`
	`61`	`+ inline std::string json_name( daw::string_view member_name ) const noexcept {`
`62`	`62`	`if( m_use_string_view ) {`
`63`	`63`	`return "json_string<" + member_name + ", std::string_view>";`
`64`	`64`	`}`