move json helper functions into Utils.hs

nominolo · Jul 26, 2009 · f82826e · f82826e
1 parent e067cd6
commit f82826e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/lib/Scion/Utils.hs b/lib/Scion/Utils.hs
@@ -25,6 +25,8 @@ import Data.Maybe ( fromMaybe )
 
 import Data.Char (isLower, isUpper)
 
+import Text.JSON
+
 thingsAroundPoint :: (Int, Int) -> [Located n] -> [Located n]
 thingsAroundPoint pt ls = [ l | l <- ls, spans (getLoc l) pt ]
 
@@ -58,6 +60,19 @@ ifM cm tm em = do
   c <- cm
   if c then tm else em
 
+
+------------------------------------------------------------------------
+-- JSON helper functions
+
+lookupKey :: JSON a => JSObject JSValue -> String -> Result a
+lookupKey = flip valFromObj
+
+makeObject :: [(String, JSValue)] -> JSValue
+makeObject = makeObj
+
+------------------------------------------------------------------------------
+
+
 -- an alternative to the broken Fuzzy module
 -- match sH simpleHTTP
 -- match siH simpleHTTP

diff --git a/lib/scion.cabal b/lib/scion.cabal
@@ -28,6 +28,7 @@ library
                    uniplate     == 1.2.*,
                    time         == 1.1.*,
                    filepath     == 1.1.*,
+                   json         == 0.4.*,
                    multiset     == 0.1.*
   hs-source-dirs:  .
   extensions:      CPP, PatternGuards

diff --git a/server/Scion/Server/Commands.hs b/server/Scion/Server/Commands.hs
@@ -59,16 +59,6 @@ import Packages ( pkgIdMap )
 import Distribution.InstalledPackageInfo
 #endif
 
-------------------------------------------------------------------------
-
-lookupKey :: JSON a => JSObject JSValue -> String -> Result a
-lookupKey = flip valFromObj
-
-makeObject :: [(String, JSValue)] -> JSValue
-makeObject = makeObj
-
-------------------------------------------------------------------------------
-
 type KeepGoing = Bool
 
 -- a scion request is JS object with 3 keys: