BlackMATov/meta.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/meta.hpp.git synced 2025-12-15 03:45:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix ifdefed includes

Browse Source
This commit is contained in:
BlackMATov
2023-01-18 22:48:23 +07:00
parent cdbd078f02
commit ad133deebc
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
develop/singles/headers/meta.hpp/meta_all.hpp
View File

@@ -20,13 +20,10 @@
#include <mutex>
#include <set>
#include <span>
#include <stdexcept>
#include <string>
#include <string_view>
#include <tuple>
#include <type_traits>
#include <typeindex>
#include <typeinfo>
#include <utility>
#include <variant>
#include <vector>
@@ -40,9 +37,12 @@
#endif
#if !defined(META_HPP_NO_EXCEPTIONS)
# include <stdexcept>
#endif
#if !defined(META_HPP_NO_RTTI)
# include <typeindex>
# include <typeinfo>
#endif
namespace meta_hpp::detail

24
develop/singles/scripts/build_singles.py
View File

@@ -12,6 +12,9 @@ import sys
EMPTY_MATCHER = re.compile(r'^\s*$')
C_COMMENT_MATCHER = re.compile(r'^/\*.*\*/', re.S)
IFDEF_MATCHER = re.compile(r'#\s*if')
ENDDEF_MATCHER = re.compile(r'#\s*endif')
USER_INCLUDE_MATCHER = re.compile(r'#\s*include\s*\"(.*)\"')
SYSTEM_INCLUDE_MATCHER = re.compile(r'#\s*include\s*<(.*)>')
PRAGMA_ONCE_MATCHER = re.compile(r'#\s*pragma\s+once')
@@ -33,18 +36,25 @@ def CollectSystemIncludes(headerPath, parsedHeaders = set()):
if PRAGMA_ONCE_MATCHER.search(headerContent) and headerPath in parsedHeaders:
return set()
ifdefScopeLevel = 0
headerIncludes = set()
parsedHeaders.add(headerPath)
headerLines = headerContent.split('\n')
for headerLine in headerLines:
if IFDEF_MATCHER.match(headerLine):
ifdefScopeLevel += 1
elif ENDDEF_MATCHER.match(headerLine):
ifdefScopeLevel -= 1
includeMatch = USER_INCLUDE_MATCHER.findall(headerLine)
if includeMatch:
if includeMatch and ifdefScopeLevel == 0:
internalHeaderPath = os.path.abspath(os.path.join(os.path.dirname(headerPath), includeMatch[0]))
headerIncludes = headerIncludes.union(CollectSystemIncludes(internalHeaderPath, parsedHeaders))
includeMatch = SYSTEM_INCLUDE_MATCHER.findall(headerLine)
if includeMatch:
if includeMatch and ifdefScopeLevel == 0:
headerIncludes.add(includeMatch[0])
return headerIncludes
@@ -61,6 +71,7 @@ def ParseHeader(headerPath, parsedHeaders = set()):
headerLines = headerContent.split('\n')
outputContent = ""
ifdefScopeLevel = 0
shouldSkipNextEmptyLines = True
for headerLine in headerLines:
@@ -71,8 +82,13 @@ def ParseHeader(headerPath, parsedHeaders = set()):
shouldSkipNextEmptyLines = True
continue
if IFDEF_MATCHER.match(headerLine):
ifdefScopeLevel += 1
elif ENDDEF_MATCHER.match(headerLine):
ifdefScopeLevel -= 1
includeMatch = USER_INCLUDE_MATCHER.findall(headerLine)
if includeMatch:
if includeMatch and ifdefScopeLevel == 0:
internalHeaderPath = os.path.abspath(os.path.join(os.path.dirname(headerPath), includeMatch[0]))
internalHeaderContent = ParseHeader(internalHeaderPath, parsedHeaders)
@@ -81,7 +97,7 @@ def ParseHeader(headerPath, parsedHeaders = set()):
continue
includeMatch = SYSTEM_INCLUDE_MATCHER.findall(headerLine)
if includeMatch:
if includeMatch and ifdefScopeLevel == 0:
shouldSkipNextEmptyLines = True
continue