almost fixed yacc declarations