From 6b3eaeb737f026a76fa6f2c5439f901947ad0a58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frederik=20Hangh=C3=B8j=20Iversen?= <fhi.1990@gmail.com>
Date: Wed, 16 Oct 2019 22:43:19 +0200
Subject: [PATCH] Simplify `application` a bit

---
 src/Rubyhs/References.hs | 42 ++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/Rubyhs/References.hs b/src/Rubyhs/References.hs
index 014ed98..e272ca7 100644
--- a/src/Rubyhs/References.hs
+++ b/src/Rubyhs/References.hs
@@ -104,7 +104,7 @@ deriving newtype instance ToJSON Context
 
 class Monad m => MyMonad (m :: Type -> Type) where
   declaration :: Node -> m ()
-  application :: Node -> Node -> m ()
+  application :: Node -> m ()
   getContext :: m Context
   writeContext :: Context -> m ()
 
@@ -131,10 +131,12 @@ instance MyMonad (State Env) where
     where
     go :: Env -> Env
     go env@Env{declarations} = env { declarations = Set.insert q declarations }
-  application q n = modify go
-    where
-    go :: Env -> Env
-    go env@Env{applications} = env { applications = Map.insertWith mappend q (Set.singleton n) applications }
+  application n = do
+    Context c <- getContext
+    let
+      go env@Env{applications}
+        = env { applications = Map.insertWith mappend c (Set.singleton n) applications }
+    modify go
   getContext = gets context
   writeContext q = modify go
     where
@@ -206,18 +208,17 @@ instance References Ruby.Anything where
   entries = const $ pure ()
 
 instance References Ruby.Namespace where
-  entries = \case
-    Ruby.Namespace xs -> do
-      Context c <- getContext
-      let
-        ctxt = case c of
-          NodeFunction FQN{namespace} -> namespace
-          NodeModule namespace -> namespace
-        -- TODO Hacky:
-        ns = Namespace ((\(Name (Aeson.String t)) -> t) <$> xs)
-      -- TODO: Broken
-      -- application c (NodeModule $ ctxt `onTop` ns)
-      application c (NodeModule $ ns)
+  entries (Ruby.Namespace xs) = do
+    Context c <- getContext
+    let
+      ctxt = case c of
+        NodeFunction FQN{namespace} -> namespace
+        NodeModule namespace -> namespace
+      -- TODO Hacky:
+      ns = Namespace ((\(Name (Aeson.String t)) -> t) <$> xs)
+    -- TODO: Broken
+    -- application c (NodeModule $ ctxt `onTop` ns)
+    application (NodeModule $ ns)
 
 instance References Module where
   entries Module{name, block} = do
@@ -256,14 +257,9 @@ onTop (Namespace xs) (Namespace ys) = Namespace $ reverse $ reverse xs `onTop'`
 
 instance References Send where
   entries Send{namespace, name} = do
-    Context c <- getContext
-    let
-      ctxt = case c of
-        NodeFunction FQN{namespace = ns} -> ns
-        NodeModule ns -> ns
     -- TODO: Broken
     -- application c $ NodeFunction $ qual (ctxt `onTop` fromNS namespace) name
-    application c $ NodeFunction $ qual (fromNS namespace) name
+    application $ NodeFunction $ qual (fromNS namespace) name
     where
     fromNS :: Ruby.Namespace -> Namespace
     fromNS (Ruby.Namespace l) = Namespace $ go <$> l