Fixing bug on MSVC, unbalanced pragma push/pop. Improved leaf.hpp generation.

Author: Emil Dotchevski

LICENSE renamed to LICENSE_1_0.txt

@@ -1,23 +1,23 @@
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

gen/generate_single_header.py

@@ -29,9 +29,11 @@
 
 def append(input_file_name, input_file, output_file, regex_includes, include_folder):
 	line_count = 1
+	last_line_was_empty = False
 	for line in input_file:
-		result = regex_includes.search(line)
 		line_count += 1
+		this_line_is_empty = (line=='\n')
+		result = regex_includes.search(line)
 		if result:
 			next_input_file_name = result.group("include")
 			if next_input_file_name not in included:
@@ -40,9 +42,15 @@ def append(input_file_name, input_file, output_file, regex_includes, include_fol
 				with open(os.path.join(include_folder, next_input_file_name), "r") as next_input_file:
 					output_file.write('// >>> %s#line 1 "%s"\n' % (line, next_input_file_name))
 					append(next_input_file_name, next_input_file, output_file, regex_includes, include_folder)
-					output_file.write('// <<< %s#line %d "%s"\n' % (line, line_count, input_file_name))
+					if not ('include/boost/leaf/detail/all.hpp' in input_file_name):
+						output_file.write('// <<< %s#line %d "%s"\n' % (line, line_count, input_file_name))
 		else:
+			if '///' in line:
+				continue
+			if this_line_is_empty and last_line_was_empty:
+				continue
 			output_file.write(line)
+		last_line_was_empty = this_line_is_empty
 
 def _main():
 	parser = argparse.ArgumentParser(
@@ -60,7 +68,33 @@ def _main():
 	regex_includes = re.compile(r"""^\s*#[\t\s]*include[\t\s]*("|\<)(?P<include>%s.*)("|\>)""" % args.prefix)
 	print("Rebuilding %s:" % args.input)
 	with open(args.output, 'w') as output_file, open(args.input, 'r') as input_file:
+		output_file.write(
+			'#ifndef BOOST_LEAF_HPP_INCLUDED\n'
+			'#define BOOST_LEAF_HPP_INCLUDED\n'
+			'\n'
+			'// Copyright (c) 2018-2020 Emil Dotchevski and Reverge Studios, Inc.\n'
+			'\n'
+			'// Distributed under the Boost Software License, Version 1.0. (See accompanying\n'
+			'// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\n'
+			'\n'
+			'#ifndef BOOST_LEAF_ENABLE_WARNINGS\n'
+			'#   if defined(_MSC_VER)\n'
+			'#       pragma warning(push,1)\n'
+			'#   elif defined(__clang__)\n'
+			'#       pragma clang system_header\n'
+			'#   elif (__GNUC__*100+__GNUC_MINOR__>301)\n'
+			'#       pragma GCC system_header\n'
+			'#   endif\n'
+			'#endif\n'
+			'\n' )
 		append(args.input, input_file, output_file, regex_includes, args.path)
+		output_file.write(
+			'\n'
+			'#if defined(_MSC_VER) && !defined(BOOST_LEAF_ENABLE_WARNINGS)\n'
+			'#pragma warning(pop)\n'
+			'#endif\n'
+			'\n'
+			'#endif\n' )
 
 if __name__ == "__main__":
 	_main()