sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Indentation

Browse Source
This commit is contained in:
Nyall Dawson 2024-08-10 17:52:00 +10:00
parent 526b89d205
commit 52ef640901
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
scripts/sipify.py
View File

@ -23,7 +23,6 @@ PREPEND_CODE_NO = 40
PREPEND_CODE_VIRTUAL = 41 PREPEND_CODE_VIRTUAL = 41
PREPEND_CODE_MAKE_PRIVATE = 42 PREPEND_CODE_MAKE_PRIVATE = 42
# TO RENAME # TO RENAME
LINE = '' LINE = ''
@ -755,7 +754,9 @@ def processDoxygenLine(line):
return f"\n.. versionadded:: {since_match.group(1)}\n" return f"\n.. versionadded:: {since_match.group(1)}\n"
# Handle deprecated # Handle deprecated
deprecated_match = re.search(r'\\deprecated(?:\s+since\s+QGIS\s+(?P<DEPR_VERSION>[0-9.]+)(,\s*)?)?(?P<DEPR_MESSAGE>.*)?', line, re.IGNORECASE) deprecated_match = re.search(
r'\\deprecated(?:\s+since\s+QGIS\s+(?P<DEPR_VERSION>[0-9.]+)(,\s*)?)?(?P<DEPR_MESSAGE>.*)?', line,
re.IGNORECASE)
if deprecated_match: if deprecated_match:
prev_indent = indent prev_indent = indent
indent = '' indent = ''
@ -835,7 +836,7 @@ def detect_and_remove_following_body_or_initializerlist():
if (re.match(pattern1, LINE) or if (re.match(pattern1, LINE) or
re.search(pattern2, LINE) or re.search(pattern2, LINE) or
re.match(pattern3, LINE)): re.match(pattern3, LINE)):
dbg_info("remove constructor definition, function bodies, member initializing list (1)") dbg_info("remove constructor definition, function bodies, member initializing list (1)")
@ -962,7 +963,8 @@ def fix_annotations(line):
# Note: this was the original perl regex, which isn't compatible with Python: # Note: this was the original perl regex, which isn't compatible with Python:
# line = re.sub(r"""=\s+[^=]*?\s+SIP_PYARGDEFAULT\(\s*\'?([^()']+)(\(\s*(?:[^()]++|(?2))*\s*\))?\'?\s*\)""", r'= \1', line) # line = re.sub(r"""=\s+[^=]*?\s+SIP_PYARGDEFAULT\(\s*\'?([^()']+)(\(\s*(?:[^()]++|(?2))*\s*\))?\'?\s*\)""", r'= \1', line)
line = re.sub(r"""=\s+[^=]*?\s+SIP_PYARGDEFAULT\(\s*\'?([^()\']+)(\((?:[^()]|\([^()]*\))*\))?\'?\s*\)""", r'= \1', line) line = re.sub(r"""=\s+[^=]*?\s+SIP_PYARGDEFAULT\(\s*\'?([^()\']+)(\((?:[^()]|\([^()]*\))*\))?\'?\s*\)""", r'= \1',
line)
# Remove argument # Remove argument
if 'SIP_PYARGREMOVE' in line: if 'SIP_PYARGREMOVE' in line:
@ -987,7 +989,9 @@ def fix_annotations(line):
# original perl regex was: # original perl regex was:
# (?<coma>, +)?(const )?(\w+)(\<(?>[^<>]|(?4))*\>)?\s+[\w&*]+\s+SIP_PYARGREMOVE( = [^()]*(\(\s*(?:[^()]++|(?6))*\s*\))?)?(?(<coma>)|,?)// # (?<coma>, +)?(const )?(\w+)(\<(?>[^<>]|(?4))*\>)?\s+[\w&*]+\s+SIP_PYARGREMOVE( = [^()]*(\(\s*(?:[^()]++|(?6))*\s*\))?)?(?(<coma>)|,?)//
line = re.sub(r'(?P<coma>, +)?(const )?(\w+)(\<(?:[^<>]|\<(?:[^<>]|\<[^<>]*\>)*\>)*\>)?\s+[\w&*]+\s+SIP_PYARGREMOVE( = [^()]*(\(\s*(?:[^()]++|\([^()]*\))*\s*\))?)?(?(coma)|,?)', '', line) line = re.sub(
r'(?P<coma>, +)?(const )?(\w+)(\<(?:[^<>]|\<(?:[^<>]|\<[^<>]*\>)*\>)*\>)?\s+[\w&*]+\s+SIP_PYARGREMOVE( = [^()]*(\(\s*(?:[^()]++|\([^()]*\))*\s*\))?)?(?(coma)|,?)',
'', line)
line = re.sub(r'\(\s+\)', '()', line) line = re.sub(r'\(\s+\)', '()', line)
line = re.sub(r'SIP_FORCE', '', line) line = re.sub(r'SIP_FORCE', '', line)
@ -1110,7 +1114,7 @@ while line_idx < line_count:
# Do not process SIP code %XXXCode # Do not process SIP code %XXXCode
if sip_run and re.match( if sip_run and re.match(
r'^ *% *(VirtualErrorHandler|MappedType|Type(?:Header)?Code|Module(?:Header)?Code|Convert(?:From|To)(?:Type|SubClass)Code|MethodCode|Docstring)(.*)?$', r'^ *% *(VirtualErrorHandler|MappedType|Type(?:Header)?Code|Module(?:Header)?Code|Convert(?:From|To)(?:Type|SubClass)Code|MethodCode|Docstring)(.*)?$',
LINE): LINE):
LINE = f"%{re.match(r'^ *% *(.*)$', LINE).group(1)}" LINE = f"%{re.match(r'^ *% *(.*)$', LINE).group(1)}"
COMMENT = '' COMMENT = ''
dbg_info("do not process SIP code") dbg_info("do not process SIP code")
@ -1271,7 +1275,7 @@ while line_idx < line_count:
# Skip Q_OBJECT, Q_PROPERTY, Q_ENUM, etc. # Skip Q_OBJECT, Q_PROPERTY, Q_ENUM, etc.
if re.match( if re.match(
r'^\s*Q_(OBJECT|ENUMS|ENUM|FLAG|PROPERTY|DECLARE_METATYPE|DECLARE_TYPEINFO|NOWARN_DEPRECATED_(PUSH|POP))\b.*?$', r'^\s*Q_(OBJECT|ENUMS|ENUM|FLAG|PROPERTY|DECLARE_METATYPE|DECLARE_TYPEINFO|NOWARN_DEPRECATED_(PUSH|POP))\b.*?$',
LINE): LINE):
continue continue
if re.match(r'^\s*QHASH_FOR_CLASS_ENUM', LINE): if re.match(r'^\s*QHASH_FOR_CLASS_ENUM', LINE):
@ -1318,7 +1322,8 @@ while line_idx < line_count:
if struct_match: if struct_match:
dbg_info(" going to struct => public") dbg_info(" going to struct => public")
class_and_struct.append(struct_match.group('structname')) class_and_struct.append(struct_match.group('structname'))
classname.append(classname[-1] if classname else struct_match.group('structname')) # fake new class since struct has considered similarly classname.append(classname[-1] if classname else struct_match.group(
'structname')) # fake new class since struct has considered similarly
access.append(PUBLIC) access.append(PUBLIC)
exported.append(exported[-1]) exported.append(exported[-1])
glob_bracket_nesting_idx.append(0) glob_bracket_nesting_idx.append(0)
@ -1388,7 +1393,7 @@ while line_idx < line_count:
r'\b(?P<tpl>(?!QList)\w+)< *(?P<cls1>(\w|::)+) *(, *(?P<cls2>(\w|::)+)? *(, *(?P<cls3>(\w|::)+)? *)?)? *>' r'\b(?P<tpl>(?!QList)\w+)< *(?P<cls1>(\w|::)+) *(, *(?P<cls2>(\w|::)+)? *(, *(?P<cls3>(\w|::)+)? *)?)? *>'
) )
m = tpl_replace_pattern.sub(lambda m = tpl_replace_pattern.sub(lambda
match: f"{match.group('tpl') or ''}{match.group('cls1') or ''}{match.group('cls2') or ''}{match.group('cls3') or ''}Base", match: f"{match.group('tpl') or ''}{match.group('cls1') or ''}{match.group('cls2') or ''}{match.group('cls3') or ''}Base",
m) m)
m = re.sub(r'(\w+)< *(?:\w|::)+ *>', '', m) m = re.sub(r'(\w+)< *(?:\w|::)+ *>', '', m)
m = re.sub(r'([:,])\s*,', r'\1', m) m = re.sub(r'([:,])\s*,', r'\1', m)
@ -1552,7 +1557,7 @@ while line_idx < line_count:
# For scoped and type-based enum, the type has to be removed # For scoped and type-based enum, the type has to be removed
if re.match( if re.match(
r'^\s*Q_DECLARE_FLAGS\s*\(\s*(\w+)\s*,\s*(\w+)\s*\)\s*SIP_MONKEYPATCH_FLAGS_UNNEST\s*\(\s*(\w+)\s*,\s*(\w+)\s*\)\s*$', r'^\s*Q_DECLARE_FLAGS\s*\(\s*(\w+)\s*,\s*(\w+)\s*\)\s*SIP_MONKEYPATCH_FLAGS_UNNEST\s*\(\s*(\w+)\s*,\s*(\w+)\s*\)\s*$',
LINE): LINE):
flags_name = re.search(r'\(\s*(\w+)\s*,\s*(\w+)\s*\)', LINE).group(1) flags_name = re.search(r'\(\s*(\w+)\s*,\s*(\w+)\s*\)', LINE).group(1)
flag_name = re.search(r'\(\s*(\w+)\s*,\s*(\w+)\s*\)', LINE).group(2) flag_name = re.search(r'\(\s*(\w+)\s*,\s*(\w+)\s*\)', LINE).group(2)
emkb = re.search(r'SIP_MONKEYPATCH_FLAGS_UNNEST\s*\(\s*(\w+)\s*,\s*(\w+)\s*\)', LINE).group(1) emkb = re.search(r'SIP_MONKEYPATCH_FLAGS_UNNEST\s*\(\s*(\w+)\s*,\s*(\w+)\s*\)', LINE).group(1)
@ -1607,7 +1612,7 @@ while line_idx < line_count:
_match = None _match = None
if is_scope_based: if is_scope_based:
_match = re.search( _match = re.search(
r'SIP_MONKEYPATCH_SCOPEENUM(_UNNEST)?(:?\(\s*(?P<emkb>\w+)\s*,\s*(?P<emkf>\w+)\s*\))?', LINE) r'SIP_MONKEYPATCH_SCOPEENUM(_UNNEST)?(:?\(\s*(?P<emkb>\w+)\s*,\s*(?P<emkf>\w+)\s*\))?', LINE)
monkeypatch = is_scope_based and _match monkeypatch = is_scope_based and _match
enum_mk_base = _match.group('emkb') if _match else '' enum_mk_base = _match.group('emkb') if _match else ''
@ -1938,7 +1943,9 @@ while line_idx < line_count:
python_signature = detect_and_remove_following_body_or_initializerlist() python_signature = detect_and_remove_following_body_or_initializerlist()
# remove inline declarations # remove inline declarations
match = re.search(r'^(\s*)?(static |const )*(([(?:long )\w:]+(<.*?>)?\s+(\*|&)?)?(\w+)( (?:const*?))*)\s*(\{.*\});(\s*\/\/.*)?$', LINE) match = re.search(
r'^(\s*)?(static |const )*(([(?:long )\w:]+(<.*?>)?\s+(\*|&)?)?(\w+)( (?:const*?))*)\s*(\{.*\});(\s*\/\/.*)?$',
LINE)
if match: if match:
LINE = f"{match.group(1)}{match.group(3)};" LINE = f"{match.group(1)}{match.group(3)};"
@ -1965,7 +1972,7 @@ while line_idx < line_count:
# deleted functions # deleted functions
if re.match( if re.match(
r'^(\s*)?(const )?(virtual |static )?((\w+(<.*?>)?\s+([*&])?)?(\w+|operator.{1,2})\(.*?(\(.*\))*.*\)( const)?)\s*= delete;(\s*//.*)?$', r'^(\s*)?(const )?(virtual |static )?((\w+(<.*?>)?\s+([*&])?)?(\w+|operator.{1,2})\(.*?(\(.*\))*.*\)( const)?)\s*= delete;(\s*//.*)?$',
LINE): LINE):
comment = '' comment = ''
continue continue
@ -1987,7 +1994,7 @@ while line_idx < line_count:
re.match(r'^\s*namespace\s+\w+', LINE) or re.match(r'^\s*namespace\s+\w+', LINE) or
re.match(r'^\s*(virtual\s*)?~', LINE) or re.match(r'^\s*(virtual\s*)?~', LINE) or
detect_non_method_member(LINE) detect_non_method_member(LINE)
)): )):
dbg_info('skipping comment') dbg_info('skipping comment')
if re.search(r'\s*typedef.*?(?!SIP_DOC_TEMPLATE)', LINE): if re.search(r'\s*typedef.*?(?!SIP_DOC_TEMPLATE)', LINE):
dbg_info('because typedef') dbg_info('because typedef')