Merging branch 'j.layout1'  into 'main'.

See merge request !2198

def exec_getters_to_h(fstem, th, tc):

    for m in re.finditer(r'\n(\S+) (\w+)::([a-z]\w*)\(\) const\n{\n    (return m_\w+;)\n}\n+', tc):
        rtyp = m.group(1)
        clas = m.group(2)
        fctn = m.group(3)
        code = m.group(4)

        old = r'(\nclass '+clas+r'.*?\n    '+rtyp+' '+fctn+'\(\) const);'
        th2 = re.sub(old, r'\1 { '+code+' }', th, 1, re.DOTALL)
        if th2 != th:
            tc = tc.replace(m.group(0), '')
            th = th2

    return th, tc

Merging branch 'j.855'  into 'main'.

See merge request !2197

Merging branch 'j.864a'  into 'main'.

See merge request !2196

Merging branch 'j.div'  into 'main'.

See merge request !2195

Merging branch 'j.856'  into 'main'.

See merge request !2194

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