From a57034a3afa166979bd88232b810dc88c3ae2bae Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 3 Jan 2018 09:19:48 +0100
Subject: Cleanup

---
 assignment-13/C.dcl | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'assignment-13/C.dcl')

diff --git a/assignment-13/C.dcl b/assignment-13/C.dcl
index 1ec912a..40f93d0 100644
--- a/assignment-13/C.dcl
+++ b/assignment-13/C.dcl
@@ -56,13 +56,11 @@ from Util import class print
 	, name   :: String
 	}
 
-:: CG t p = CG (CFun -> (t, CFun))
-
-unCG :: (CG t p) -> CFun -> (t, CFun)
-cg :: (CG t p) -> CFun
-
-(>>-) infixl 1 :: (CG a p) (a -> CG b q) -> CG b q
-return :: (a -> CG a p)
+:: CProg =
+	{ bootstrap :: String
+	, globals   :: [CVar]
+	, funs      :: [CFun]
+	}
 
 instance print Signedness
 instance print CType
@@ -70,3 +68,6 @@ instance print CExpr
 instance print CBody
 instance print CVar
 instance print CFun
+instance print CProg
+
+combinePrograms :: CProg CProg -> CProg
-- 
cgit v1.2.3