implement a bunch of object natives

pact-core-tests/pact-tests/ops.repl

@@ -7,10 +7,10 @@
 (expect "+ decimal decimal" 7.0 (+ 1.2 5.8))
 (expect "+ string string" "foobar" (+ "foo" "bar"))
 (expect "+ list list" [1 2 3 4 5] (+ [1 2 3] [4 5]))
-;  (expect "+ object object" { "a": 2, "b": 4, "c": false}
-;    (+ { "a": 2 } { "b": 4, "c": false}))
-;  (expect "+ object object, left-biased merge" { "a": 4}
-;    (+ { "a": 4} {"a": true}))
+(expect "+ object object" { "a": 2, "b": 4, "c": false}
+  (+ { "a": 2 } { "b": 4, "c": false}))
+(expect "+ object object, left-biased merge" { "a": 4}
+  (+ { "a": 4} {"a": true}))
 ;  (expect-failure "+ integer string" (+ 2 "hello"))
 ;  (expect-failure "+ list string" (+ [2] "hello"))
 ;  (expect-failure "+ object decimal" (+ {'a: 4} 1.0))
@@ -435,11 +435,11 @@
 (expect "not != list list" false (!= [1 2 3] [1 2 3]))
 (expect "!= list list" true (!= [1 3 2] [1 2 3]))
 
-;  "===== object equality"
-;  (expect "= object object" true (= { "a": 1 } { "a": 1 }))
-;  (expect "not = object object" false (= { "a": 1 } { "a": 1, "b": 2 }))
-;  (expect "not != object object" false (!= { "a": 1 } { "a": 1 }))
-;  (expect "!= object object" true (!= { "a": 1 } { "a": 1, "b": 2 }))
+"===== object equality"
+(expect "= object object" true (= { "a": 1 } { "a": 1 }))
+(expect "not = object object" false (= { "a": 1 } { "a": 1, "b": 2 }))
+(expect "not != object object" false (!= { "a": 1 } { "a": 1 }))
+(expect "!= object object" true (!= { "a": 1 } { "a": 1, "b": 2 }))
 
 ;  "===== keyset equality"
 ;  (env-data { "k1": ["k1"], "k2": ["k2"] })

pact-core.cabal

@@ -38,6 +38,7 @@ common pact-core-common
     , transformers
     , text
     , vector
+    , vector-algorithms
     , megaparsec
     , cryptonite
     , memory

pact-core/Pact/Core/Builtin.hs

@@ -195,6 +195,10 @@ data RawBuiltin
   | RawDrop
   | RawConcat
   | RawReverse
+  | RawContains
+  | RawSort
+  | RawSortObject
+  | RawRemove
   -- General
   | RawMod
   | RawMap
@@ -218,7 +222,7 @@ data RawBuiltin
   | RawEnforceGuard
   | RawKeysetRefGuard
   -- | RawCreateUserGuard
-  | RawListAccess
+  | RawAt
   | RawMakeList
   | RawB64Encode
   | RawB64Decode
@@ -273,6 +277,10 @@ rawBuiltinToText = \case
   -- general
   RawMap -> "map"
   RawFilter -> "filter"
+  RawContains -> "contains"
+  RawSort -> "sort"
+  RawSortObject -> "sort-object"
+  RawRemove -> "remove"
   -- RawIf -> "if"
   RawIntToStr -> "int-to-str"
   RawStrToInt -> "str-to-int"
@@ -291,7 +299,7 @@ rawBuiltinToText = \case
   RawEnforceGuard -> "enforce-guard"
   RawKeysetRefGuard -> "keyset-ref-guard"
   -- RawCreateUserGuard -> "create-user-guard"
-  RawListAccess -> "at"
+  RawAt -> "at"
   RawMakeList -> "make-list"
   RawB64Encode -> "base64-encode"
   RawB64Decode -> "base64-decode"
@@ -340,6 +348,10 @@ instance BuiltinArity RawBuiltin where
     RawDrop -> 2
     RawConcat -> 1
     RawReverse -> 1
+    RawContains -> 2
+    RawSort -> 1
+    RawSortObject -> 2
+    RawRemove -> 2
     -- General ->
     RawMod -> 2
     RawMap -> 2
@@ -363,7 +375,7 @@ instance BuiltinArity RawBuiltin where
     RawEnforceGuard -> 1
     RawKeysetRefGuard -> 1
     -- RawCreateUserGuard -> 1
-    RawListAccess -> 2
+    RawAt -> 2
     RawMakeList -> 2
     RawB64Encode -> 1
     RawB64Decode -> 1

pact-core/Pact/Core/Compile.hs

@@ -27,6 +27,7 @@ import Pact.Core.Names
 import Pact.Core.IR.Desugar
 import Pact.Core.Errors
 import Pact.Core.Pretty
+import Pact.Core.Type
 import Pact.Core.IR.Term
 import Pact.Core.PactValue
 
@@ -62,7 +63,7 @@ data CompileValue b
 
 newtype Interpreter b s m
   = Interpreter {
-    _interpret :: HasCompileEnv b s m => Term Name b SpanInfo -> m InterpretValue
+    _interpret :: HasCompileEnv b s m => Term Name Type b SpanInfo -> m InterpretValue
   }
 
 
@@ -88,7 +89,7 @@ interpretTopLevel
   :: (HasCompileEnv b s m)
   => PactDb b SpanInfo
   -> Interpreter b s m
-  -> DesugarOutput b SpanInfo (TopLevel Name b SpanInfo)
+  -> DesugarOutput b SpanInfo (TopLevel Name Type b SpanInfo)
   -> m (CompileValue b)
 interpretTopLevel pdb interp (DesugarOutput ds lo0 deps) = do
   loaded .= lo0

pact-core/Pact/Core/Errors.hs

@@ -18,7 +18,6 @@ module Pact.Core.Errors
 import Control.Lens hiding (ix)
 import Control.Exception
 import Data.Text(Text)
-import Data.Void
 import Data.Dynamic (Typeable)
 
 import Pact.Core.Type
@@ -227,7 +226,7 @@ instance Pretty DesugarError where
 -- instance Exception OverloadError
 
 data ArgTypeError
-  = ATEType (Type Void)
+  = ATEType Type
   | ATEClosure
   deriving (Show)