parser: `owned` is not allowed on Constants

This avoids criticals and broken c-code.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 959af3728c1ceab50d1d446656b1a0b6e75db342..180c22e974a8e0df1a48a19efed1612b517e7d22 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -526,6 +526,8 @@ TESTS = \
        parser/assignment.vala \
        parser/attribute-duplicate.test \
        parser/attribute-wrong-number.test \
+       parser/constant-owned.test \
+       parser/constant-local-owned.test \
        parser/constructor-class-exists.test \
        parser/constructor-exists.test \
        parser/constructor-no-new.test \

diff --git a/tests/parser/constant-local-owned.test b/tests/parser/constant-local-owned.test
new file mode 100644 (file)
index 0000000..c8d6964
--- /dev/null
+++ b/tests/parser/constant-local-owned.test
@@ -0,0 +1,5 @@
+Invalid Code
+
+void main () {
+       const owned string FOO = "foo";
+}

diff --git a/tests/parser/constant-owned.test b/tests/parser/constant-owned.test
new file mode 100644 (file)
index 0000000..41e7ed2
--- /dev/null
+++ b/tests/parser/constant-owned.test
@@ -0,0 +1,6 @@
+Invalid Code
+
+const owned string FOO = "foo";
+
+void main () {
+}

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index c2fe002d36076bf15717439e7e2707a8982b6219..0e14307ffc4ee4f52bba0c19a27f417f8453c887 100644 (file)
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -1883,6 +1883,10 @@ public class Vala.Parser : CodeVisitor {
                expect (TokenType.ASSIGN);
                var initializer = parse_expression ();
 
+               if (type.value_owned) {
+                       Report.error (src, "`owned' is not allowed on constants");
+               }
+
                return new Constant (id, type, initializer, src);
        }
 
@@ -2642,6 +2646,10 @@ public class Vala.Parser : CodeVisitor {
                        Report.warning (c.source_reference, "the modifier `static' is not applicable to constants");
                }
 
+               if (type.value_owned) {
+                       Report.error (c.source_reference, "`owned' is not allowed on constants");
+               }
+
                if (accept (TokenType.ASSIGN)) {
                        c.value = parse_expression ();
                }