Added Lexer class to driver
Merged
Added lexer support for macros
Added support for comma-syntax