Do not allow empty enums and errordomains, fixes bug 543564

2009-01-09  Jürg Billeter  <j@bitron.ch>

	* vala/valaparser.vala:

	Do not allow empty enums and errordomains, fixes bug 543564

svn path=/trunk/; revision=2304

diff --git a/ChangeLog b/ChangeLog
index 38f81c702b50bd741e8c3dbc2e8c9886588f398f..c3abbbb8f36914eb07f1d913b2f96ffe348ba381 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-09  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valaparser.vala:
+
+       Do not allow empty enums and errordomains, fixes bug 543564
+
 2009-01-09  Jürg Billeter  <j@bitron.ch>
 
        * vala/valaflowanalyzer.vala:

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index 13caccc5aac601b82763a8159afff575788ed862..a5a20fdff06e9181b2b46679841d0ecf9bfecc8f 100644 (file)
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -2477,7 +2477,8 @@ public class Vala.Parser : CodeVisitor {
 
                expect (TokenType.OPEN_BRACE);
                do {
-                       if (current () == TokenType.CLOSE_BRACE) {
+                       if (current () == TokenType.CLOSE_BRACE
+                           && en.get_values ().size > 0) {
                                // allow trailing comma
                                break;
                        }
@@ -2534,7 +2535,8 @@ public class Vala.Parser : CodeVisitor {
 
                expect (TokenType.OPEN_BRACE);
                do {
-                       if (current () == TokenType.CLOSE_BRACE) {
+                       if (current () == TokenType.CLOSE_BRACE
+                           && ed.get_codes ().size > 0) {
                                // allow trailing comma
                                break;
                        }