changed yacc to only manage scope