[wip] broken cpp_safe_int to cpp+hpp, and test