Adding some changes to the api of the methods and some tests for classes

uqbar-project · Jun 8, 2016 · 490db65 · 490db65
1 parent ed1e6c2
commit 490db65
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 2 deletions.
diff --git a/...oject.wollok.codeGenerator/src/org/uqbar/project/wollok/codeGenerator/model/Context.xtend b/...oject.wollok.codeGenerator/src/org/uqbar/project/wollok/codeGenerator/model/Context.xtend
@@ -1,6 +1,7 @@
 package org.uqbar.project.wollok.codeGenerator.model
 
 import org.eclipse.xtend.lib.annotations.Accessors
+import org.uqbar.project.wollok.codeGenerator.model.types.Type
 import org.uqbar.project.wollok.codeGenerator.model.types.context.TypeContext
 
 interface Context extends Expression {
@@ -31,6 +32,7 @@ abstract class AbstractContext implements Context{
 
 interface MethodContext extends Context {
 	def Variable getReturnVariable()
+	def Type returnTypeFor(TypeContext tc)
 }
 
 @Accessors
@@ -39,6 +41,10 @@ abstract class AbstractCompositeContext extends AbstractContext implements Metho
 	val returnVariable = new Variable(this, "_return");
 
 	override typeFor(TypeContext tc) {
+		throw new UnsupportedOperationException("TODO: auto-generated method stub")
+	}
+
+	override returnTypeFor(TypeContext tc){
 		returnVariable.typeFor(tc)
 	}
 }
diff --git a/...t.wollok.codeGenerator/src/org/uqbar/project/wollok/codeGenerator/model/MessageSend.xtend b/...t.wollok.codeGenerator/src/org/uqbar/project/wollok/codeGenerator/model/MessageSend.xtend
@@ -69,7 +69,7 @@ class DefaultStrategy implements MessageSendStrategy {
 	override type(MessageSend send, MessageSentTypeContext tc) {
 		val method = tc.receiver.classDefinition.getMethodNamed(send.selector)
 		tc.method = method
-		method.typeFor(tc)
+		method.returnTypeFor(tc)
 	}
 
 	override canApply(MessageSend send, MessageSentTypeContext tc) {

diff --git a/....wollok.codeGenerator/src/org/uqbar/project/wollok/codeGenerator/model/NativeMethod.xtend b/....wollok.codeGenerator/src/org/uqbar/project/wollok/codeGenerator/model/NativeMethod.xtend
@@ -18,7 +18,7 @@ class NativeMethod extends Method {
 		this.numberOfParamters = numberOfParameters
 	}
 
-	override typeFor(TypeContext tc) {
+	override returnTypeFor(TypeContext tc) {
 		val javaClassName = DefaultNativeObjectFactory.wollokToJavaFQN(parent.name)
 		val c = Class.forName(javaClassName)
 		val m = c.methods.findFirst [

diff --git a/...bar.project.wollok.tests/src/org/uqbar/project/wollok/tests/codeGenerator/ClassTest.xtend b/...bar.project.wollok.tests/src/org/uqbar/project/wollok/tests/codeGenerator/ClassTest.xtend
@@ -24,4 +24,57 @@ class ClassTest extends AbstractWollokCodeGeneratorTypeInfererTest {
 		assertNativeTypeEquals(NativeTypesEnum.INT, pgm.returnVariable)
 	}
 
+	@Test
+	def void classWithSubclasses() {
+		'''
+			class SuperClass {
+				method yy(){
+					return 32
+				}
+			}
+
+			class MiClase inherits SuperClass{
+				method xx(){
+					return self.yy()
+				}
+			}
+
+			program p {
+				var x = new MiClase()
+				return x.xx()
+			}
+		'''.parseAndPerformAnalysis
+
+		assertClassType(pgm.resolveWollokClass("MiClase".classNameWithSyntheticPackage), pgm.variables.get("x"))
+		assertNativeTypeEquals(NativeTypesEnum.INT, pgm.returnVariable)
+	}
+
+	@Test
+	def void methodInSuperclass() {
+		'''
+			class SuperClass {
+				method yy(){
+					return 32
+				}
+				method zz(){
+					return "asdad"
+				}
+			}
+
+			class MiClase inherits SuperClass{
+				method xx(){
+					return self.yy()
+				}
+			}
+
+			program p {
+				var x = new MiClase()
+				return x.zz()
+			}
+		'''.parseAndPerformAnalysis
+
+		assertClassType(pgm.resolveWollokClass("MiClase".classNameWithSyntheticPackage), pgm.variables.get("x"))
+		assertNativeTypeEquals(NativeTypesEnum.STRING, pgm.returnVariable)
+	}
+
 }