diff --git a/whalesong/image/private/kernel.js b/whalesong/image/private/kernel.js index a969031..f06a877 100644 --- a/whalesong/image/private/kernel.js +++ b/whalesong/image/private/kernel.js @@ -4,7 +4,7 @@ ////////////////////////////////////////////////////////////////////// -var colorNamespace = MACHINE.modules['whalesong/image/private/color.rkt'].getExternalNamespace(); +var colorNamespace = MACHINE.modules['whalesong/image/private/color.rkt'].getExternalExports(); var colorStruct = colorNamespace.get('struct:color'); var makeColor = function(r,g,b,a) { return colorStruct.constructor([r,g,b,a]); }; var isColor = colorStruct.predicate; diff --git a/whalesong/js-assembler/assemble-perform-statement.rkt b/whalesong/js-assembler/assemble-perform-statement.rkt index c22f3bc..4d6efa9 100644 --- a/whalesong/js-assembler/assemble-perform-statement.rkt +++ b/whalesong/js-assembler/assemble-perform-statement.rkt @@ -214,4 +214,4 @@ (symbol->string (ModuleLocator-name (ModuleProvide-source a-provide))) (symbol->string (ModuleProvide-internal-name a-provide)))])) "") - (format "}(M.modules[~s],M.modules[~s].getExports(),M.modules[~s].getExternalNamespace(),M.modules[~s].prefix));" modname modname modname modname))])) + (format "}(M.modules[~s],M.modules[~s].getExports(),M.modules[~s].getExternalExports(),M.modules[~s].prefix));" modname modname modname modname))])) diff --git a/whalesong/js-assembler/package.rkt b/whalesong/js-assembler/package.rkt index a643110..db52ccd 100644 --- a/whalesong/js-assembler/package.rkt +++ b/whalesong/js-assembler/package.rkt @@ -218,7 +218,7 @@ if(--M.cbt<0) { throw arguments.callee; } var modrec = M.modules[~s]; var ns = modrec.getExports(); - var extNs = modrec.getExternalNamespace(); + var extNs = modrec.getExternalExports(); ~a var exports = {}; modrec.isInvoked = true; diff --git a/whalesong/js-assembler/runtime-src/baselib-modules.js b/whalesong/js-assembler/runtime-src/baselib-modules.js index 4a83478..7cac787 100644 --- a/whalesong/js-assembler/runtime-src/baselib-modules.js +++ b/whalesong/js-assembler/runtime-src/baselib-modules.js @@ -35,7 +35,7 @@ this.isInvoked = false; this.prefix = false; this.exports = new Namespace(this); - this.externalNamespace = new Namespace(this); + this.externalExports = new Namespace(this); // JavaScript-implemented code will assign privateExports // with all of the exported identifiers. @@ -60,8 +60,8 @@ }; // Returns access to the names defined with their external names. - ModuleRecord.prototype.getExternalNamespace = function() { - return this.externalNamespace; + ModuleRecord.prototype.getExternalExports = function() { + return this.externalExports; }; // External invokation of a module. diff --git a/whalesong/resource/js-impl.js b/whalesong/resource/js-impl.js index 9727eb9..65af81e 100644 --- a/whalesong/resource/js-impl.js +++ b/whalesong/resource/js-impl.js @@ -1,4 +1,4 @@ -var resourceType = MACHINE.modules['whalesong/resource/structs.rkt'].getExternalNamespace().get('struct:resource'); +var resourceType = MACHINE.modules['whalesong/resource/structs.rkt'].getExternalExports().get('struct:resource'); var makePrimitiveProcedure = plt.baselib.functions.makePrimitiveProcedure; diff --git a/whalesong/resource/specialize/js-impl.js b/whalesong/resource/specialize/js-impl.js index 742b37c..8da2ba0 100644 --- a/whalesong/resource/specialize/js-impl.js +++ b/whalesong/resource/specialize/js-impl.js @@ -1,4 +1,4 @@ -var resourceType = MACHINE.modules['whalesong/resource/structs.rkt'].getExternalNamespace().get('struct:resource'); +var resourceType = MACHINE.modules['whalesong/resource/structs.rkt'].getExternalExports().get('struct:resource'); var makeClosure = plt.baselib.functions.makeClosure; var finalizeClosureCall = plt.baselib.functions.finalizeClosureCall; diff --git a/whalesong/web-world/js-impl.js b/whalesong/web-world/js-impl.js index 9cb3d1c..82cc2d2 100644 --- a/whalesong/web-world/js-impl.js +++ b/whalesong/web-world/js-impl.js @@ -34,10 +34,10 @@ var resourceStructType = - MACHINE.modules['whalesong/resource/structs.rkt'].getExternalNamespace().get('struct:resource'); + MACHINE.modules['whalesong/resource/structs.rkt'].getExternalExports().get('struct:resource'); var eventStructType = - MACHINE.modules['whalesong/web-world/event.rkt'].getExternalNamespace().get('struct:event'); + MACHINE.modules['whalesong/web-world/event.rkt'].getExternalExports().get('struct:event');