Delete extra declarations.
Increment yylineno at first match after newline.

This fixes off-by-one line numbers in error messages.
Merge pull request #42 from atgeirr/improve-error-linenums

Improve error linenums