* data/skeletons/glr2.cc: Define value_type and location_type where needed, and use them only. (yyuserMerge): Make it a member function of the glr_state class.