Fix index off by one issues. Add tuple functions

bryanjos · bryanjos · commit d9874df65168 · 2017-06-30T06:04:23.000-05:00
diff --git a/src/javascript/lib/core/erlang_compat/erlang.js b/src/javascript/lib/core/erlang_compat/erlang.js
@@ -197,6 +197,54 @@ function is_binary(value) {
   return typeof value === 'string' || value instanceof String;
 }
 
+function element(n, tuple) {
+  return tuple.get(n - 1);
+}
+
+function setelement(index, tuple1, value) {
+  const tupleData = [...tuple1.data];
+
+  tupleData[index - 1] = value;
+
+  return new ErlangTypes.Tuple(...tupleData);
+}
+
+function make_tuple(arity, initialValue) {
+  const list = [];
+
+  for (let i = 0; i < arity; i++) {
+    list.push(initialValue);
+  }
+
+  return new ErlangTypes.Tuple(...list);
+}
+
+function insert_element(index, tuple, term) {
+  const list = [...tuple.data];
+  list.splice(index - 1, 0, term);
+
+  return new ErlangTypes.Tuple(...list);
+}
+
+function append_element(tuple, term) {
+  const list = [...tuple.data];
+  list.push(term);
+
+  return new ErlangTypes.Tuple(...list);
+}
+
+function delete_element(index, tuple) {
+  const list = [...tuple.data];
+  list.splice(index - 1, 1);
+
+  return new ErlangTypes.Tuple(...list);
+}
+
+function tuple_to_list(tuple) {
+  const list = [...tuple.data];
+  return list;
+}
+
 export default {
   atom_to_binary,
   binary_to_atom,
@@ -239,4 +287,11 @@ export default {
   is_tuple,
   is_atom,
   is_binary,
+  element,
+  setelement,
+  make_tuple,
+  insert_element,
+  append_element,
+  delete_element,
+  tuple_to_list,
 };
diff --git a/src/javascript/lib/core/erlang_compat/lists.js b/src/javascript/lib/core/erlang_compat/lists.js
@@ -45,7 +45,7 @@ function foldr(fun, acc0, list) {
 
 function keyfind(key, n, tupleList) {
   for (const tuple of tupleList) {
-    if (tuple.get(n) === key) {
+    if (tuple.get(n - 1) === key) {
       return tuple;
     }
   }
@@ -65,7 +65,7 @@ function keyreplace(key, n, tupleList, newTuple) {
   const newTupleList = [...tupleList];
 
   for (let index = 0; index < newTupleList.length; index++) {
-    if (newTupleList[index].get(n) === key) {
+    if (newTupleList[index].get(n - 1) === key) {
       newTupleList[index] = newTuple;
       return newTupleList;
     }
@@ -78,9 +78,9 @@ function keysort(n, tupleList) {
   const newTupleList = [...tupleList];
 
   return newTupleList.sort((a, b) => {
-    if (a.get(n) < b.get(n)) {
+    if (a.get(n - 1) < b.get(n - 1)) {
       return -1;
-    } else if (a.get(n) > b.get(n)) {
+    } else if (a.get(n - 1) > b.get(n - 1)) {
       return 1;
     }
 
@@ -92,7 +92,7 @@ function keystore(key, n, tupleList, newTuple) {
   const newTupleList = [...tupleList];
 
   for (let index = 0; index < newTupleList.length; index++) {
-    if (newTupleList[index].get(n) === key) {
+    if (newTupleList[index].get(n - 1) === key) {
       newTupleList[index] = newTuple;
       return newTupleList;
     }
@@ -106,7 +106,7 @@ function keydelete(key, n, tupleList) {
   let deleted = false;
 
   for (let index = 0; index < tupleList.length; index++) {
-    if (deleted === false && tupleList[index].get(n) === key) {
+    if (deleted === false && tupleList[index].get(n - 1) === key) {
       deleted = true;
     } else {
       newTupleList.push(tupleList[index]);
@@ -121,7 +121,7 @@ function keytake(key, n, tupleList) {
 
   if (result !== false) {
     return new ErlangTypes.Tuple(
-      result.get(n),
+      result.get(n - 1),
       result,
       keydelete(key, n, tupleList)
     );
