[#2080] merge typing.cpp