summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBenoit Giannangeli <benoit.giannangeli@boursorama.fr>2017-02-24 14:01:02 +0100
committerBenoit Giannangeli <benoit.giannangeli@boursorama.fr>2017-02-24 14:01:02 +0100
commitfc79b2ae7a85af1b892a103340b9465274153c60 (patch)
tree5e3dc8cab20bbbe994390eda53007c08068feeff /src
parent2f9fe378bc341921e1ae259a2fec049663100738 (diff)
downloadfengari-fc79b2ae7a85af1b892a103340b9465274153c60.tar.gz
fengari-fc79b2ae7a85af1b892a103340b9465274153c60.tar.bz2
fengari-fc79b2ae7a85af1b892a103340b9465274153c60.zip
table.sort
Using Array.prototype.sort for now
Diffstat (limited to 'src')
-rw-r--r--src/lapi.js15
-rw-r--r--src/ltablib.js44
2 files changed, 58 insertions, 1 deletions
diff --git a/src/lapi.js b/src/lapi.js
index 488fb58..b39046b 100644
--- a/src/lapi.js
+++ b/src/lapi.js
@@ -119,6 +119,11 @@ const lua_pushvalue = function(L, idx) {
assert(L.top <= L.ci.top, "stack overflow");
};
+const lua_pushtvalue = function(L, tvalue) {
+ L.stack[L.top++] = tvalue;
+ assert(L.top <= L.ci.top, "stack overflow");
+};
+
const lua_settop = function(L, idx) {
let func = L.ci.funcOff;
if (idx >= 0) {
@@ -539,10 +544,15 @@ const lua_topointer = function(L, idx) {
};
const lua_compare = function(L, index1, index2, op) {
- let i = 0;
let o1 = index2addr(L, index1);
let o2 = index2addr(L, index1);
+ return lua_compare_(L, o1, o2, op);
+};
+
+const lua_compare_ = function(L, o1, o2, op) {
+ let i = 0;
+
if (!o1.ttisnil() && !o2.ttisnil()) {
switch (op) {
case lua.LUA_OPEQ: i = lvm.luaV_equalobj(L, o1, o2); break;
@@ -757,12 +767,14 @@ const lua_getextraspace = function () {
};
module.exports.index2addr = index2addr;
+module.exports.index2addr_ = index2addr_;
module.exports.lua_absindex = lua_absindex;
module.exports.lua_atpanic = lua_atpanic;
module.exports.lua_call = lua_call;
module.exports.lua_callk = lua_callk;
module.exports.lua_checkstack = lua_checkstack;
module.exports.lua_compare = lua_compare;
+module.exports.lua_compare_ = lua_compare_;
module.exports.lua_concat = lua_concat;
module.exports.lua_copy = lua_copy;
module.exports.lua_createtable = lua_createtable;
@@ -800,6 +812,7 @@ module.exports.lua_pushnil = lua_pushnil;
module.exports.lua_pushnumber = lua_pushnumber;
module.exports.lua_pushstring = lua_pushstring;
module.exports.lua_pushthread = lua_pushthread;
+module.exports.lua_pushtvalue = lua_pushtvalue;
module.exports.lua_pushvalue = lua_pushvalue;
module.exports.lua_rawequal = lua_rawequal;
module.exports.lua_rawget = lua_rawget;
diff --git a/src/ltablib.js b/src/ltablib.js
index 97ecd65..fa43523 100644
--- a/src/ltablib.js
+++ b/src/ltablib.js
@@ -180,12 +180,56 @@ const unpack = function(L) {
return n;
};
+
+// TODO: Maybe do the quicksort after all
+const auxsort = function(L) {
+ let t = lapi.index2addr(L, 1);
+
+ if (lapi.lua_type(L, 2) !== CT.LUA_TFUNCTION) { /* no function? */
+ [...t.value.entries()]
+ .sort(function (a, b) {
+ if (typeof a[0] !== 'number') return 1;
+ else if (typeof b[0] !== 'number') return -1;
+ return lapi.lua_compare_(L, a[1], b[1], lua.LUA_OPLT) === 1 ? -1 : 1; /* a < b */
+ })
+ .forEach((e, i) => typeof e[0] === 'number' ? t.value.set(i, e[1]) : true);
+ } else {
+ [...t.value.entries()]
+ .sort(function (a, b) {
+ if (typeof a[0] !== 'number') return 1;
+ else if (typeof b[0] !== 'number') return -1;
+
+ lapi.lua_pushvalue(L, 2); /* push function */
+ lapi.lua_pushtvalue(L, a[1]); /* since we use Map.sort, a and b are not on the stack */
+ lapi.lua_pushtvalue(L, b[1]);
+ lapi.lua_call(L, 2, 1); /* call function */
+ let res = lapi.lua_toboolean(L, -1); /* get result */
+ lapi.lua_pop(L, 1); /* pop result */
+ return res ? -1 : 1;
+ })
+ .forEach((e, i) => typeof e[0] === 'number' ? t.value.set(i, e[1]) : true);
+ }
+};
+
+const sort = function(L) {
+ let n = aux_getn(L, 1, TAB_RW);
+ if (n > 1) { /* non-trivial interval? */
+ lauxlib.luaL_argcheck(L, n < Number.MAX_SAFE_INTEGER, 1, "array too big");
+ if (!lapi.lua_isnoneornil(L, 2)) /* is there a 2nd argument? */
+ lauxlib.luaL_checktype(L, 2, CT.LUA_TFUNCTION); /* must be a function */
+ lapi.lua_settop(L, 2); /* make sure there are two arguments */
+ auxsort(L);
+ }
+ return 0;
+};
+
const tab_funcs = {
"concat": tconcat,
"insert": tinsert,
"move": tmove,
"pack": pack,
"remove": tremove,
+ "sort": sort,
"unpack": unpack
};