_anon_decls -> _decl_map, fix add_decl() bug
work on C++ stuff