Merge pull request #5658 from unisonweb/topic/nice-map-decompile

Maps now decompile as a single call to `Map.fromList`

Author: runarorama

unison-runtime/src/Unison/Runtime/Decompile.hs

@@ -12,13 +12,15 @@ module Unison.Runtime.Decompile
   )
 where
 
+import Data.Map qualified as Map
 import Data.Set (singleton)
 import Unison.ABT (substs)
 import Unison.Codebase.Runtime (Error)
 import Unison.ConstructorReference (GConstructorReference (..))
 import Unison.Prelude
 import Unison.Reference (Reference, pattern Builtin)
 import Unison.Referent (pattern Ref)
+import Unison.Referent qualified as Referent
 import Unison.Runtime.ANF (maskTags)
 import Unison.Runtime.Array
   ( Array,
@@ -38,7 +40,6 @@ import Unison.Runtime.Stack
     USeq,
     UnboxedTypeTag (..),
     Val (..),
-    inflateMap,
     pattern DataC,
     pattern PApV,
   )
@@ -77,6 +78,7 @@ import Unison.Util.Bytes qualified as By
 import Unison.Util.Pretty (indentN, lines, lit, shown, syntaxToColor, wrap)
 import Unison.Util.Text qualified as Text
 import Unison.Var (Var)
+import Unison.Builtin.Decls qualified as DD
 import Prelude hiding (lines)
 
 con :: (Var v) => Reference -> Word64 -> Term v ()
@@ -230,15 +232,29 @@ decompileForeign backref topTerms f
           (decompileBytes . By.fromWord8s $ byteArrayToList a)
   | Just s <- unwrapSeq f =
       list' () <$> traverse (decompile backref topTerms) s
-  | Just m <- maybeUnwrapForeign hmapRef f =
-      decompile backref topTerms . BoxedVal $ inflateMap m
+  | Just m <- maybeUnwrapForeign hmapRef f = do
+      let decompileEntry k v = pair <$> decompile backref topTerms k <*> decompile backref topTerms v
+      kvs <- traverse (uncurry decompileEntry) (Map.toList m)
+      pure $ app () map_fromList (list () kvs)
 decompileForeign _ _ (Wrap r _) =
   err (BadForeign r) $ bug text
   where
     text
       | Builtin name <- r = "<" <> name <> ">"
       | otherwise = "<Foreign>"
 
+map_fromList :: (Var v) => Term v ()
+map_fromList = 
+   case Referent.fromText "#apmvhl40hl48q1s7383g5ev3sh7td8qo374t87bchpnu24sccmnvm13e2a1q0f2p1prm2uk9prfpg598dc9jo23iagact6gmi18vta8" of
+     Just r -> Term.fromReferent () r
+     Nothing -> error "Map_fromList"
+
+pair :: (Var v) => Term v () -> Term v () -> Term v ()
+pair a b =
+  Term.apps' (Term.fromReferent () DD.pairCtorRef) [
+    a, Term.apps' (Term.fromReferent () DD.pairCtorRef) [b, Term.fromReferent () DD.unitCtorRef]
+  ]
+
 decompileBytes :: (Var v) => By.Bytes -> Term v ()
 decompileBytes =
   app () (builtin () $ fromString "Bytes.fromList")

unison-src/transcripts/base_release_transcript.md

@@ -0,0 +1,14 @@
+
+# Testing functions that use the base library
+
+``` ucm
+scratch/main> lib.install @unison/base/releases/3.35.0
+```
+
+This just verifies that a `Map` prints out nicely, as a call to `Map.fromList`:
+
+```unison
+> Map.fromList [("Alice", 1), ("Bob", 2), ("Carol", 3)]
+
+> Map.fromList (List.range 0 25 |> List.map (i -> (i,i)))
+```

unison-src/transcripts/base_release_transcript.output.md

@@ -0,0 +1,61 @@
+# Testing functions that use the base library
+
+``` ucm
+scratch/main> lib.install @unison/base/releases/3.35.0
+
+  I installed @unison/base/releases/3.35.0 as
+  unison_base_3_35_0.
+```
+
+This just verifies that a `Map` prints out nicely, as a call to `Map.fromList`:
+
+``` unison
+> Map.fromList [("Alice", 1), ("Bob", 2), ("Carol", 3)]
+
+> Map.fromList (List.range 0 25 |> List.map (i -> (i,i)))
+```
+
+``` ucm :added-by-ucm
+  Loading changes detected in scratch.u.
+
+  ✅
+
+  scratch.u changed.
+
+  Now evaluating any watch expressions (lines starting with
+  `>`)... Ctrl+C cancels.
+
+    1 | > Map.fromList [("Alice", 1), ("Bob", 2), ("Carol", 3)]
+          ⧩
+          Map.fromList [("Alice", 1), ("Bob", 2), ("Carol", 3)]
+
+    3 | > Map.fromList (List.range 0 25 |> List.map (i -> (i,i)))
+          ⧩
+          Map.fromList
+            [ (0, 0)
+            , (1, 1)
+            , (2, 2)
+            , (3, 3)
+            , (4, 4)
+            , (5, 5)
+            , (6, 6)
+            , (7, 7)
+            , (8, 8)
+            , (9, 9)
+            , (10, 10)
+            , (11, 11)
+            , (12, 12)
+            , (13, 13)
+            , (14, 14)
+            , (15, 15)
+            , (16, 16)
+            , (17, 17)
+            , (18, 18)
+            , (19, 19)
+            , (20, 20)
+            , (21, 21)
+            , (22, 22)
+            , (23, 23)
+            , (24, 24)
+            ]
+```