Fix ErrorPropagation pass (#132)

passes/src/Luna/Pass/Evaluation/Interpreter.hs

@@ -81,7 +81,7 @@ interpret' :: (MonadRef m, Readers Layer '[AnyExpr // Model, AnyExpr // Type, An
 interpret' glob expr = do
     errors <- getLayer @Errors expr
     hasErrors <- not . null <$> getLayer @Errors expr
-    if hasErrors then return $ lift $ throw $ convert $ head errors ^. Errors.description else matchExpr expr $ \case
+    if hasErrors then return $ return $ LunaError (head errors ^. Errors.description . to convert) else matchExpr expr $ \case
         String s  -> let res = mkString glob (convert s) in return $ return res
         Number a  -> let res = if isInteger a then mkInt glob $ toInt a else mkDouble glob $ toDouble a in return $ return res
         Var name  -> do

passes/src/Luna/Pass/Inference/ErrorPropagation.hs

@@ -27,13 +27,19 @@ run = do
     mapM_ propagateErrors roots
 
 propagateErrors :: (MonadRef m, MonadPassManager m) => Expr Draft -> SubPass ErrorPropagation m ()
-propagateErrors expr = matchExpr expr $ \case
-    Seq a b   -> do
-        propagateErrors =<< source a
-        propagateErrors =<< source b
-    _ -> do
-        inpErrors <- fmap concat $ mapM (getErrors <=< source) =<< inputs expr
-        modifyLayer_ @Errors expr $ nub . (++ inpErrors)
+propagateErrors expr = do
+    let updateErrors e = do
+            inpErrors <- fmap concat $ mapM (getErrors <=< source) =<< inputs e
+            modifyLayer_ @Errors expr $ nub . (++ inpErrors)
+    matchExpr expr $ \case
+        Seq a b   -> do
+            propagateErrors =<< source a
+            propagateErrors =<< source b
+        ASGFunction _ _ g -> do
+            propagateErrors =<< source g
+            updateErrors expr
+        _ -> do
+            updateErrors expr
 
 getErrors :: (MonadRef m, MonadPassManager m) => Expr Draft -> SubPass ErrorPropagation m [CompileError]
 getErrors expr = (++) <$> getLayer @Errors expr <*> (fmap concat $ mapM (getErrors <=< source) =<< inputs expr)