Merging branch 'j.check22'  into 'main'.

See merge request !2193

Merging branch 'j.sort2'  into 'main'.

See merge request !2192

Merging branch 'j.tidy1'  into 'main'.

See merge request !2191

Merging branch 'j.854'  into 'main'.

See merge request !2189

# Automatic editing of collection of source files.
# Does not provide backup files:
# to be safe, work on fresh git commit, and use 'git stash' to revert.

import edtools as et
import re, sys

def f(t):
    t = re.sub(r'--(\d)', r'+\1', t)
    t = re.sub(r'\+-(\d)', r'-\1', t)
    t = re.sub(r'\s*\*\s*deg', r'', t)

    t = f'{eval(t)}'

    t = re.sub('\.0$', '', t)

    if t != '0':
        t += '*deg'

    return t

def user_edit(fn, ti):

    t = re.sub(r'OldDetec2D(\s+\w+)?\((n\w*|\d+),\s*([-.0-9]+\s*\*\s*deg|0),\s*([-.0-9]+\s*\*\s*deg|0),\s*(n\w*|\d+),\s*([-.0-9]+\s*\*\s*deg|0),\s*([-.0-9]+\s*\*\s*deg|0)\)',
               r'NewDetec2D\1(@(\4-\3)@, @(\7-\6)@, \2, \5, @(\4+\3)/2@, @(\7+\6)/2@)', ti)
    if t == ti:
        return ti

#    t = re.sub(r'@(\(.*?\)(/2)?)@', f(r'\1'), t)

    for m in re.finditer(r'@(\(.*?\)(/2)?)@', t):
        s = f(m.group(1))
        t = re.sub(r'@(\(.*?\)(/2)?)@', s, t, 1)

    return t

et.ed_argfiles(user_edit)

Merging branch 'm.i331'  into 'main'.

See merge request !2179