From: Jean Privat <jean@pryen.org>
Date: Wed, 26 Mar 2014 19:44:46 +0000 (-0400)
Subject: typing: AFor store services as CallSite (instead of MMethod)
X-Git-Tag: v0.6.5~2^2~4
X-Git-Url: http://nitlanguage.org

typing: AFor store services as CallSite (instead of MMethod)

Signed-off-by: Jean Privat <jean@pryen.org>
---

diff --git a/src/abstract_compiler.nit b/src/abstract_compiler.nit
index e5d5977..fad8d84 100644
--- a/src/abstract_compiler.nit
+++ b/src/abstract_compiler.nit
@@ -2190,29 +2190,29 @@ redef class AForExpr
 		var cl = v.expr(self.n_expr, null)
 		var it_meth = self.method_iterator
 		assert it_meth != null
-		var it = v.send(it_meth, [cl])
+		var it = v.compile_callsite(it_meth, [cl])
 		assert it != null
 		v.add("for(;;) \{")
 		var isok_meth = self.method_is_ok
 		assert isok_meth != null
-		var ok = v.send(isok_meth, [it])
+		var ok = v.compile_callsite(isok_meth, [it])
 		assert ok != null
 		v.add("if(!{ok}) break;")
 		if self.variables.length == 1 then
 			var item_meth = self.method_item
 			assert item_meth != null
-			var i = v.send(item_meth, [it])
+			var i = v.compile_callsite(item_meth, [it])
 			assert i != null
 			v.assign(v.variable(variables.first), i)
 		else if self.variables.length == 2 then
 			var key_meth = self.method_key
 			assert key_meth != null
-			var i = v.send(key_meth, [it])
+			var i = v.compile_callsite(key_meth, [it])
 			assert i != null
 			v.assign(v.variable(variables[0]), i)
 			var item_meth = self.method_item
 			assert item_meth != null
-			i = v.send(item_meth, [it])
+			i = v.compile_callsite(item_meth, [it])
 			assert i != null
 			v.assign(v.variable(variables[1]), i)
 		else
@@ -2222,7 +2222,7 @@ redef class AForExpr
 		v.add("CONTINUE_{v.escapemark_name(escapemark)}: (void)0;")
 		var next_meth = self.method_next
 		assert next_meth != null
-		v.send(next_meth, [it])
+		v.compile_callsite(next_meth, [it])
 		v.add("\}")
 		v.add("BREAK_{v.escapemark_name(escapemark)}: (void)0;")
 	end
diff --git a/src/typing.nit b/src/typing.nit
index 1744cc7..6f84ef6 100644
--- a/src/typing.nit
+++ b/src/typing.nit
@@ -810,11 +810,11 @@ end
 redef class AForExpr
 	var coltype: nullable MClassType
 
-	var method_iterator: nullable MMethod
-	var method_is_ok: nullable MMethod
-	var method_item: nullable MMethod
-	var method_next: nullable MMethod
-	var method_key: nullable MMethod
+	var method_iterator: nullable CallSite
+	var method_is_ok: nullable CallSite
+	var method_item: nullable CallSite
+	var method_next: nullable CallSite
+	var method_key: nullable CallSite
 
 	private fun do_type_iterator(v: TypeVisitor, mtype: MType)
 	do
@@ -833,7 +833,7 @@ redef class AForExpr
 			v.error(self, "Type Error: 'for' expects a type providing 'iterator' method, got '{mtype}'.")
 			return
 		end
-		self.method_iterator = itdef.mproperty
+		self.method_iterator = itdef
 
 		# check that iterator return something
 		var ittype = itdef.msignature.return_mtype
@@ -890,21 +890,21 @@ redef class AForExpr
 			v.error(self, "Type Error: 'for' expects a method 'is_ok' in 'Iterator' type {ittype}.")
 			return
 		end
-		self.method_is_ok = ikdef.mproperty
+		self.method_is_ok = ikdef
 
 		var itemdef = v.get_method(self, ittype, "item", false)
 		if itemdef == null then
 			v.error(self, "Type Error: 'for' expects a method 'item' in 'Iterator' type {ittype}.")
 			return
 		end
-		self.method_item = itemdef.mproperty
+		self.method_item = itemdef
 
 		var nextdef = v.get_method(self, ittype, "next", false)
 		if nextdef == null then
 			v.error(self, "Type Error: 'for' expects a method 'next' in 'Iterator' type {ittype}.")
 			return
 		end
-		self.method_next = nextdef.mproperty
+		self.method_next = nextdef
 
 		if is_map then
 			var keydef = v.get_method(self, ittype, "key", false)
@@ -912,7 +912,7 @@ redef class AForExpr
 				v.error(self, "Type Error: 'for' expects a method 'key' in 'Iterator' type {ittype}.")
 				return
 			end
-			self.method_key = keydef.mproperty
+			self.method_key = keydef
 		end
 	end