From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Fri, 30 Nov 2018 15:43:42 +0000 (+0100)
Subject: codegen: Emit initializer for enum-value into wanted declaration space
X-Git-Tag: 0.43.1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5d3e0f3fdafaf85689896b2ee64e707f1fbc0fe;p=thirdparty%2Fvala.git

codegen: Emit initializer for enum-value into wanted declaration space

Fixes https://gitlab.gnome.org/GNOME/vala/issues/167
---

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index d25c85f3a..879d4fb23 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -825,6 +825,9 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 
 		cenum.modifiers |= (en.version.deprecated ? CCodeModifiers.DEPRECATED : 0);
 
+		var current_cfile = cfile;
+		cfile = decl_space;
+
 		int flag_shift = 0;
 		foreach (EnumValue ev in en.get_values ()) {
 			CCodeEnumValue c_ev;
@@ -842,6 +845,8 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 			cenum.add_value (c_ev);
 		}
 
+		cfile = current_cfile;
+
 		decl_space.add_type_definition (cenum);
 		decl_space.add_type_definition (new CCodeNewline ());