genie: Accept accessibility and async modifiers on "construct" creation methods

Fixes https://gitlab.gnome.org/GNOME/vala/issues/1235

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 51b6fc5845f46378fe0806af536851861928fb58..b40aa51a4b6863d4ad63bb2cd20945e258c61b57 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1159,6 +1159,7 @@ TESTS = \
        version/since-parameter.test \
        genie/case.gs \
        genie/class.gs \
+       genie/class-abstract.gs \
        genie/class-field.gs \
        genie/class-init.gs \
        genie/class-property.gs \

diff --git a/tests/genie/class-abstract.gs b/tests/genie/class-abstract.gs
new file mode 100644 (file)
index 0000000..b7f894b
--- /dev/null
+++ b/tests/genie/class-abstract.gs
@@ -0,0 +1,12 @@
+init
+       print "abstract class"
+
+class abstract Test
+       a:string
+       construct protected()
+               a = "a"
+
+class abstract Test2
+       b:string
+       construct async protected()
+               b = "b"

diff --git a/vala/valagenieparser.vala b/vala/valagenieparser.vala
index 6a3f790a43d68ae5b3c114c811b01f6afae72bc7..2b760b75e62a8fe00868fd2e6344ad7011f2f54a 100644 (file)
--- a/vala/valagenieparser.vala
+++ b/vala/valagenieparser.vala
@@ -3675,7 +3675,7 @@ public class Vala.Genie.Parser : CodeVisitor {
                CreationMethod method;
 
                expect (TokenType.CONSTRUCT);
-               parse_member_declaration_modifiers ();
+               var flags = parse_member_declaration_modifiers ();
 
                if (accept (TokenType.OPEN_PARENS)) {
                        /* create default name using class name */
@@ -3707,9 +3707,21 @@ public class Vala.Genie.Parser : CodeVisitor {
                                method.add_error_type (parse_type (true, false));
                        } while (accept (TokenType.COMMA));
                }
-               method.access = SymbolAccessibility.PUBLIC;
+
+               if (ModifierFlags.PRIVATE in flags) {
+                       method.access = SymbolAccessibility.PRIVATE;
+               } else if (ModifierFlags.PROTECTED in flags) {
+                       method.access = SymbolAccessibility.PROTECTED;
+               } else {
+                       method.access = SymbolAccessibility.PUBLIC;
+               }
+
                set_attributes (method, attrs);
 
+               if (ModifierFlags.ASYNC in flags) {
+                       method.coroutine = true;
+               }
+
                if (accept_block ()) {
                        method.body = parse_block ();
                        method.external = false;