From d4ad050e4fc0ba6b2e22c1d247ed50f01bfaa7ad Mon Sep 17 00:00:00 2001 From: Nhan Thai Date: Fri, 26 Apr 2019 00:16:07 -0400 Subject: [PATCH 1/4] use normal forkIO instead of Control.Concurrent.Thread.forkIO --- src/Generate/Plugins.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Generate/Plugins.hs b/src/Generate/Plugins.hs index b8b915e..aa6a93d 100644 --- a/src/Generate/Plugins.hs +++ b/src/Generate/Plugins.hs @@ -32,7 +32,7 @@ generatePlugins fp extraTypes net ps = , "import Control.Concurrent.STM (TQueue, atomically, writeTQueue)" , "import Control.Monad (void)" , "import Data.Maybe (fromJust)" - , "import Control.Concurrent.Thread (forkIO, result)\n" + , "import Control.Concurrent (forkIO)" , T.concat $ map (\p -> case p of Plugin n -> T.concat["import qualified Plugins.",n,"\n"] PluginGen n _ -> T.concat["import qualified Plugins.",n,"\n"] From 4ae7d9b79b6926dd13fbede7485d165f283c2b52 Mon Sep 17 00:00:00 2001 From: Nhan Thai Date: Fri, 26 Apr 2019 10:51:40 -0400 Subject: [PATCH 2/4] wrong place, fixed --- ServerTemplate/src/Static/ServerLogic.hs | 2 +- src/Generate/Plugins.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ServerTemplate/src/Static/ServerLogic.hs b/ServerTemplate/src/Static/ServerLogic.hs index b4c8d74..a462ac2 100644 --- a/ServerTemplate/src/Static/ServerLogic.hs +++ b/ServerTemplate/src/Static/ServerLogic.hs @@ -12,7 +12,7 @@ import Data.Text (Text) import Control.Monad.IO.Class (liftIO) import qualified Data.Text as T import qualified Network.WebSockets as WS -import Control.Concurrent.Thread (forkIO, result) +import Control.Concurrent (forkIO, result) import Control.Concurrent.Async (race_) import Control.Exception (finally) import qualified Data.Time.Clock.POSIX as Time diff --git a/src/Generate/Plugins.hs b/src/Generate/Plugins.hs index aa6a93d..489832a 100644 --- a/src/Generate/Plugins.hs +++ b/src/Generate/Plugins.hs @@ -32,7 +32,7 @@ generatePlugins fp extraTypes net ps = , "import Control.Concurrent.STM (TQueue, atomically, writeTQueue)" , "import Control.Monad (void)" , "import Data.Maybe (fromJust)" - , "import Control.Concurrent (forkIO)" + , "import Control.Concurrent.Thread (forkIO, result)" , T.concat $ map (\p -> case p of Plugin n -> T.concat["import qualified Plugins.",n,"\n"] PluginGen n _ -> T.concat["import qualified Plugins.",n,"\n"] From f0edee1e3a736cc1f1608f37ab33cf9ae91dd99b Mon Sep 17 00:00:00 2001 From: Nhan Thai Date: Fri, 26 Apr 2019 10:57:51 -0400 Subject: [PATCH 3/4] updates. --- ServerTemplate/src/Static/ServerLogic.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ServerTemplate/src/Static/ServerLogic.hs b/ServerTemplate/src/Static/ServerLogic.hs index a462ac2..2d27341 100644 --- a/ServerTemplate/src/Static/ServerLogic.hs +++ b/ServerTemplate/src/Static/ServerLogic.hs @@ -12,7 +12,7 @@ import Data.Text (Text) import Control.Monad.IO.Class (liftIO) import qualified Data.Text as T import qualified Network.WebSockets as WS -import Control.Concurrent (forkIO, result) +import Control.Concurrent (forkIO) import Control.Concurrent.Async (race_) import Control.Exception (finally) import qualified Data.Time.Clock.POSIX as Time From 1dd8bfd6ebaa5245a94e8554b5a4d9f64038c86b Mon Sep 17 00:00:00 2001 From: CSchank Date: Mon, 6 May 2019 13:40:56 -0400 Subject: [PATCH 4/4] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 358f136..c097c61 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ elm-stuff/ elm-haskell-state-diagram.cabal dist/ *.cabal +.templates