summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBenoit Giannangeli <benoit.giannangeli@boursorama.fr>2017-02-03 15:59:29 +0100
committerBenoit Giannangeli <benoit.giannangeli@boursorama.fr>2017-02-03 16:16:23 +0100
commitb618b835c74a8637e00ba1f4adf6b8884d360d43 (patch)
tree1fae753a1fd2d3cc1da33e2989bbbb1ce0a9f6aa /src
parent2cf246d68c5e658eb6c36a00ac35c7862a54e90e (diff)
downloadfengari-b618b835c74a8637e00ba1f4adf6b8884d360d43.tar.gz
fengari-b618b835c74a8637e00ba1f4adf6b8884d360d43.tar.bz2
fengari-b618b835c74a8637e00ba1f4adf6b8884d360d43.zip
Table, metatable
Diffstat (limited to 'src')
-rw-r--r--src/lobject.js64
-rw-r--r--src/lvm.js2
2 files changed, 65 insertions, 1 deletions
diff --git a/src/lobject.js b/src/lobject.js
index 7efbef5..876a16f 100644
--- a/src/lobject.js
+++ b/src/lobject.js
@@ -18,11 +18,73 @@ class TValue {
constructor(type, value) {
this.type = type;
this.value = value;
+ this.metatable = null;
}
}
+
+class TString extends TValue {
+
+ constructor(string) {
+ super(CT.LUA_TSTRING, string);
+ }
+
+}
+
+
+class Table extends TValue {
+
+ constructor(array, hash) {
+ super(CT.LUA_TTABLE, {
+ array: array !== undefined ? array : [],
+ hash: new Map(hash)
+ });
+
+ this.usermetatable = null;
+
+ this.metatable = {
+ __newindex: function (table, key) {
+ if (key instanceof TValue) {
+ // Those lua values are used by value, tables and functions by reference
+ if ([CT.TNUMBER, CT.TSTRING, CT.TSHRSTR, CT.TLNGSTR, CT.TNUMFLT, CT.TNUMINT].indexOf(key.type) > -1) {
+ key = key.value;
+ }
+ }
+
+ if (typeof key === 'number') {
+ table.value.array[key] = value;
+ } else {
+ table.value.hash.set(key, value);
+ }
+ },
+
+ __index: function (table, key, value) {
+ if (key instanceof TValue) {
+ // Those lua values are used by value, tables and functions by reference
+ if ([CT.TNUMBER, CT.TSTRING, CT.TSHRSTR, CT.TLNGSTR, CT.TNUMFLT, CT.TNUMINT].indexOf(key.type) > -1) {
+ key = key.value;
+ }
+ }
+
+ if (typeof key === 'number') {
+ return table.value.array[key];
+ } else {
+ return table.value.hash.get(key);
+ }
+ },
+
+ __len: function (table) {
+ return t.value.array.length;
+ }
+ };
+ }
+
+}
+
+
module.exports = {
LClosure: LClosure,
- TValue: TValue
+ TValue: TValue,
+ Table: Table
}; \ No newline at end of file
diff --git a/src/lvm.js b/src/lvm.js
index 3d6f43a..9518721 100644
--- a/src/lvm.js
+++ b/src/lvm.js
@@ -5,6 +5,7 @@ const BytecodeParser = require("./lundump.js");
const OC = require('./lopcodes.js');
const CT = require('./lua.js').constant_types;
const TValue = require('./lobject.js').TValue;
+const Table = require('./lobject.js').Table;
class LuaVM {
@@ -104,6 +105,7 @@ class LuaVM {
break;
}
case "OP_NEWTABLE": {
+ L.stack[ra] = new Table();
break;
}
case "OP_SELF": {