reafactor: make globals initializer use ES6 features
This commit is contained in:
parent
6f8efe74c4
commit
ce9b419757
GPG Key ID:
6531B8583E5F6ED4
@ -1,43 +1,46 @@
|
||||
#! my special comment lol
|
||||
const target = arguments[0];
|
||||
const primordials = arguments[1];
|
||||
|
||||
(function(target, primordials) {
|
||||
var makeSymbol = primordials.symbol.makeSymbol;
|
||||
var getSymbol = primordials.symbol.getSymbol;
|
||||
var getSymbolKey = primordials.symbol.getSymbolKey;
|
||||
var getSymbolDescription = primordials.symbol.getSymbolDescription;
|
||||
const makeSymbol = primordials.symbol.makeSymbol;
|
||||
const getSymbol = primordials.symbol.getSymbol;
|
||||
const getSymbolKey = primordials.symbol.getSymbolKey;
|
||||
const getSymbolDescription = primordials.symbol.getSymbolDescription;
|
||||
|
||||
var parseInt = primordials.number.parseInt;
|
||||
var parseFloat = primordials.number.parseFloat;
|
||||
var isNaN = primordials.number.isNaN;
|
||||
var NaN = primordials.number.NaN;
|
||||
var Infinity = primordials.number.Infinity;
|
||||
const parseInt = primordials.number.parseInt;
|
||||
const parseFloat = primordials.number.parseFloat;
|
||||
const isNaN = primordials.number.isNaN;
|
||||
const NaN = primordials.number.NaN;
|
||||
const Infinity = primordials.number.Infinity;
|
||||
|
||||
var fromCharCode = primordials.string.fromCharCode;
|
||||
var fromCodePoint = primordials.string.fromCodePoint;
|
||||
var stringBuild = primordials.string.stringBuild;
|
||||
const fromCharCode = primordials.string.fromCharCode;
|
||||
const fromCodePoint = primordials.string.fromCodePoint;
|
||||
const stringBuild = primordials.string.stringBuild;
|
||||
|
||||
var defineProperty = primordials.object.defineProperty;
|
||||
var defineField = primordials.object.defineField;
|
||||
var getOwnMember = primordials.object.getMember;
|
||||
var getOwnSymbolMember = primordials.object.getOwnSymbolMember;
|
||||
var getOwnMembers = primordials.object.getOwnMembers;
|
||||
var getOwnSymbolMembers = primordials.object.getOwnSymbolMembers;
|
||||
var getPrototype = primordials.object.getPrototype;
|
||||
var setPrototype = primordials.object.setPrototype;
|
||||
const defineProperty = primordials.object.defineProperty;
|
||||
const defineField = primordials.object.defineField;
|
||||
const getOwnMember = primordials.object.getMember;
|
||||
const getOwnSymbolMember = primordials.object.getOwnSymbolMember;
|
||||
const getOwnMembers = primordials.object.getOwnMembers;
|
||||
const getOwnSymbolMembers = primordials.object.getOwnSymbolMembers;
|
||||
const getPrototype = primordials.object.getPrototype;
|
||||
const setPrototype = primordials.object.setPrototype;
|
||||
|
||||
var invokeType = primordials.function.invokeType;
|
||||
var setConstructable = primordials.function.setConstructable;
|
||||
var setCallable = primordials.function.setCallable;
|
||||
var invoke = primordials.function.invoke;
|
||||
const invokeType = primordials.function.invokeType;
|
||||
const setConstructable = primordials.function.setConstructable;
|
||||
const setCallable = primordials.function.setCallable;
|
||||
const invoke = primordials.function.invoke;
|
||||
|
||||
var setGlobalPrototype = primordials.setGlobalPrototype;
|
||||
var compile = primordials.compile;
|
||||
const setGlobalPrototype = primordials.setGlobalPrototype;
|
||||
const compile = primordials.compile;
|
||||
|
||||
var json = primordials.json;
|
||||
const json = primordials.json;
|
||||
|
||||
var valueKey = makeSymbol("Primitive.value");
|
||||
const valueKey = makeSymbol("Primitive.value");
|
||||
const undefined = ({}).definitelyDefined;
|
||||
|
||||
function unwrapThis(self, type, constr, name, arg, defaultVal) {
|
||||
target.undefined = undefined;
|
||||
|
||||
const unwrapThis = (self, type, constr, name, arg, defaultVal) => {
|
||||
if (arg == null) arg = "this";
|
||||
if (typeof self === type) return self;
|
||||
if (self instanceof constr && valueKey in self) self = self[valueKey];
|
||||
@ -47,14 +50,9 @@
|
||||
throw new TypeError(name + " requires that '" + arg + "' be a " + constr.name);
|
||||
}
|
||||
|
||||
function wrapIndex(i, len) {
|
||||
}
|
||||
const wrapIndex = (i, len) => {};
|
||||
|
||||
var Symbol = function(name) {
|
||||
if (arguments.length === 0) return makeSymbol("");
|
||||
else return makeSymbol(name + "");
|
||||
};
|
||||
setConstructable(Symbol, false);
|
||||
const Symbol = (name = "") => makeSymbol(name);
|
||||
|
||||
defineField(Symbol, "for", true, false, true, function(name) {
|
||||
return getSymbol(name + "");
|
||||
@ -85,7 +83,7 @@
|
||||
|
||||
target.Symbol = Symbol;
|
||||
|
||||
var Number = function(value) {
|
||||
const Number = function(value) {
|
||||
if (invokeType(arguments) === "call") {
|
||||
if (arguments.length === 0) return 0;
|
||||
else return +value;
|
||||
@ -147,31 +145,31 @@
|
||||
|
||||
target.Number = Number;
|
||||
|
||||
var String = function(value) {
|
||||
const String = function(value) {
|
||||
if (invokeType(arguments) === "call") {
|
||||
if (arguments.length === 0) return "";
|
||||
else return value + "";
|
||||
}
|
||||
|
||||
this[valueKey] = target.String(value);
|
||||
this[valueKey] = String(value);
|
||||
};
|
||||
|
||||
defineField(String, "fromCharCode", true, false, true, function() {
|
||||
var res = [];
|
||||
const res = [];
|
||||
res[arguments.length] = 0;
|
||||
|
||||
for (var i = 0; i < arguments.length; i++) {
|
||||
res[res.length] = fromCharCode(+arguments[i]);
|
||||
for (let i = 0; i < arguments.length; i++) {
|
||||
res[i] = fromCharCode(+arguments[i]);
|
||||
}
|
||||
|
||||
return stringBuild(res);
|
||||
});
|
||||
defineField(String, "fromCodePoint", true, false, true, function(value) {
|
||||
var res = [];
|
||||
defineField(String, "fromCodePoint", true, false, true, function() {
|
||||
const res = [];
|
||||
res[arguments.length] = 0;
|
||||
|
||||
for (var i = 0; i < arguments.length; i++) {
|
||||
res[res.length] = fromCodePoint(+arguments[i]);
|
||||
for (let i = 0; i < arguments.length; i++) {
|
||||
res[i] = fromCodePoint(+arguments[i]);
|
||||
}
|
||||
|
||||
return stringBuild(res);
|
||||
@ -180,7 +178,8 @@
|
||||
defineField(String, "prototype", false, false, false, {});
|
||||
|
||||
defineField(String.prototype, "at", true, false, true, function(index) {
|
||||
return "" + unwrapThis(this, "string", String, "String.prototype.at");
|
||||
throw "Not implemented :/";
|
||||
return unwrapThis(this, "string", String, "String.prototype.at")[index];
|
||||
});
|
||||
defineField(String.prototype, "toString", true, false, true, function() {
|
||||
return unwrapThis(this, "string", String, "String.prototype.toString");
|
||||
@ -191,13 +190,13 @@
|
||||
|
||||
target.String = String;
|
||||
|
||||
var Boolean = function(value) {
|
||||
const Boolean = function(value) {
|
||||
if (invokeType(arguments) === "call") {
|
||||
if (arguments.length === 0) return false;
|
||||
else return !!value;
|
||||
}
|
||||
|
||||
this[valueKey] = target.Boolean(value);
|
||||
this[valueKey] = Boolean(value);
|
||||
};
|
||||
|
||||
defineField(Boolean, "prototype", false, false, false, {});
|
||||
@ -211,23 +210,23 @@
|
||||
|
||||
target.Boolean = Boolean;
|
||||
|
||||
var Object = function(value) {
|
||||
const Object = function(value) {
|
||||
if (typeof value === 'object' && value !== null) return value;
|
||||
|
||||
if (typeof value === 'string') return new String(value);
|
||||
if (typeof value === 'number') return new Number(value);
|
||||
if (typeof value === 'boolean') return new Boolean(value);
|
||||
if (typeof value === 'symbol') {
|
||||
var res = {};
|
||||
const res = {};
|
||||
setPrototype(res, Symbol.prototype);
|
||||
res[valueKey] = value;
|
||||
return res;
|
||||
}
|
||||
|
||||
var target = this;
|
||||
if (target === undefined || target === null || typeof target !== 'object') target = {};
|
||||
const target = this;
|
||||
if (target == null || typeof target !== 'object') target = {};
|
||||
|
||||
this[valueKey] = target.Object(value);
|
||||
this[valueKey] = Object(value);
|
||||
};
|
||||
|
||||
defineField(Object, "prototype", false, false, false, setPrototype({}, null));
|
||||
@ -247,59 +246,53 @@
|
||||
|
||||
target.Boolean = Boolean;
|
||||
|
||||
var Function = function() {
|
||||
if (invokeType(arguments) === "new") return Function(value);
|
||||
const Function = function() {
|
||||
const parts = ["return function annonymous("];
|
||||
|
||||
var res = ["return function ("];
|
||||
|
||||
for (var i = 0; i < arguments.length - 1; i++) {
|
||||
if (i > 0) res[res.length] = ",";
|
||||
res[res.length] = arguments[i];
|
||||
for (let i = 0; i < arguments.length - 1; i++) {
|
||||
if (i > 0) parts[parts.length] = ",";
|
||||
parts[parts.length] = arguments[i];
|
||||
}
|
||||
res[res.length] = "){";
|
||||
res[res.length] = String(arguments[arguments.length - 1]);
|
||||
res[res.length] = "}";
|
||||
parts[parts.length] = "){\n";
|
||||
parts[parts.length] = String(arguments[arguments.length - 1]);
|
||||
parts[parts.length] = "\n}";
|
||||
|
||||
log(res);
|
||||
print(parts);
|
||||
|
||||
return compile(stringBuild(res))();
|
||||
const res = compile(stringBuild(parts))();
|
||||
return res;
|
||||
};
|
||||
|
||||
defineField(Function, "compile", true, false, true, function(src, options) {
|
||||
if (options == null) options = {};
|
||||
if (src == null) src = "";
|
||||
|
||||
defineField(Function, "compile", true, false, true, (src = "", options = {}) => {
|
||||
if (options.globals == null) options.globals = [];
|
||||
if (options.wrap == null) options.wrap = true;
|
||||
|
||||
var res = [];
|
||||
const parts = [];
|
||||
|
||||
if (options.wrap) res[res.length] = "return (function() {\n";
|
||||
if (options.wrap) parts[parts.length] = "return (function() {\n";
|
||||
if (options.globals.length > 0) {
|
||||
res[res.length] = "var ";
|
||||
parts[parts.length] = "var ";
|
||||
|
||||
for (var i = 0; i < options.globals.length; i++) {
|
||||
if (i > 0) res[res.length] = ",";
|
||||
res[res.length] = options.globals[i];
|
||||
for (let i = 0; i < options.globals.length; i++) {
|
||||
if (i > 0) parts[parts.length] = ",";
|
||||
parts[parts.length] = options.globals[i];
|
||||
}
|
||||
|
||||
res[res.length] = ";(function(g){";
|
||||
parts[parts.length] = ";((g=arguments[0])=>{";
|
||||
|
||||
for (var i = 0; i < options.globals.length; i++) {
|
||||
var name = options.globals[i];
|
||||
res[res.length] = name;
|
||||
res[res.length] = "=g[";
|
||||
res[res.length] = json.stringify(name);
|
||||
res[res.length] = "];";
|
||||
for (let i = 0; i < options.globals.length; i++) {
|
||||
const name = options.globals[i];
|
||||
parts[parts.length] = name + "=g[" + json.stringify(name) + "];";
|
||||
}
|
||||
|
||||
res[res.length] = "})(arguments[0] || {});\n";
|
||||
parts[parts.length] = "})()\n";
|
||||
}
|
||||
|
||||
res[res.length] = src;
|
||||
if (options.wrap) res[res.length] = "\n})(arguments[0])";
|
||||
parts[parts.length] = src;
|
||||
if (options.wrap) parts[parts.length] = "\n})(arguments[0])";
|
||||
|
||||
return compile(stringBuild(res));
|
||||
const res = compile(stringBuild(parts));
|
||||
return res;
|
||||
});
|
||||
defineField(Function, "prototype", false, false, false, setPrototype({}, null));
|
||||
|
||||
@ -318,4 +311,3 @@
|
||||
setGlobalPrototype("boolean", Boolean.prototype);
|
||||
setGlobalPrototype("symbol", Symbol.prototype);
|
||||
setGlobalPrototype("object", Object.prototype);
|
||||
})(arguments[0], arguments[1]);
|
||||
Loading…
Reference in New Issue
Block a user