fixed maps:get, maps:put, Map.put, Map.get broken

vans163 · vans163 · commit 77e46e49c536 · 2017-09-14T15:53:33.000-04:00
diff --git a/src/javascript/lib/core/erlang_compat/maps.js b/src/javascript/lib/core/erlang_compat/maps.js
@@ -18,6 +18,22 @@ function is_non_primitive(key) {
   );
 }
 
+function __put(map, key, value) {
+  const map2 = new Map(map);
+
+  if (is_non_primitive(key)) {
+    for (const map_key of map.keys()) {
+      if (erlang.equals(map_key, key)) {
+        map2.set(map_key, value);
+        return map2;
+      }
+    }
+  }
+
+  map2.set(key, value);
+  return map2;
+}
+
 function __has(map, key) {
   if (is_non_primitive(key)) {
     for (const map_key of map.keys()) {
@@ -142,10 +158,7 @@ function put(key, value, map1) {
     return new ErlangTypes.Tuple(BADMAP, map1);
   }
 
-  const map2 = new Map(map1);
-  map2.set(key, value);
-
-  return map2;
+  return __put(map1, key, value);
 }
 
 function merge(map1, map2) {
@@ -180,7 +193,7 @@ function get(...args) {
     return new ErlangTypes.Tuple(BADMAP, map);
   }
 
-  if (is_key(key)) {
+  if (is_key(key, map)) {
     return __get(map, key);
   }
 
@@ -196,7 +209,7 @@ function take(key, map1) {
     return new ErlangTypes.Tuple(BADMAP, map1);
   }
 
-  if (!is_key(key)) {
+  if (!is_key(key, map1)) {
     return ERROR;
   }
 
diff --git a/src/javascript/tests/core/erlang_compat/maps_spec.js b/src/javascript/tests/core/erlang_compat/maps_spec.js
@@ -38,6 +38,41 @@ test('is_key', (t) => {
   t.is(result, false);
 });
 
+test('get/2', (t) => {
+  const myMap = new Map([['a', 1], ['b', 2]]);
+  const result = Core.maps.get('a', myMap);
+  t.is(result, 1);
+});
+
+test('get/3', (t) => {
+  let myMap = new Map([['a', 1], ['b', 2]]);
+  let result = Core.maps.get('a', myMap);
+  t.is(result, 1);
+
+  myMap = new Map([['a', 1], ['b', 2]]);
+  result = Core.maps.get('c', myMap, "undefined");
+  t.is(result, "undefined");
+});
+
+test('put/3', (t) => {
+  const keyMap = new Map([['a', 5]]);
+
+  let myMap = new Map([]);
+  myMap = Core.maps.put(keyMap, 5, myMap);
+  myMap = Core.maps.put(new Map([['a', 5]]), 6, myMap);
+
+  const result = Core.maps.get(new Map([['a', 5]]), myMap);
+  t.is(result, 6);
+});
+
+test('take/2', (t) => {
+  const myMap = new Map([['a', 1], ['b', 2]]);
+  var a, result;
+  [a, result] = Core.maps.take('a', myMap);
+  t.is(a, 1);
+  t.is(result.has('a'), false);
+});
+
 test('remove', (t) => {
   let myMap = new Map([['a', 1], ['b', 2]]);
   let result = Core.maps.remove('a', myMap);
