Cleaning up

disco-lang · May 29, 2024 · da0487e · da0487e
1 parent d8ce891
commit da0487e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/pubs/TFPIE23/disco-tfpie23-12-26_09-51.xopp b/pubs/TFPIE23/disco-tfpie23-12-26_09-51.xopp
diff --git a/src/Disco/Interpret/CESK.hs b/src/Disco/Interpret/CESK.hs
@@ -431,7 +431,7 @@ appConst k = \case
     toMaybe = maybe (VInj L VUnit) (VInj R)
   --------------------------------------------------
   -- Randomness
-  
+
   ORandom ->  arity3 $ \v1 v2 v3 -> 
     let (a,g') = R.randomR (vint v2,vint v3) (vgen v1) 
     in out $ VPair (intv a) (genv g')

diff --git a/src/Disco/Typecheck.hs b/src/Disco/Typecheck.hs
@@ -771,9 +771,8 @@ typecheck Infer (TPrim prim) = do
   ----------------------------------------
   -- Randomness
 
-  inferPrim PrimRandom = return $ TyGen :*: (TyN :*: TyN) :->: (TyN :*: TyGen)
+  inferPrim PrimRandom = return $ TyGen :*: TyN :*: TyN :->: (TyN :*: TyGen)
   inferPrim PrimSeed = return $ TyN :->: TyGen
-
   ----------------------------------------
   -- Arithmetic
 

diff --git a/src/Disco/Value.hs b/src/Disco/Value.hs
@@ -505,10 +505,7 @@ prettyValue (_ :+: _) v =
 prettyValue _ (VNum d r) = text $ case (d, denominator r == 1) of
   (Decimal, False) -> prettyDecimal r
   _ -> prettyRational r
-
--- Temporary placement:
-prettyValue _ (VGen g) = text (show g)
-
+prettyValue _ (VGen _) = prettyPlaceholder TyGen
 prettyValue ty@(_ :->: _) _ = prettyPlaceholder ty
 prettyValue (TySet ty) (VBag xs) = braces $ prettySequence ty "," (map fst xs)
 prettyValue (TySet _) v =