From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Tue, 5 Nov 2019 09:07:49 +0000 (+0100)
Subject: vala: Write value of constants/enums in fast-vapi if they are constant only
X-Git-Tag: 0.44.10~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaadffbbbf7f38ff70fa37dd51bdd3eecd48c80e;p=thirdparty%2Fvala.git

vala: Write value of constants/enums in fast-vapi if they are constant only

Introduced by 89a1243a4f066cc9652b26f86eb94fd038874982

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

diff --git a/vala/valacodewriter.vala b/vala/valacodewriter.vala
index cd3f79ec8..89982de8b 100644
--- a/vala/valacodewriter.vala
+++ b/vala/valacodewriter.vala
@@ -445,7 +445,7 @@ public class Vala.CodeWriter : CodeVisitor {
 			write_indent ();
 			write_identifier (ev.name);
 
-			if (type == CodeWriterType.FAST && ev.value != null) {
+			if (type == CodeWriterType.FAST && ev.value != null && ev.value.is_constant ()) {
 				write_string(" = ");
 				ev.value.accept (this);
 			}
@@ -557,7 +557,7 @@ public class Vala.CodeWriter : CodeVisitor {
 		write_string (" ");
 		write_identifier (c.name);
 		write_type_suffix (c.type_reference);
-		if (type == CodeWriterType.FAST && c.value != null) {
+		if (type == CodeWriterType.FAST && c.value != null && c.value.is_constant ()) {
 			write_string(" = ");
 			c.value.accept (this);
 		}