From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 17 Feb 2025 17:30:20 +0000 (+0100)
Subject: girparser: Handle `doc:format` element in root:repository
X-Git-Tag: 0.56.18~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40fbe5771666af1e508ad1b12744ea1a29ea2b86;p=thirdparty%2Fvala.git

girparser: Handle `doc:format` element in root:repository

See https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/448

Fixes https://gitlab.gnome.org/GNOME/vala/issues/1586
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6186afc50..fbbcd8e48 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -880,6 +880,7 @@ TESTS = \
 	gir/delegate-array-length-type.gir \
 	gir/delegate-closure-destroy-index-conflict.gir \
 	gir/delegate-error-pos.gir \
+	gir/doc-format.gir \
 	gir/enum.gir \
 	gir/errordomain.gir \
 	gir/gtype-struct-name.gir \
diff --git a/tests/gir/doc-format.gir b/tests/gir/doc-format.gir
new file mode 100644
index 000000000..a8b9c3394
--- /dev/null
+++ b/tests/gir/doc-format.gir
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<repository version="1.2" xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
+<include name="GObject" version="2.0"/>
+<include name="GLib" version="2.0"/>
+<include name="Gio" version="2.0"/>
+<package name="test"/>
+<c:include name="test.h"/>
+<doc:format name="unknown"/>
+<namespace name="Test" version="1.0" shared-library="test" c:prefix="Test" c:identifier-prefixes="Test" c:symbol-prefixes="test">
+</namespace>
+</repository>
diff --git a/tests/gir/doc-format.vapi-expected b/tests/gir/doc-format.vapi-expected
new file mode 100644
index 000000000..233d3d8ca
--- /dev/null
+++ b/tests/gir/doc-format.vapi-expected
@@ -0,0 +1,3 @@
+[CCode (cprefix = "Test", gir_namespace = "Test", gir_version = "1.0", lower_case_cprefix = "test_")]
+namespace Test {
+}
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index dde72ee2b..5bfa6284f 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -2057,6 +2057,9 @@ public class Vala.GirParser : CodeVisitor {
 				}
 			} else if (reader.name == "c:include") {
 				parse_c_include ();
+			} else if (reader.name == "doc:format") {
+				//TODO Handle this format information properly
+				skip_element ();
 			} else {
 				// error
 				Report.error (get_current_src (), "unknown child element `%s' in `repository'", reader.name);