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

vala/valagirparser.vala

index 4e9372976ef439be28630c6276bab8a61c31d802..0392a59f03ebb06bdb165ea3a3d5d13162e44678 100644 (file)
@@ -2170,6 +2170,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") {
@@ -2371,6 +2373,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));
@@ -2820,6 +2824,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 {
@@ -2896,6 +2902,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") {
@@ -2956,6 +2964,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") {
@@ -3436,6 +3446,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 {
@@ -3523,6 +3535,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 {