jyapayne/cppast
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Silently ignore multiple registration of files

Browse source
This commit is contained in:
Jonathan Müller 2017-06-23 14:18:39 +02:00
commit 6dd85cb7a7
5 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/cppast/cpp_entity_index.hpp
View file

@ -17,6 +17,7 @@
namespace cppast
{
class cpp_entity;
class cpp_file;
class cpp_namespace;
/// \exclude
@ -78,10 +79,17 @@ namespace cppast
void register_definition(cpp_entity_id id,
type_safe::object_ref<const cpp_entity> entity) const;
/// \effects Registers a new [cppast::cpp_file]().
/// \returns `true` if the file was not registered before.
/// If it returns `false`, the file was registered before and nothing was changed.
/// \requires The entity must live as long as the index lives.
/// \notes This operation is thread safe.
bool register_file(cpp_entity_id id, type_safe::object_ref<const cpp_file> file) const;
/// \effects Registers a new [cppast::cpp_entity]() which is a declaration.
/// Only the first declaration will be registered.
/// \requires The entity must live as long as the index lives.
/// \requires The entity must not be a namespace.
/// \requires The entity must be forward declarable.
/// \notes This operation is thread safe.
void register_forward_declaration(cpp_entity_id id,
type_safe::object_ref<const cpp_entity> entity) const;

6
include/cppast/cpp_file.hpp
View file

@ -50,11 +50,11 @@ namespace cppast
/// \effects Registers the file in the [cppast::cpp_entity_index]().
/// It will use the file name as identifier.
/// \returns The finished file.
/// \returns The finished file, or `nullptr`, if that file was already registered.
std::unique_ptr<cpp_file> finish(const cpp_entity_index& idx) noexcept
{
idx.register_definition(cpp_entity_id(file_->name()), type_safe::ref(*file_));
return std::move(file_);
auto res = idx.register_file(cpp_entity_id(file_->name()), type_safe::ref(*file_));
return res ? std::move(file_) : nullptr;
}
private:

1
include/cppast/parser.hpp
View file

@ -84,6 +84,7 @@ namespace cppast
/// \effects Parses the given file.
/// \returns The [cppast::cpp_file]() object describing it.
/// It can be `nullptr`, if there was an error or the specified file already registered in the index.
/// \requires The dynamic type of `config` must match the required config type.
std::unique_ptr<cpp_file> parse(const cpp_entity_index& idx, std::string path,
const compile_config& config) const