Merged changes from feature/scl to master.

[simantics/platform.git] / bundles / org.simantics.scl.data / scl / Data / Json.scl

diff --git a/bundles/org.simantics.scl.data/scl/Data/Json.scl b/bundles/org.simantics.scl.data/scl/Data/Json.scl
index fb034cd57886311de41b4aa8253689ce957c0105..63c51a56bf1637a3d56a90521aa74ed3c5b50522 100644 (file)
--- a/bundles/org.simantics.scl.data/scl/Data/Json.scl
+++ b/bundles/org.simantics.scl.data/scl/Data/Json.scl
@@ -52,8 +52,6 @@ importJava "com.fasterxml.jackson.core.JsonToken" where
     VALUE_NUMBER_INT :: JsonToken\r
     VALUE_STRING :: JsonToken\r
     VALUE_TRUE :: JsonToken\r
     VALUE_NUMBER_INT :: JsonToken\r
     VALUE_STRING :: JsonToken\r
     VALUE_TRUE :: JsonToken\r

-instance Eq JsonToken where\r
-    (==) = Java.equals\r

 \r
 importJava "com.fasterxml.jackson.core.JsonParser" where\r
     data JsonParser\r
 \r
 importJava "com.fasterxml.jackson.core.JsonParser" where\r
     data JsonParser\r


@@ -301,9 +299,7 @@ data Json =
 data JsonField = JsonField String Json\r
   \r
 deriving instance Show Json\r
 data JsonField = JsonField String Json\r
   \r
 deriving instance Show Json\r

-deriving instance Eq Json\r

 deriving instance Show JsonField\r
 deriving instance Show JsonField\r

-deriving instance Eq JsonField\r

 \r
 instance Json Json where\r
     writeJson g (JsonString value) = writeString g value\r
 \r
 instance Json Json where\r
     writeJson g (JsonString value) = writeString g value\r


@@ -366,7 +362,7 @@ makeTypeEqual :: a -> a -> ()
 makeTypeEqual _ _ = ()\r
 \r
 @private\r
 makeTypeEqual _ _ = ()\r
 \r
 @private\r

-testValue :: Json a => Show a => Eq a => a -> <Proc> ()\r
+testValue :: Json a => Show a => a -> <Proc> ()\r

 testValue v1 = do\r
     v2 = toJsonString v1\r
     v3 = fromJsonString v2\r
 testValue v1 = do\r
     v2 = toJsonString v1\r
     v3 = fromJsonString v2\r