Abstract DFA class has been extracted, leaving Token DFA. The Grammar DFA will be able to extend DFA.
Merge remote-tracking branch 'origin/master'