fix bug: just 'return;' returns void

paulzfm · paulzfm · commit b9f1c9eb208a · 2019-09-02T13:05:55.000+08:00
diff --git a/src/main/scala/decaf/typecheck/Typer.scala b/src/main/scala/decaf/typecheck/Typer.scala
@@ -164,7 +164,7 @@ class Typer extends Phase[Tree, Tree]("typer") with Util {
         }
         val actual = e.map(_.typ).getOrElse(VoidType)
         if (actual.noError && !(actual <= expected)) issue(new BadReturnTypeError(expected, actual, stmt.pos))
-        Return(e)(Yes) // returned
+        Return(e)(if (e.isDefined) Yes else No) // returned if it has an expression
 
       case Print(exprs) =>
         val es = exprs.zipWithIndex.map {

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ class Typer extends Phase[Tree, Tree]("typer") with Util {`
`164`	`164`	`}`
`165`	`165`	`val actual = e.map(_.typ).getOrElse(VoidType)`
`166`	`166`	`if (actual.noError && !(actual <= expected)) issue(new BadReturnTypeError(expected, actual, stmt.pos))`
`167`		`- Return(e)(Yes) // returned`
	`167`	`+ Return(e)(if (e.isDefined) Yes else No) // returned if it has an expression`
`168`	`168`
`169`	`169`	`case Print(exprs) =>`
`170`	`170`	`val es = exprs.zipWithIndex.map {`