]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
girparser: Handle "function-macro" by skipping them
authorRico Tzschichholz <ricotz@ubuntu.com>
Mon, 22 Jul 2019 07:29:37 +0000 (09:29 +0200)
committerRico Tzschichholz <ricotz@ubuntu.com>
Tue, 6 Aug 2019 11:49:48 +0000 (13:49 +0200)
See https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/159

vala/valagirparser.vala

index 5dc0e39795ef4a659d79a8c98d33f6b8a1533904..b94e1d2d5961f5af33c05ecf4f53e7559d031f92 100644 (file)
@@ -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 {