refactoring out unstable values

icdevsorg · Jul 8, 2022 · 9594520 · 9594520
1 parent b3e83cb
commit 9594520
Show file tree

Hide file tree

Showing 8 changed files with 188 additions and 1,103 deletions.
diff --git a/package-set.dhall b/package-set.dhall
@@ -3,17 +3,25 @@ let Package =
     { name : Text, version : Text, repo : Text, dependencies : List Text }
 
 let
-  -- This is where you can add your own packages to the package-set
   additions =
-    [] : List Package
+    [{ name = "stablerbtree"
+      , repo = "https://github.com/skilesare/StableRBTree"
+      , version = "v0.6.1"
+      , dependencies = [ "base"]
+      },
+      { name = "stablebuffer"
+      , repo = "https://github.com/skilesare/StableBuffer"
+      , version = "v0.2.0"
+      , dependencies = [ "base"]
+      }] : List Package
 
 let
   {- This is where you can override existing packages in the package-set
 
      For example, if you wanted to use version `v2.0.0` of the foo library:
      let overrides = [
          { name = "foo"
-         , version = "v2.0.0"
+         , version = "v2.0"
          , repo = "https://github.com/bar/foo"
          , dependencies = [] : List Text
          }

diff --git a/src/clone.mo b/src/clone.mo
@@ -13,19 +13,20 @@
 import Types "types";
 import Array "mo:base/Array";
 
+import SB "mo:stablebuffer/StableBuffer";
+
 module {
 
         type CandyValue = Types.CandyValue;
-        type CandyValueUnstable = Types.CandyValueUnstable;
-        type PropertyUnstable = Types.PropertyUnstable;
+        type Property = Types.Property;
 
 
-        public func cloneValueUnstable(val : CandyValueUnstable) : CandyValueUnstable{
+        public func clone(val : CandyValue) : CandyValue{
             switch(val){
                 case(#Class(val)){
 
-                    return #Class(Array.tabulate<PropertyUnstable>(val.size(), func(idx){
-                        {name= val[idx].name; value=cloneValueUnstable(val[idx].value); immutable = val[idx].immutable};
+                    return #Class(Array.tabulate<Property>(val.size(), func(idx){
+                        {name= val[idx].name; value=clone(val[idx].value); immutable = val[idx].immutable};
                     }));
                 };
                 case(#Bytes(val)){
@@ -36,7 +37,43 @@ module {
                         };
                         case(#thawed(val)){
 
-                            #Bytes(#thawed(val.clone()));
+                            #Bytes(#thawed(SB.clone<Nat8>(val)));
+                        };
+                    }
+                };
+                case(#Nats(val)){
+                    switch(val){
+                        case(#frozen(val)){
+
+                            #Nats(#frozen(val));
+                        };
+                        case(#thawed(val)){
+
+                            #Nats(#thawed(SB.clone<Nat>(val)));
+                        };
+                    }
+                };
+                case(#Floats(val)){
+                    switch(val){
+                        case(#frozen(val)){
+
+                            #Floats(#frozen(val));
+                        };
+                        case(#thawed(val)){
+
+                            #Floats(#thawed(SB.clone<Float>(val)));
+                        };
+                    }
+                };
+                case(#Array(val)){
+                    switch(val){
+                        case(#frozen(val)){
+
+                            #Array(#frozen(val));
+                        };
+                        case(#thawed(val)){
+
+                            #Array(#thawed(SB.clone<CandyValue>(val)));
                         };
                     }
                 };