genie: Properly handle plain "get" or "set" property accessors

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index ed3156efe85128dd7a291a3760e487a6b4f789ee..34968c15785b2dc27c7f1e92aa3350002871e1ab 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1212,6 +1212,7 @@ TESTS = \
        version/since-method.test \
        version/since-parameter.test \
        genie/class.gs \
+       genie/class-property.gs \
        genie/control-flow-if-do.gs \
        genie/control-flow-if-else.gs \
        genie/control-flow-if-else-if.gs \

diff --git a/tests/genie/class-property.gs b/tests/genie/class-property.gs
new file mode 100644 (file)
index 0000000..d536a7b
--- /dev/null
+++ b/tests/genie/class-property.gs
@@ -0,0 +1,16 @@
+init
+       var a = new Test()
+       a.foo = "foo"
+       assert( a.foo == "foo" )
+       assert( a.bar == "bar" )
+       a.manam = "manam"
+       assert( a.manam == "manam" )
+
+class Test:Object
+       prop foo:string
+       prop readonly bar:string
+               get
+                       return "bar"
+       prop manam:string
+               owned get
+               set construct

diff --git a/vala/valagenieparser.vala b/vala/valagenieparser.vala
index a9ef565138db629a7dcccb7147d00bb976a4a559..d7f95cda9a1aa9bac30ad684ca59faeaf498b7b4 100644 (file)
--- a/vala/valagenieparser.vala
+++ b/vala/valagenieparser.vala
@@ -3142,6 +3142,8 @@ public class Vala.Genie.Parser : CodeVisitor {
                                        if (accept_block ()) {
                                                block = parse_block ();
                                                prop.external = false;
+                                       } else {
+                                               accept (TokenType.EOL);
                                        }
                                        prop.get_accessor = new PropertyAccessor (true, false, false, value_type, block, get_src (accessor_begin));
                                        set_attributes (prop.get_accessor, attribs);
@@ -3167,6 +3169,8 @@ public class Vala.Genie.Parser : CodeVisitor {
                                        if (accept_block ()) {
                                                block = parse_block ();
                                                prop.external = false;
+                                       } else {
+                                               accept (TokenType.EOL);
                                        }
                                        prop.set_accessor = new PropertyAccessor (false, !readonly, _construct, value_type, block, get_src (accessor_begin));
                                        set_attributes (prop.set_accessor, attribs);