Added core constructors

src/Disco/AST/Core.hs

@@ -251,6 +251,10 @@ data Op
   | -- | Not the Boolean `Impl`, but instead a propositional BOp
     -- | Should only be seen and used with Props.
     OImpl
+  | -- | Cool
+    OSeed 
+  | -- | Cool 
+    ORandom
   deriving (Show, Generic, Data, Alpha, Eq, Ord)
 
 -- | Get the arity (desired number of arguments) of a function
@@ -404,3 +408,6 @@ opToStr = \case
   OAnd -> "and"
   OOr -> "or"
   OImpl -> "implies"
+
+  ORandom -> "random"
+  OSeed -> "seed"

src/Disco/Compile.hs

@@ -289,8 +289,8 @@ compilePrim ty PrimConnect = compilePrimErr PrimConnect ty
 compilePrim _ PrimInsert = return $ CConst OInsert
 compilePrim _ PrimLookup = return $ CConst OLookup
 
--- compilePrim _ PrimRandom = return $ CConst ORandom 
--- compilePrim _ PrimSeed = return $ CConst OSeed
+compilePrim _ PrimRandom = return $ CConst ORandom 
+compilePrim _ PrimSeed = return $ CConst OSeed
 
 compilePrim (_ :*: TyList _ :->: _) PrimEach =
   return $

src/Disco/Typecheck.hs

@@ -771,17 +771,8 @@ typecheck Infer (TPrim prim) = do
   ----------------------------------------
   -- Randomness
 
---   inferPrim PrimRandom = return $ TyGen :*: (TyN :*: TyN) :->: (TyGen :*: TyN)
---   inferPrim PrimSeed = return $ TyN :->: TyGen
-
-  inferPrim PrimRandom = do 
-   a <- freshTy 
-   constraint $ CQual QNum a 
-   return $ TyGen :*: (a :*: a) :->: (TyGen :*: a)
-  inferPrim PrimSeed = do 
-   a <- freshTy 
-   constraint $ CQual QNum a 
-   return $ a :->: TyGen
+  inferPrim PrimRandom = return $ TyGen :*: (TyN :*: TyN) :->: (TyGen :*: TyN)
+  inferPrim PrimSeed = return $ TyN :->: TyGen
 
   ----------------------------------------
   -- Arithmetic

src/Disco/Types.hs

@@ -184,7 +184,7 @@ instance Pretty BaseTy where
     CtrBag -> text "Bag"
     CtrSet -> text "Set"
 
-    Gen -> text "gen"
+    Gen -> text "Gen"
 
 -- | Test whether a 'BaseTy' is a container (set, bag, or list).
 isCtr :: BaseTy -> Bool