Update lexer and parser

Using the recently designed grammar to create new lex and yacc rules.