Corrections to boundary metric

Signed-off-by: Ilya Mikhaltsou <morpheby@gmail.com>
Corrections to function/operands parsing

Signed-off-by: Ilya Mikhaltsou <morpheby@gmail.com>