More renaming
This commit is contained in:
parent
577562944a
commit
3cb43f0eeb
|
@ -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 colorStruct = colorNamespace.get('struct:color');
|
||||||
var makeColor = function(r,g,b,a) { return colorStruct.constructor([r,g,b,a]); };
|
var makeColor = function(r,g,b,a) { return colorStruct.constructor([r,g,b,a]); };
|
||||||
var isColor = colorStruct.predicate;
|
var isColor = colorStruct.predicate;
|
||||||
|
|
|
@ -214,4 +214,4 @@
|
||||||
(symbol->string (ModuleLocator-name (ModuleProvide-source a-provide)))
|
(symbol->string (ModuleLocator-name (ModuleProvide-source a-provide)))
|
||||||
(symbol->string (ModuleProvide-internal-name 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))]))
|
||||||
|
|
|
@ -218,7 +218,7 @@
|
||||||
if(--M.cbt<0) { throw arguments.callee; }
|
if(--M.cbt<0) { throw arguments.callee; }
|
||||||
var modrec = M.modules[~s];
|
var modrec = M.modules[~s];
|
||||||
var ns = modrec.getExports();
|
var ns = modrec.getExports();
|
||||||
var extNs = modrec.getExternalNamespace();
|
var extNs = modrec.getExternalExports();
|
||||||
~a
|
~a
|
||||||
var exports = {};
|
var exports = {};
|
||||||
modrec.isInvoked = true;
|
modrec.isInvoked = true;
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
this.isInvoked = false;
|
this.isInvoked = false;
|
||||||
this.prefix = false;
|
this.prefix = false;
|
||||||
this.exports = new Namespace(this);
|
this.exports = new Namespace(this);
|
||||||
this.externalNamespace = new Namespace(this);
|
this.externalExports = new Namespace(this);
|
||||||
|
|
||||||
// JavaScript-implemented code will assign privateExports
|
// JavaScript-implemented code will assign privateExports
|
||||||
// with all of the exported identifiers.
|
// with all of the exported identifiers.
|
||||||
|
@ -60,8 +60,8 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
// Returns access to the names defined with their external names.
|
// Returns access to the names defined with their external names.
|
||||||
ModuleRecord.prototype.getExternalNamespace = function() {
|
ModuleRecord.prototype.getExternalExports = function() {
|
||||||
return this.externalNamespace;
|
return this.externalExports;
|
||||||
};
|
};
|
||||||
|
|
||||||
// External invokation of a module.
|
// External invokation of a module.
|
||||||
|
|
|
@ -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;
|
var makePrimitiveProcedure = plt.baselib.functions.makePrimitiveProcedure;
|
||||||
|
|
||||||
|
|
|
@ -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 makeClosure = plt.baselib.functions.makeClosure;
|
||||||
var finalizeClosureCall = plt.baselib.functions.finalizeClosureCall;
|
var finalizeClosureCall = plt.baselib.functions.finalizeClosureCall;
|
||||||
|
|
|
@ -34,10 +34,10 @@
|
||||||
|
|
||||||
|
|
||||||
var resourceStructType =
|
var resourceStructType =
|
||||||
MACHINE.modules['whalesong/resource/structs.rkt'].getExternalNamespace().get('struct:resource');
|
MACHINE.modules['whalesong/resource/structs.rkt'].getExternalExports().get('struct:resource');
|
||||||
|
|
||||||
var eventStructType =
|
var eventStructType =
|
||||||
MACHINE.modules['whalesong/web-world/event.rkt'].getExternalNamespace().get('struct:event');
|
MACHINE.modules['whalesong/web-world/event.rkt'].getExternalExports().get('struct:event');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user