cleaned up data constructors for JCursor

Author: jdegoes

src/Data/Argonaut/JCursor.purs

@@ -19,7 +19,7 @@ module Data.Argonaut.JCursor
   import qualified Data.Array as A
   import qualified Data.StrMap as M
 
-  data JCursor = JCursorTop | JField JCursor String | JIndex JCursor Number
+  data JCursor = JCursorTop | JField String JCursor | JIndex Number JCursor
 
   newtype JsonPrim = JsonPrim (forall a. (JNull -> a) -> (JBoolean -> a) -> (JNumber -> a) -> (JString -> a) -> a)
 
@@ -45,26 +45,26 @@ module Data.Argonaut.JCursor
 
   insideOut :: JCursor -> JCursor
   insideOut JCursorTop = JCursorTop
-  insideOut (JField c i) = downField i (insideOut c)
-  insideOut (JIndex c i) = downIndex i (insideOut c)
+  insideOut (JField i c) = downField i (insideOut c)
+  insideOut (JIndex i c) = downIndex i (insideOut c)
 
   downField :: String -> JCursor -> JCursor
   downField i = downField' where
-    downField' JCursorTop = JField JCursorTop i
-    downField' (JField c i') = JField (downField' c) i'
-    downField' (JIndex c i') = JIndex (downField' c) i'
+    downField' JCursorTop = JField i JCursorTop
+    downField' (JField i' c) = JField i' (downField' c) 
+    downField' (JIndex i' c) = JIndex i' (downField' c)
 
   downIndex :: Number -> JCursor -> JCursor
   downIndex i = downIndex' where
-    downIndex' JCursorTop = JIndex JCursorTop i
-    downIndex' (JField c i') = JField (downIndex' c) i'
-    downIndex' (JIndex c i') = JIndex (downIndex' c) i'
+    downIndex' JCursorTop = JIndex i JCursorTop
+    downIndex' (JField i' c) = JField i' (downIndex' c)
+    downIndex' (JIndex i' c) = JIndex i' (downIndex' c)
 
   cursorGet :: JCursor -> Json -> Maybe Json
   cursorGet JCursorTop = Just
-  cursorGet (JField c i) = foldJsonObject Nothing g where
+  cursorGet (JField i c) = foldJsonObject Nothing g where
     g m = M.lookup i m >>= cursorGet c
-  cursorGet (JIndex c i) = foldJsonArray Nothing g where
+  cursorGet (JIndex i c) = foldJsonArray Nothing g where
     g a = a A.!! i >>= cursorGet c
 
   inferEmpty :: JCursor -> Json
@@ -74,10 +74,10 @@ module Data.Argonaut.JCursor
 
   cursorSet :: JCursor -> Json -> Json -> Maybe Json
   cursorSet JCursorTop   v = Just <<< const v
-  cursorSet (JField c i) v = foldJson (const d) (const d) (const d) (const d) (const d) g where
+  cursorSet (JField i c) v = foldJson (const d) (const d) (const d) (const d) (const d) g where
     d = fromObject <<< M.singleton i <$> cursorSet c v (inferEmpty c)
     g m = fromObject <<< flip (M.insert i) m <$> (cursorSet c v $ fromMaybe (inferEmpty c) (M.lookup i m))
-  cursorSet (JIndex c i) v = foldJson (const d) (const d) (const d) (const d) g (const d) where
+  cursorSet (JIndex i c) v = foldJson (const d) (const d) (const d) (const d) g (const d) where
     d = fromArray <<< flip (A.updateAt i) (const jsonNull <$> A.range 0 i) <$> cursorSet c v (inferEmpty c)
     g a = (cursorSet c v $ fromMaybe (inferEmpty c) (a A.!! i)) >>= setArr a i
 
@@ -95,10 +95,10 @@ module Data.Argonaut.JCursor
                       (\s -> [Tuple JCursorTop $ primStr s])
                       (\a -> let zipped = A.zipWith Tuple (A.range 0 (A.length a - 1)) a
 
-                                 f (Tuple i j) = (\t -> Tuple (JIndex (fst t) i) (snd t)) <$> toPrims j 
+                                 f (Tuple i j) = (\t -> Tuple (JIndex i (fst t)) (snd t)) <$> toPrims j 
 
                              in  zipped >>= f)
-                      (\o -> let f (Tuple i j) = (\t -> Tuple (JField (fst t) i) (snd t)) <$> toPrims j
+                      (\o -> let f (Tuple i j) = (\t -> Tuple (JField i (fst t)) (snd t)) <$> toPrims j
                              in  M.toList o >>= f)
 
   fromPrims :: [Tuple JCursor JsonPrim] -> Maybe Json
@@ -108,16 +108,16 @@ module Data.Argonaut.JCursor
 
   instance showJCursor :: Show JCursor where
     show JCursorTop = ""
-    show (JField c i) = "." ++ i ++ show c
-    show (JIndex c i) = "[" ++ show i ++ "]" ++ show c
+    show (JField i c) = "." ++ i ++ show c
+    show (JIndex i c) = "[" ++ show i ++ "]" ++ show c
 
   instance showJsonPrim :: Show JsonPrim where
     show p = runJsonPrim p show show show show
 
   instance eqJCursor :: Eq JCursor where
     (==) JCursorTop JCursorTop = true
-    (==) (JField c1 i1) (JField c2 i2) = i1 == i2 && c1 == c2
-    (==) (JIndex c1 i1) (JIndex c2 i2) = i1 == i2 && c1 == c2
+    (==) (JField i1 c1) (JField i2 c2) = i1 == i2 && c1 == c2
+    (==) (JIndex i1 c1) (JIndex i2 c2) = i1 == i2 && c1 == c2
     (==) _ _ = false
 
     (/=) a b = not (a == b)
@@ -128,18 +128,18 @@ module Data.Argonaut.JCursor
     compare _ JCursorTop = GT
     compare (JField _ _) (JIndex _ _) = LT
     compare (JIndex _ _) (JField _ _) = GT
-    compare (JField c1 i1) (JField c2 i2) = case compare i1 i2 of
+    compare (JField i1 c1) (JField i2 c2) = case compare i1 i2 of
                                               EQ -> compare c1 c2
                                               x  -> x
-    compare (JIndex c1 i1) (JIndex c2 i2) = case compare i1 i2 of
+    compare (JIndex i1 c1) (JIndex i2 c2) = case compare i1 i2 of
                                               EQ -> compare c1 c2
                                               x  -> x
 
   instance semigroupJCursor :: Semigroup JCursor where
     (<>) a JCursorTop = a
     (<>) JCursorTop b = b
-    (<>) (JField a i) b = JField (a <> b) i
-    (<>) (JIndex a i) b = JIndex (a <> b) i
+    (<>) (JField i a) b = JField i (a <> b)
+    (<>) (JIndex i a) b = JIndex i (a <> b)
 
   instance monoidJCursor :: Monoid JCursor where
     mempty = JCursorTop

src/Data/Argonaut/README.md

@@ -215,8 +215,8 @@
 
     data JCursor where
       JCursorTop :: JCursor
-      JField :: JCursor -> String -> JCursor
-      JIndex :: JCursor -> Number -> JCursor
+      JField :: String -> JCursor -> JCursor
+      JIndex :: Number -> JCursor -> JCursor
 
     newtype JsonPrim where
       JsonPrim :: (forall a. (JNull -> a) -> (JBoolean -> a) -> (JNumber -> a) -> (JString -> a) -> a) -> JsonPrim