A peer-to-peer stack for code collaboration
Evaluating a dictionary evaluates the keys and the values. (#111)
James Haydon048d378099cc
diff --git a/src/Radicle/Internal/Core.hs b/src/Radicle/Internal/Core.hsindex d21680d..7cc6cf6 100644--- a/src/Radicle/Internal/Core.hs+++ b/src/Radicle/Internal/Core.hs@@ -70,7 +70,7 @@ errorToValue e = case e ofExit -> makeVal ("exit", [])wheremakeA = quote . Atom- makeVal (t,v) = pure (Ident t, Dict $ Map.mapKeys (Atom . Ident) . GhcExts.fromList $ v)+ makeVal (t,v) = pure (Ident t, Dict $ Map.mapKeys (Keyword . Ident) . GhcExts.fromList $ v)newtype Reference = Reference { getReference :: Int }deriving (Show, Read, Ord, Eq, Generic, Serialise)@@ -280,12 +280,11 @@ baseEval val = case val of2(length xs)Dict mp -> do- let evalSnd (a,b) = (a ,) <$> baseEval b- Dict . Map.fromList <$> traverse evalSnd (Map.toList mp)+ let evalBoth (a,b) = (,) <$> baseEval a <*> baseEval b+ Dict . Map.fromList <$> traverse evalBoth (Map.toList mp)autoquote -> pure autoquote--- * Helpersdiff --git a/test/spec/Radicle/Tests.hs b/test/spec/Radicle/Tests.hsindex e609c0f..c7346e7 100644--- a/test/spec/Radicle/Tests.hs+++ b/test/spec/Radicle/Tests.hs@@ -40,6 +40,10 @@ test_eval =let prog2 = [s|(dict 3 1)|]prog2 `succeedsWith` Dict (fromList [(Number 3, Number 1)])+ , testCase "Dicts evaluate both keys are arguments" $ do+ "{(+ 1 1) (+ 1 1)}" `succeedsWith` Dict (fromList [(Number 2, Number 2)])+ "{(+ 1 1) :a (+ 0 2) :b}" `succeedsWith` Dict (fromList [(Number 2, kw "a")])+, testCase "'cons' conses an element" $ dolet prog = [s|(cons #t (list #f))|]prog `succeedsWith` List [Boolean True, Boolean False]