fix lists:keyfind/3, dont assume member is a tuple

vans163 · vans163 · commit fcb50cdf195a · 2017-09-05T21:59:59.000-04:00
diff --git a/src/javascript/lib/core/erlang_compat/lists.js b/src/javascript/lib/core/erlang_compat/lists.js
@@ -41,10 +41,10 @@ function foldr(fun, acc0, list) {
   return foldl(fun, acc0, reverse(list));
 }
 
-function keyfind(key, n, tupleList) {
-  for (const tuple of tupleList) {
-    if (tuple.get(n - 1) === key) {
-      return tuple;
+function keyfind(key, n, list) {
+  for (const ele of list) {
+    if (ele instanceof ErlangTypes.Tuple && ele.get(n - 1) === key) {
+      return ele;
     }
   }
 
diff --git a/src/javascript/tests/core/erlang_compat/lists_spec.js b/src/javascript/tests/core/erlang_compat/lists_spec.js
@@ -23,3 +23,19 @@ test('foldl', (t) => {
 test('foldr', (t) => {
   t.deepEqual(Core.lists.foldr((v, acc) => acc + v.toString(), '', [1, 2, 3]), '321');
 });
+
+test('member/2', (t) => {
+  let result = Core.lists.member('abc', ['abc']);
+  t.deepEqual(result, true);
+
+  result = Core.lists.member('abc', ['abcd']);
+  t.deepEqual(result, false);
+});
+
+test('keyfind/3', (t) => {
+  let result = Core.lists.keyfind('abc', 1, ['abc']);
+  t.deepEqual(result, false);
+
+  result = Core.lists.keyfind('abc', 1, [{'abc'}]);
+  t.deepEqual(result, true);
+});

Original file line number	Diff line number	Diff line change
`@@ -41,10 +41,10 @@ function foldr(fun, acc0, list) {`
`41`	`41`	`return foldl(fun, acc0, reverse(list));`
`42`	`42`	`}`
`43`	`43`
`44`		`-function keyfind(key, n, tupleList) {`
`45`		`- for (const tuple of tupleList) {`
`46`		`- if (tuple.get(n - 1) === key) {`
`47`		`- return tuple;`
	`44`	`+function keyfind(key, n, list) {`
	`45`	`+ for (const ele of list) {`
	`46`	`+ if (ele instanceof ErlangTypes.Tuple && ele.get(n - 1) === key) {`
	`47`	`+ return ele;`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`