Changed 'tok_hashf' and 'tok_isequalf' to 'basic_hashf' and 'basic_isequalf'. Both of the functions were all moved to general.c. This is because their behavior is general enough to hash any integer, not just token pointer values.