Combine base,list,contracts

src/Eval.hs

@@ -68,10 +68,14 @@ evalTricu env x = go env (reorderDefs env (map recoverParams (desugarContracts x
   where
     go env' []     = env'
     go env' [def]    =
-      let updatedEnv = evalSingle env' def
+      let updatedEnv = evalSingle (trace ("evaluating: " ++ defName' def) env') def
       in Map.insert "!result" (result updatedEnv) updatedEnv
     go env' (def:xs) =
-      evalTricu (evalSingle env' def) xs
+      evalTricu (evalSingle (trace ("evaluating: " ++ defName' def) env') def) xs
+
+    defName' (SDef name _ _) = name
+    defName' (SDefAnn name _ _ _) = name
+    defName' _ = "<expr>"
 
 evalASTSync :: Env -> TricuAST -> T
 evalASTSync env term = case term of