modify ast builder and typebuilder for variable declaration