Re-work program structure, MAIN entrypoint + only PROC definitions

1 files changed, 8 insertions, 3 deletions

diff --git a/DSL/Interpretation.hs b/DSL/Interpretation.hs
index 37165c3..d9c53bd 100644
--- a/DSL/Interpretation.hs
+++ b/DSL/Interpretation.hs
@@ -8,6 +8,9 @@ import DSL.Util
 import DSL.Intrinsics
 import DSL.StdLib (stdlib)
 
+entrypoint :: ProcName
+entrypoint = "MAIN"
+
 newMachine :: Machine
 newMachine = Machine { ok=True, stack=[], pTable=M.empty }
 
@@ -93,8 +96,10 @@ evalBlocks (BLinear b:bs) m        = applyLinear m b >>= evalBlocks bs
 evalBlocks (BIf c t f:bs) m        = applyIf c t f m >>= evalBlocks bs
 evalBlocks (BWhile c b:bs) m       = applyWhile c b m >>= evalBlocks bs
 
-interpret :: (ProcTable, Program) -> IO ()
-interpret (t, p) = case mergeProcTables stdlib t of
-  Just t' -> () <$ evalBlocks p newMachine{ pTable=t' }
+interpret :: ProcTable -> IO ()
+interpret t = case mergeProcTables stdlib t of
   Nothing -> putStrLn "Failed to include stdlib, duplicate proc definition?"
+  Just t' -> case M.lookup entrypoint t' of
+    Nothing -> putStrLn "No MAIN proc defined, aborting."
+    Just b  -> () <$ evalBlocks b newMachine{ pTable=t' }