flex, new input and makefile
added more rules to bison