support for @:mapping
added Lexer.eof
moved test files to test