modify class and method AST builer because of changing grammar