suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renaming getNamespace to getExports; will have separate getNamespace function that works more like Racket's

Browse Source
This commit is contained in:
Danny Yoo 2013-03-27 15:22:24 -06:00
parent 6a9dce8d57
commit 577562944a
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
whalesong/image/private/colordb.js
View File

@ -2,7 +2,7 @@
// JavaScript land...
var colorNamespace = MACHINE.modules['whalesong/image/private/color.rkt'].getNamespace();
var colorNamespace = MACHINE.modules['whalesong/image/private/color.rkt'].getExports();
var colorStruct = colorNamespace.get('struct:color');
var makeColor = function(r,g,b,a) { return colorStruct.constructor([r,g,b,a]); };

4
whalesong/js-assembler/assemble-expression.rkt
View File

@ -95,7 +95,7 @@
(format "M.primitives[~s]._i(M)" (symbol->string (ApplyPrimitiveProcedure-name op)))]
[(ModuleVariable? op)
(format "M.modules[~s].getNamespace().get(~s)"
(format "M.modules[~s].getExports().get(~s)"
(symbol->string
(ModuleLocator-name
(ModuleVariable-module-name op)))
@ -108,4 +108,4 @@
(format "(M.globals[~s]!==void(0)?M.globals[~s]:M.params.currentNamespace.get(~s))"
(symbol->string (GlobalsReference-name op))
(symbol->string (GlobalsReference-name op))
(symbol->string (GlobalsReference-name op)))]))
(symbol->string (GlobalsReference-name op)))]))

4
whalesong/js-assembler/assemble-helpers.rkt
View File

@ -95,7 +95,7 @@
rhs))]
[(ModuleVariable? target)
(lambda: ([rhs : String])
(format "M.modules[~s].getNamespace().set(~s,~s);"
(format "M.modules[~s].getExports().set(~s,~s);"
(symbol->string (ModuleLocator-name (ModuleVariable-module-name target)))
(symbol->string (ModuleVariable-name target))
rhs))]
@ -497,7 +497,7 @@
(: assemble-module-variable-ref (ModuleVariable -> String))
(define (assemble-module-variable-ref var)
(format "M.modules[~s].getNamespace().get(~s)"
(format "M.modules[~s].getExports().get(~s)"
(symbol->string (ModuleLocator-name (ModuleVariable-module-name var)))
(symbol->string (ModuleVariable-name var))))

4
whalesong/js-assembler/assemble-perform-statement.rkt
View File

@ -209,9 +209,9 @@
(symbol->string (ModuleProvide-external-name a-provide))
(symbol->string (ModuleProvide-internal-name a-provide))))]
[else
(format "ns.set(~s, M.modules[~s].getNamespace().get(~s));"
(format "ns.set(~s, M.modules[~s].getExports().get(~s));"
(symbol->string (ModuleProvide-external-name a-provide))
(symbol->string (ModuleLocator-name (ModuleProvide-source a-provide)))
(symbol->string (ModuleProvide-internal-name a-provide)))]))
"")
(format "}(M.modules[~s],M.modules[~s].getNamespace(),M.modules[~s].getExternalNamespace(),M.modules[~s].prefix));" modname modname modname modname))]))
(format "}(M.modules[~s],M.modules[~s].getExports(),M.modules[~s].getExternalNamespace(),M.modules[~s].prefix));" modname modname modname modname))]))

2
whalesong/js-assembler/package.rkt
View File

@ -217,7 +217,7 @@
(format "
if(--M.cbt<0) { throw arguments.callee; }
var modrec = M.modules[~s];
var ns = modrec.getNamespace();
var ns = modrec.getExports();
var extNs = modrec.getExternalNamespace();
~a
var exports = {};

6
whalesong/js-assembler/runtime-src/baselib-modules.js
View File

@ -34,7 +34,7 @@
this.label = label;
this.isInvoked = false;
this.prefix = false;
this.namespace = new Namespace(this);
this.exports = new Namespace(this);
this.externalNamespace = new Namespace(this);
// JavaScript-implemented code will assign privateExports
@ -55,8 +55,8 @@
// Returns access to the names provided in the module.
// Note that the names are the names internal to the module.
ModuleRecord.prototype.getNamespace = function () {
return this.namespace;
ModuleRecord.prototype.getExports = function () {
return this.exports;
};
// Returns access to the names defined with their external names.

6
whalesong/js-assembler/runtime-src/runtime.js
View File

@ -345,14 +345,14 @@
// Try to get the continuation mark key used for procedure application tracing.
var getTracedAppKey = function(MACHINE) {
if (MACHINE.modules['whalesong/lang/private/traced-app.rkt']) {
return MACHINE.modules['whalesong/lang/private/traced-app.rkt'].getNamespace().get('traced-app-key') || 'traced-app-key';
return MACHINE.modules['whalesong/lang/private/traced-app.rkt'].getExports().get('traced-app-key') || 'traced-app-key';
}
return void(0);
};
var getTracedCalleeKey = function(MACHINE) {
if (MACHINE.modules['whalesong/lang/private/traced-app.rkt']) {
return MACHINE.modules['whalesong/lang/private/traced-app.rkt'].getNamespace().get('traced-callee-key') || 'traced-callee-key';
return MACHINE.modules['whalesong/lang/private/traced-app.rkt'].getExports().get('traced-callee-key') || 'traced-callee-key';
}
return void(0);
};
@ -839,7 +839,7 @@
var i;
machine = machine || runtime.currentMachine;
for (i = 0; i < machine.mainModules.length; i++) {
var ns = machine.mainModules[i].getNamespace();
var ns = machine.mainModules[i].getExports();
if(ns.hasKey(name)) {
return ns.get(name);
}

2
whalesong/repl-prototype/htdocs/repl.js
View File

@ -73,7 +73,7 @@ jQuery(document).ready(function() {
semanticsModule.invoke(
M,
function() {
M.params.currentNamespace = semanticsModule.getNamespace();
M.params.currentNamespace = semanticsModule.getExports();
afterLanguageInitialization();
},
function(M, err) {