diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-07-08 08:56:34 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-07-08 08:56:34 +0000 |
| commit | 7cebdd7815b3953fbb76e0e38fab5dc856f5fb48 (patch) | |
| tree | d6df2d2e2b6e2404d7619278107b425c617da189 | |
| parent | c053de708817a3b7c90edcd53fe3742007b8a41e (diff) | |
| parent | e378530bcaa63d46083879d746dec6b8c3a44d0b (diff) | |
| download | UXP-7cebdd7815b3953fbb76e0e38fab5dc856f5fb48.tar UXP-7cebdd7815b3953fbb76e0e38fab5dc856f5fb48.tar.gz UXP-7cebdd7815b3953fbb76e0e38fab5dc856f5fb48.tar.lz UXP-7cebdd7815b3953fbb76e0e38fab5dc856f5fb48.tar.xz UXP-7cebdd7815b3953fbb76e0e38fab5dc856f5fb48.zip | |
Merge branch 'es-modules-work'
| -rw-r--r-- | js/src/builtin/Module.js | 2 | ||||
| -rw-r--r-- | js/src/builtin/ModuleObject.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/js/src/builtin/Module.js b/js/src/builtin/Module.js index b3365b505..64d62d216 100644 --- a/js/src/builtin/Module.js +++ b/js/src/builtin/Module.js @@ -509,7 +509,7 @@ function ResolutionError(resolution, kind, name, line, column) function ModuleEvaluate() { if (!IsObject(this) || !IsModule(this)) - return callFunction(CallModuleMethodIfWrapped, this, "ModuleEvaluatie"); + return callFunction(CallModuleMethodIfWrapped, this, "ModuleEvaluate"); // Step 1 let module = this; diff --git a/js/src/builtin/ModuleObject.cpp b/js/src/builtin/ModuleObject.cpp index 09193c9ca..30e7120c0 100644 --- a/js/src/builtin/ModuleObject.cpp +++ b/js/src/builtin/ModuleObject.cpp @@ -1034,8 +1034,6 @@ GlobalObject::initModuleProto(JSContext* cx, Handle<GlobalObject*> global) static const JSFunctionSpec protoFunctions[] = { JS_SELF_HOSTED_FN("getExportedNames", "ModuleGetExportedNames", 1, 0), JS_SELF_HOSTED_FN("resolveExport", "ModuleResolveExport", 2, 0), - JS_SELF_HOSTED_FN("declarationInstantiation", "ModuleDeclarationInstantiation", 0, 0), - JS_SELF_HOSTED_FN("evaluation", "ModuleEvaluation", 0, 0), JS_SELF_HOSTED_FN("declarationInstantiation", "ModuleInstantiate", 0, 0), JS_SELF_HOSTED_FN("evaluation", "ModuleEvaluate", 0, 0), JS_FS_END |