From: Jean Privat <jean@pryen.org>
Date: Tue, 10 Oct 2017 16:52:03 +0000 (-0400)
Subject: Merge: model: is_accessor
X-Git-Url: http://nitlanguage.org?hp=77090e5d7d0da08075acaf88eeab3dd30cb33df5

Merge: model: is_accessor

Add a way to associate attributes and their getters/setters.

This will be useful for filtering things and groupings properties together.

Pull-Request: #2559
---

diff --git a/src/model/model.nit b/src/model/model.nit
index 47900c5..dc9b978 100644
--- a/src/model/model.nit
+++ b/src/model/model.nit
@@ -2377,6 +2377,29 @@ class MMethod
 	# A specific method that is safe to call on null.
 	# Currently, only `==`, `!=` and `is_same_instance` are safe
 	fun is_null_safe: Bool do return name == "==" or name == "!=" or name == "is_same_instance"
+
+	# Is this method a getter (auto or not)?
+	#
+	# See `getter_for`.
+	fun is_getter: Bool do return getter_for != null
+
+	# The attribute this getter is for
+	#
+	# Return `null` is this method is not a getter.
+	var getter_for: nullable MAttribute = null is writable
+
+	# Is this method a setter (auto or not)?
+	#
+	# See `setter_for`.
+	fun is_setter: Bool do return setter_for != null
+
+	# The attribute this setter is for
+	#
+	# Return `null` is this method is not a setter.
+	var setter_for: nullable MAttribute = null is writable
+
+	# Is this method a getter or a setter?
+	fun is_accessor: Bool do return is_getter or is_setter
 end
 
 # A global attribute
@@ -2385,6 +2408,21 @@ class MAttribute
 
 	redef type MPROPDEF: MAttributeDef
 
+	# Does this attribute have a getter (auto or not)?
+	#
+	# See `getter`.
+	fun has_getter: Bool do return getter != null
+
+	# The getter of this attribute (if any)
+	var getter: nullable MProperty = null is writable
+
+	# Does this attribute have a setter (auto or not)?
+	#
+	# See `setter`.
+	fun has_setter: Bool do return setter != null
+
+	# The setter of this attribute (if any)
+	var setter: nullable MProperty = null is writable
 end
 
 # A global virtual type
@@ -2420,7 +2458,7 @@ abstract class MPropDef
 	# The associated global property
 	var mproperty: MPROPERTY
 
-	redef var location: Location
+	redef var location
 
 	redef fun visibility do return mproperty.visibility
 
diff --git a/src/modelize/modelize_property.nit b/src/modelize/modelize_property.nit
index 8880ef7..de23d04 100644
--- a/src/modelize/modelize_property.nit
+++ b/src/modelize/modelize_property.nit
@@ -1206,6 +1206,12 @@ redef class AAttrPropdef
 		end
 		mclassdef.mprop2npropdef[mreadprop] = self
 
+		var attr_mpropdef = mpropdef
+		if attr_mpropdef != null then
+			mreadprop.getter_for = attr_mpropdef.mproperty
+			attr_mpropdef.mproperty.getter = mreadprop
+		end
+
 		var mreadpropdef = new MMethodDef(mclassdef, mreadprop, self.location)
 		self.mreadpropdef = mreadpropdef
 		modelbuilder.mpropdef2npropdef[mreadpropdef] = self
@@ -1312,6 +1318,11 @@ redef class AAttrPropdef
 		end
 		mclassdef.mprop2npropdef[mwriteprop] = self
 
+		if attr_mpropdef != null then
+			mwriteprop.setter_for = attr_mpropdef.mproperty
+			attr_mpropdef.mproperty.setter = mwriteprop
+		end
+
 		var mwritepropdef = new MMethodDef(mclassdef, mwriteprop, self.location)
 		self.mwritepropdef = mwritepropdef
 		modelbuilder.mpropdef2npropdef[mwritepropdef] = self