Reworked lines numbering, so now error messages are showing correct line
numbers
Fixed macro generation bug, when some lines are duplicated