184,186c184,186
< (?<![\w\.]) # neg. lookbehind assertion: prevent partial matches
< ((%s)(?:\.(\w+))?) # match: operand with optional '.' then suffix
< (?![\w\.]) # neg. lookahead assertion: prevent partial matches
---
> (?<!\w) # neg. lookbehind assertion: prevent partial matches
> ((%s)(?:_([^\W_]+))?) # match: operand with optional '.' then suffix
> (?!\w) # neg. lookahead assertion: prevent partial matches
232c232
< matcher = re.compile(r'Rs(?P<rNum>\d)_or_imm(?P<iNum>\d+)(?P<typeQual>\.\w+)?')
---
> matcher = re.compile(r'Rs(?P<rNum>\d)_or_imm(?P<iNum>\d+)(?P<typeQual>_[^\W_]+)?')