before pull
solve conflict
before pull
merge Ahmed Abdelmajied
add token type to dfa generator
solve coflict