From a93fdb09fbcb9d241544ca8f99bd440a2501c7e0 Mon Sep 17 00:00:00 2001 From: Xavier Mitault Date: Sun, 14 Jan 2024 23:20:10 +0100 Subject: [PATCH] Call typecheck --- lvtc/app/Run.hs | 7 ++++--- lvtc/test/lvt/Test.lvt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lvtc/app/Run.hs b/lvtc/app/Run.hs index 768ccd4..5efb4b8 100644 --- a/lvtc/app/Run.hs +++ b/lvtc/app/Run.hs @@ -21,6 +21,7 @@ import WatLikeToWat (watsLikeToWat) import Wasm (Wasm) import WatToWasm (watToWasm) import WriteWasm (writeWasm) +import TypeCheck (typeCheck) import Args import System.Directory (listDirectory) @@ -90,9 +91,9 @@ getAllFunc v (x : expressions) = p v >> getAllFunc v expressions checkAst :: Bool -> IO [FuncDeclaration] -> IO [FuncDeclaration] checkAst _ funcsIo = funcsIo - >>= (\funcs -> case Just funcs of - Just f -> return f - Nothing -> fail "Invalid Code") + >>= (\funcs -> case typeCheck funcs of + True -> return funcs + False -> fail "Invalid Code") transformToWatLike :: Bool -> IO [FuncDeclaration] -> IO [FuncDeclare] transformToWatLike v funcsIo = diff --git a/lvtc/test/lvt/Test.lvt b/lvtc/test/lvt/Test.lvt index 2681727..4acfa3e 100644 --- a/lvtc/test/lvt/Test.lvt +++ b/lvtc/test/lvt/Test.lvt @@ -1,4 +1,4 @@ -export fn start() -> Char +export fn start() -> Int { @Int a = 0 + 1; @Int b = a - 1;