From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 22 Jul 2019 07:29:37 +0000 (+0200)
Subject: girparser: Handle "function-macro" by skipping them
X-Git-Tag: 0.36.20~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f472bf1f7c816a56e10cbcfa712ce84b8454a2cf;p=thirdparty%2Fvala.git

girparser: Handle "function-macro" by skipping them

See https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/159
---

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 5dc0e3979..b94e1d2d5 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -2151,6 +2151,8 @@ public class Vala.GirParser : CodeVisitor {
 				parse_bitfield ();
 			} else if (reader.name == "function") {
 				parse_method ("function");
+			} else if (reader.name == "function-macro") {
+				skip_element ();
 			} else if (reader.name == "callback") {
 				parse_callback ();
 			} else if (reader.name == "record") {
@@ -2353,6 +2355,8 @@ public class Vala.GirParser : CodeVisitor {
 				}
 			} else if (reader.name == "function") {
 				skip_element ();
+			} else if (reader.name == "function-macro") {
+				skip_element ();
 			} else {
 				// error
 				Report.error (get_current_src (), "unknown child element `%s' in `%s'".printf (reader.name, element_name));
@@ -2810,6 +2814,8 @@ public class Vala.GirParser : CodeVisitor {
 				parse_method ("method");
 			} else if (reader.name == "function") {
 				skip_element ();
+			} else if (reader.name == "function-macro") {
+				skip_element ();
 			} else if (reader.name == "union") {
 				parse_union ();
 			} else {
@@ -2887,6 +2893,8 @@ public class Vala.GirParser : CodeVisitor {
 				parse_constructor ();
 			} else if (reader.name == "function") {
 				parse_method ("function");
+			} else if (reader.name == "function-macro") {
+				skip_element ();
 			} else if (reader.name == "method") {
 				parse_method ("method");
 			} else if (reader.name == "virtual-method") {
@@ -2949,6 +2957,8 @@ public class Vala.GirParser : CodeVisitor {
 				parse_method ("virtual-method");
 			} else if (reader.name == "function") {
 				parse_method ("function");
+			} else if (reader.name == "function-macro") {
+				skip_element ();
 			} else if (reader.name == "method") {
 				parse_method ("method");
 			} else if (reader.name == "glib:signal") {
@@ -3405,6 +3415,8 @@ public class Vala.GirParser : CodeVisitor {
 				}
 			} else if (reader.name == "function") {
 				skip_element ();
+			} else if (reader.name == "function-macro") {
+				skip_element ();
 			} else if (reader.name == "union") {
 				parse_union ();
 			} else {
@@ -3493,6 +3505,8 @@ public class Vala.GirParser : CodeVisitor {
 				parse_method ("method");
 			} else if (reader.name == "function") {
 				skip_element ();
+			} else if (reader.name == "function-macro") {
+				skip_element ();
 			} else if (reader.name == "record") {
 				parse_record ();
 			} else {