Merge 5b53737 into 2f0414f

org.uqbar.project.wollok.tests/src/org/uqbar/project/wollok/tests/typesystem/xpect/if.wpgm.xt

@@ -1,5 +1,4 @@
 /* XPECT_SETUP org.uqbar.project.wollok.tests.typesystem.xpect.TypeSystemXpectTestCase END_SETUP */
-
 program p {
 	const n = 23
 

org.uqbar.project.wollok.tests/src/org/uqbar/project/wollok/tests/xpect/BadIfUsage.wlk.xt

@@ -1,5 +1,37 @@
 /* XPECT_SETUP org.uqbar.project.wollok.tests.xpect.WollokXPectTest END_SETUP */
 
+object joaquin {
+	var tocaEnGrupo = false
+	var gradoAlegria 
+
+	// XPECT errors --> "If-statements without else cannot be considered valid expressions as they cannot always yield a value" at "tocaEnGrupo"
+	method habilidadAdquirida() = if (tocaEnGrupo) 5
+
+ 	// XPECT errors --> "Must return a value on every possible flow" at "felicidad"
+	method felicidad() {
+		if (tocaEnGrupo) return 5
+	}
+
+	method inicializar() {
+		// XPECT errors --> "If-statements without else cannot be considered valid expressions as they cannot always yield a value" at "tocaEnGrupo"
+		gradoAlegria = if (tocaEnGrupo) 3
+	}
+
+	// XPECT errors --> "If-statements without else cannot be considered valid expressions as they cannot always yield a value" at "tocaEnGrupo"
+	method felicidadTotal(numero) = numero + if (tocaEnGrupo) 5
+
+	method validarFelicidad() {
+		// XPECT errors --> "If-statements without else cannot be considered valid expressions as they cannot always yield a value" at "tocaEnGrupo"
+		assert.equals(10, if (tocaEnGrupo) 5)
+	}
+
+	method asignarFelicidadSiCorresponde() {
+		if (tocaEnGrupo) {
+			gradoAlegria = gradoAlegria + 10
+		}
+	}
+}
+
 object sarasita {
 
 	method withTheReturnWithinTheBranches(n) {
@@ -99,4 +131,4 @@ object sarasita {
 		// XPECT errors --> "If-statements without else cannot be considered valid expressions as they cannot always yield a value" at "1 == 2"
 		return self.addOneTo(if (1 == 2) 4)
 	}
-}
+}

org.uqbar.project.wollok/src/org/uqbar/project/wollok/model/WollokModelExtensions.xtend

@@ -722,6 +722,8 @@ class WollokModelExtensions {
 	def static dispatch expectsExpression(EObject e) { false }
 	def static dispatch expectsExpression(WBinaryOperation op) { true }
 	def static dispatch expectsExpression(WUnaryOperation op) { true }
+	def static dispatch expectsExpression(WMethodDeclaration m) { m.expressionReturns }
+	def static dispatch expectsExpression(WAssignment m) { true }
 	def static dispatch expectsExpression(WReturnExpression r) { true }
 	def static dispatch expectsExpression(WVariableDeclaration v) { true }
 	def static dispatch expectsExpression(WMemberFeatureCall c) { true }