From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 4 Nov 2021 21:34:47 +0000 (+0100)
Subject: genie: Properly handle plain "get" or "set" property accessors
X-Git-Tag: 0.52.8~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0e162f9a2dbc1dc913911d8ebc3ff0724832e35;p=thirdparty%2Fvala.git

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 ed3156efe..34968c157 100644
--- 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
index 000000000..d536a7bf5
--- /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 a9ef56513..d7f95cda9 100644
--- 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);