Added function frags

vasilescur · Apr 10, 2020 · 2fd3e12 · 2fd3e12
1 parent d1c5502
commit 2fd3e12
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/semant/.cm/amd64-unix/semant.sml b/semant/.cm/amd64-unix/semant.sml
diff --git a/semant/semant.sml b/semant/semant.sml
@@ -166,15 +166,18 @@ struct
                             end
                       val formals = List.foldl paramToFormal [] params
                       val newVenv = #venv (List.foldl addParam {tenv=tenv, venv=venv} params)
-                      val bodyType = transExp (level, breakLabel, newVenv, tenv) body
+                      val bodyExpty = transExp (level, breakLabel, newVenv, tenv) body
                       val newLabel = Temp.newlabel ()
+                      val nextLevel = R.nextLevel (level, newLabel, paramsToEscapes (params, []))
+                      val _ = R.procedureEntryExit (nextLevel, #exp bodyExpty)
                   in case result of 
-                      NONE => {tenv=tenv, venv= S.enter (venv, name, E.FunEntry {level=R.nextLevel (level, newLabel, paramsToEscapes (params, [])), label=newLabel, formals=formals, result= #ty bodyType})}
-                    | SOME (resultSym, resultPos) => (checkTypesEq (#ty bodyType, findType (resultSym, tenv), resultPos, "Function return type does not match body type check"); {tenv=tenv, venv=venv})
+                      NONE => {tenv=tenv, venv= S.enter (venv, name, E.FunEntry {level=nextLevel, label=newLabel, formals=formals, result= #ty bodyExpty})}
+                    | SOME (resultSym, resultPos) => (checkTypesEq (#ty bodyExpty, findType (resultSym, tenv), resultPos, "Function return type does not match body type check"); {tenv=tenv, venv=venv})
                     (* Need procedureEntryExit call? *)
                   end
             val newVenv = List.foldl addFuncSig venv functions
-        in {exps=[], tenv=tenv, venv= #venv (List.foldl transFunDec {tenv=tenv, venv=newVenv} functions)}
+            val funDecs = (List.foldl transFunDec {tenv=tenv, venv=newVenv} functions)
+        in {exps= [], tenv=tenv, venv= #venv funDecs}
         end
 
     and transExp(level, breakLabel, venv, tenv) =