codegen: Use CCodeConstant for member access of constant symbol

This broke assumptions in CCodeBaseModule.is_constant_ccode_expression()

diff --git a/codegen/valaccodememberaccessmodule.vala b/codegen/valaccodememberaccessmodule.vala
index ae9fca482194f602253d92ca774ecb7682442da1..f8161b94780389e07beba15150fb5b456a64c564 100644 (file)
--- a/codegen/valaccodememberaccessmodule.vala
+++ b/codegen/valaccodememberaccessmodule.vala
@@ -186,7 +186,7 @@ public abstract class Vala.CCodeMemberAccessModule : CCodeControlFlowModule {
                                }
                                set_cvalue (expr, new CCodeConstant ("\"%s\"".printf (s)));
                        } else {
-                               set_cvalue (expr, new CCodeIdentifier (get_ccode_name (c)));
+                               set_cvalue (expr, new CCodeConstant (get_ccode_name (c)));
                        }
 
                        if (array_type != null) {

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 23a84204cb5f644312568af672b3eb278eb059f9..b08700f11a07cb9bd26ec4ba391941a4bb29b1b3 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1013,6 +1013,7 @@ TESTS = \
        semantic/errordomain-empty.test \
        semantic/field-accessibility.test \
        semantic/field-compact-static.test \
+       semantic/field-constant.vala \
        semantic/field-external.test \
        semantic/field-incompatible.test \
        semantic/field-interface.test \

diff --git a/tests/semantic/field-constant.vala b/tests/semantic/field-constant.vala
new file mode 100644 (file)
index 0000000..43162dc
--- /dev/null
+++ b/tests/semantic/field-constant.vala
@@ -0,0 +1,5 @@
+double foo = GLib.Math.PI;
+
+void main () {
+       assert (foo == GLib.Math.PI);
+}