Has there been a change in namespaces since 2024-07-08?

[aral-matrix]

In the OpenXLSX project, I am expanding upon the pugi::xml_node like so:
https://github.com/troldal/OpenXLSX/blob/development-aral/OpenXLSX/headers/XLXmlParser.hpp#L103

In order to have these member functions of OpenXLSX_xml_node : public pugi::xml_node perform adequately, I needed to use pugi::impl::PUGI_IMPL_NODETYPE(n), which for some reason I could not refer to from my module via pugi::impl - despite using pugixml as header only and PUGI_IMPL_NS_BEGIN having no anonymous namespace in that case.

So - forgive my ignorance - I duplicated the definition here:
https://github.com/troldal/OpenXLSX/blob/development-aral/OpenXLSX/sources/XLXmlParser.cpp#L56

#   define PUGI_IMPL_NODETYPE(n) static_cast<pugi::xml_node_type>((n)->header & pugi::impl::xml_memory_page_type_mask)

However, trying the most recent commit of pugixml, I find that now - without any change to the namespace logic that I can see - pugi::impl::xml_memory_page_type_mask is also no longer accessible.

Furthermore, the struct pugi::xml_node_struct definition is no longer understood by the compiler, despite the forward declaration in pugixml.hpp and again no change that I see that would have broken this.

Compiler error example:

OpenXLSX/sources/XLXmlParser.cpp: In member function ‘OpenXLSX::XMLNode OpenXLSX::OpenXLSX_xml_node::next_sibling_of_type(pugi::xml_node_type) const’:
OpenXLSX/sources/XLXmlParser.cpp:191:48: error: invalid use of incomplete type ‘struct pugi::xml_node_struct’
  191 |             pugi::xml_node_struct* next = _root->next_sibling;
      |                                                ^~
In file included from OpenXLSX/sources/XLXmlParser.cpp:48:
OpenXLSX/external/pugixml/pugixml.hpp:305:16: note: forward declaration of ‘struct pugi::xml_node_struct’
  305 |         struct xml_node_struct;

Is someone able to help me navigate the minefield of namespaces here?

[zeux]

Furthermore, the struct pugi::xml_node_struct definition is no longer understood by the compiler

This would happen if header-only mode is not enabled anymore. Nothing changed in pugixml around that so it would be some issue with build configuration on your side.

Separately I would strongly recommend using xml_node::type(), xml_node::previous_sibling() et al instead of relying on pugixml internals and especially instead of redefining internal pugixml macros with an assumed internal memory layout. These may change with no notice or release notes.

[aral-matrix]

Thank you, I am stupid - I copied over the pugixml files from the latest commit for a test, and also overwrote the pugiconfig.hpp - disabling the header-only mode :/

I agree with your recommendation, but was hoping to eventually propose some of the extensions I implemented as an upstream feature. So I wanted to stick very close to your pugixml sources.

Particularly the first_child_of_type, last_child_of_type, previous_sibling_of_type and next_sibling_of_type - if that's something that you might find useful.

Another thing I have almost in a state to commit a pull request would be an ordered insert (e.g. OOXML for MS Office enforces an unnecessary strict order of some element nodes) based on an array of string views that contains all node names for which the strict sequence is relevant. It would be a method that no one needs to call and therefore should not impact performance, but if needed it's convenient to have.

Current code before testing looks like this:

	/**
	 * @brief find the index of s in array_of_strings
	 * @param s search this
	 * @param array_of_strings in this
	 * @param array_size       amount of elements in array_of_strings
	 * @return index of s in array_of_strings
	 * @return array_size if s is not an element of array_of_strings
	 * @note this function uses std::string_view because std::array of this type can be constexpr
	 */
	inline size_t findStringInArray( string_view_t s, const string_view_t *array_of_strings, const size_t array_size )
	{
		for (size_t i = 0; i < array_size; ++i)
			if (s == array_of_strings[ i ]) return i;
		return array_size; // not found
	}

	PUGI_IMPL_FN xml_node xml_node::insert_child_ordered(
		string_view_t name_, const xml_node& node, const std::string_view *node_names, const size_t node_names_count, bool fetch_if_present
	)
	{
		xml_node prev_node = last_child_of_type(node_element);

		size_t node_sort_idx = findStringInArray(name_, node_names, node_names_count);
		if (node_sort_idx < node_names_count) {   // if name_ is contained in node_names
			// try to find via backwards search the first node that must come *before* node
			while (prev_node && findStringInArray(prev_node.name(), node_names, node_names_count) > node_sort_idx)   // stops at node matching node_sort_idx as well
				prev_node = prev_node.previous_sibling_of_type(node_element);
		}
		else { // name_ is not part of node_names
			while (prev_node && !impl::stringview_equal(name_, prev_node.name()))   // try to find an element node matching name_
				prev_node = prev_node.previous_sibling_of_type(node_element);
		}

		if (prev_node.empty())  // if no node to preceeding or matching name_ could be identified -> prepend
			return prepend_child(name_);

		if (fetch_if_present && impl::stringview_equal(name_, prev_node.name()))   // if name_ itself was found & shall be fetched
			return prev_node;                                                          // use existing node

		return insert_child_after(name_, prev_node); // default: insert node after prev_node
	}