From 54d4dc626514f5c82f76c0ef6ff8967f6d3269c1 Mon Sep 17 00:00:00 2001 From: Evan Nemerson Date: Sun, 11 Apr 2010 22:39:55 -0700 Subject: [PATCH] vapigen: do not remove all values from enums in custom.vala files --- .../packages/gstreamer-0.10/gstreamer-0.10-custom.vala | 10 +++++----- vapigen/valagidlparser.vala | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala index 48141b50c..a2590474a 100644 --- a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala +++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala @@ -61,7 +61,7 @@ namespace Gst { } public enum EventType { - SOME_RANDOM_VALUE_FOR_VAPIGEN; + __DUMMY__; [CCode (cname = "gst_event_type_get_flags")] public Gst.EventTypeFlags get_flags (); [CCode (cname = "gst_event_type_to_quark")] @@ -71,7 +71,7 @@ namespace Gst { } public enum Format { - SOME_RANDOM_VALUE_FOR_VAPIGEN; + __DUMMY__; [CCode (cname = "gst_format_get_details")] public unowned FormatDefinition get_details (); [CCode (cname = "gst_format_to_quark")] @@ -312,7 +312,7 @@ namespace Gst { } public enum MessageType { - SOME_RANDOM_VALUE_FOR_VAPIGEN; + __DUMMY__; public GLib.Quark to_quark (); public unowned string get_name (); } @@ -357,13 +357,13 @@ namespace Gst { } public enum State { - SOME_RANDOM_VALUE_FOR_VAPIGEN; + __DUMMY__; [CCode (cname = "GST_STATE_GET_NEXT")] public State get_next (State pending); } public enum StateChange { - SOME_RANDOM_VALUE_FOR_VAPIGEN; + __DUMMY__; [CCode (cname = "GST_STATE_TRANSITION")] public static StateChange transition (State cur, State next); [CCode (cname = "GST_STATE_TRANSITION_CURRENT")] diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala index adcaeddf3..8751964dc 100644 --- a/vapigen/valagidlparser.vala +++ b/vapigen/valagidlparser.vala @@ -981,7 +981,11 @@ public class Vala.GIdlParser : CodeVisitor { } else { // ignore dummy enum values in -custom.vala files // they exist for syntactical reasons - en.remove_all_values (); + var dummy = (EnumValue) en.scope.lookup ("__DUMMY__"); + if (dummy != null) { + en.get_values ().remove (dummy); + en.scope.remove ("__DUMMY__"); + } } en.has_type_id = (en_node.gtype_name != null && en_node.gtype_name != ""); -- 2.47.2