Fix merge conflicts

bryanjos · bryanjos · commit 1cc80acb14e5 · 2017-09-16T20:08:25.000-05:00
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "erlang-types": "^1.0.1",
     "grapheme-splitter": "^1.0.2",
     "rollup-plugin-commonjs": "^8.2.1",
-    "tailored": "^2.7.2"
+    "tailored": "^2.7.4"
   },
   "devDependencies": {
     "@std/esm": "^0.8.3",
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,42 @@ 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]]);
+  let a; 
+  let 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);
diff --git a/test/integration/integration_test.exs b/test/integration/integration_test.exs
@@ -34,4 +34,9 @@ defmodule ElixirScript.Integration.Test do
     val = call_compiled_function Integration, :filter_names_in_guards, []
     assert val == true
   end
+
+  test "tuple_get" do
+    val = call_compiled_function Integration, :tuple_get, []
+    assert val == 5
+  end
 end
diff --git a/test/support/integration.ex b/test/support/integration.ex
@@ -34,4 +34,9 @@ defmodule Integration do
   def multi_bind do
     [a | _] = b = [1, 2, 3, 4, 5]
   end
+
+  def tuple_get do
+    map = %{{1} => 5}
+    Map.get(map, {1})
+  end
 end
diff --git a/yarn.lock b/yarn.lock
@@ -3846,9 +3846,9 @@ table@^4.0.1:
     slice-ansi "0.0.4"
     string-width "^2.0.0"
 
-tailored@^2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/tailored/-/tailored-2.7.2.tgz#01ab31b9bcacdb33f44da7aaa54fd7beffa1bd0e"
+tailored@^2.7.4:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/tailored/-/tailored-2.7.4.tgz#473c6c91fcaeb2c8e4ddd5c2bddb33190ac21780"
   dependencies:
     erlang-types "^1.0.1"
 
