Cyclic dependences solved; yylineno argument added to DictAddItem calls in scanner.l