summaryrefslogtreecommitdiff
path: root/vala/valagirparser.vala
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2019-07-22 09:29:37 +0200
committerRico Tzschichholz <ricotz@ubuntu.com>2019-07-22 09:29:37 +0200
commitf51d9dfdaf97ab5b8377d7e5bb78cfc9b232dc86 (patch)
tree492314b5d3319011ed50f15ae2f4a517cf5da898 /vala/valagirparser.vala
parent7249c2158e74c9ff726c610d2426d4e19e944464 (diff)
downloadvala-f51d9dfdaf97ab5b8377d7e5bb78cfc9b232dc86.tar.gz
girparser: Handle "function-macro" by skipping them
See https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/159
Diffstat (limited to 'vala/valagirparser.vala')
-rw-r--r--vala/valagirparser.vala14
1 files changed, 14 insertions, 0 deletions
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 4e9372976..0392a59f0 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -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 {