Report error for constants with non-constant expressions

diff --git a/vala/valaconstant.vala b/vala/valaconstant.vala
index 974fee4241fb53ca79eabf54b7ef7acaed974d2e..fab450c17aaeb1450c2dc20a00bcab71deec45dd 100644 (file)
--- a/vala/valaconstant.vala
+++ b/vala/valaconstant.vala
@@ -1,6 +1,6 @@
 /* valaconstant.vala
  *
- * Copyright (C) 2006-2010  Jürg Billeter
+ * Copyright (C) 2006-2011  Jürg Billeter
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -202,6 +202,12 @@ public class Vala.Constant : Symbol, Lockable {
                                        Report.error (source_reference, "Cannot convert from `%s' to `%s'".printf (value.value_type.to_string (), type_reference.to_string ()));
                                        return false;
                                }
+
+                               if (!value.is_constant ()) {
+                                       error = true;
+                                       Report.error (value.source_reference, "Value must be constant");
+                                       return false;
+                               }
                        }
                } else {
                        if (value != null) {

diff --git a/vala/valainitializerlist.vala b/vala/valainitializerlist.vala
index a6208ced929f002790acc828c8c0bffa1be35240..e99a415f5a4a8577cccc1a30cf9781f720847987 100644 (file)
--- a/vala/valainitializerlist.vala
+++ b/vala/valainitializerlist.vala
@@ -1,6 +1,6 @@
 /* valainitializerlist.vala
  *
- * Copyright (C) 2006-2010  Jürg Billeter
+ * Copyright (C) 2006-2011  Jürg Billeter
  * Copyright (C) 2006-2008  Raffaele Sandrini
  *
  * This library is free software; you can redistribute it and/or
@@ -76,6 +76,15 @@ public class Vala.InitializerList : Expression {
                visitor.visit_initializer_list (this);
        }
 
+       public override bool is_constant () {
+               foreach (Expression initializer in initializers) {
+                       if (!initializer.is_constant ()) {
+                               return false;
+                       }
+               }
+               return true;
+       }
+
        public override bool is_pure () {
                foreach (Expression initializer in initializers) {
                        if (!initializer.is_pure ()) {

diff --git a/vala/valamemberaccess.vala b/vala/valamemberaccess.vala
index e8983185b433850fd1966b6b9be648042fb1e535..f7ebe5acedb76c76a4d378c121eba91cb5ca1db9 100644 (file)
--- a/vala/valamemberaccess.vala
+++ b/vala/valamemberaccess.vala
@@ -1,6 +1,6 @@
 /* valamemberaccess.vala
  *
- * Copyright (C) 2006-2010  Jürg Billeter
+ * Copyright (C) 2006-2011  Jürg Billeter
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -166,8 +166,12 @@ public class Vala.MemberAccess : Expression {
        }
 
        public override bool is_constant () {
+               var method = symbol_reference as Method;
                if (symbol_reference is Constant) {
                        return true;
+               } else if (method != null &&
+                          (method.binding == MemberBinding.STATIC || prototype_access)) {
+                       return true;
                } else {
                        return false;
                }

diff --git a/vala/valaunaryexpression.vala b/vala/valaunaryexpression.vala
index 661a8fb5361461b5a191ad964064303ebf7a1364..930e5ce06bcec11e6955292cddbd62e66e220fc2 100644 (file)
--- a/vala/valaunaryexpression.vala
+++ b/vala/valaunaryexpression.vala
@@ -1,6 +1,6 @@
 /* valaunaryexpression.vala
  *
- * Copyright (C) 2006-2010  Jürg Billeter
+ * Copyright (C) 2006-2011  Jürg Billeter
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -100,6 +100,15 @@ public class Vala.UnaryExpression : Expression {
                        return false;
                }
 
+               if (operator == UnaryOperator.REF || operator == UnaryOperator.OUT) {
+                       var field = inner.symbol_reference as Field;
+                       if (field != null && field.binding == MemberBinding.STATIC) {
+                               return true;
+                       } else {
+                               return false;
+                       }
+               }
+
                return inner.is_constant ();
        }