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

reset appears to be doing something.

Browse Source
This commit is contained in:
Danny Yoo 2013-03-08 17:38:17 -07:00
parent 453b047920
commit af894366d3
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,6 +245,18 @@
// The MACHINE
var Machine = function() {
// These are the modules that have been installed. They are not
// necessarily invoked yet.
this.installedModules = {}; // String -> (-> ModuleRecord)
this.reset();
};
// Resets the state of the machine. Almost all of the system's
// state is reset, except the installedModules, which should
// persist as an optimization to reduce loading code over and
// over.
Machine.prototype.reset = function() {
this.cbt = STACK_LIMIT_ESTIMATE; // calls before trampoline
this.v = void(0); // value register
this.p = void(0); // procedure register
@ -252,9 +264,9 @@
this.e = []; // environment
this.c = []; // control: Arrayof (U Frame CallFrame PromptFrame)
this.running = false;
// These are the modules that have been installed. They are not
// necessarily invoked yet.
this.installedModules = {}; // String -> (-> ModuleRecord)
// We do not initialize installedModules here because
// we want that to persist.
// These are the modules that have been invoked.
this.modules = {}; // String -> ModuleRecord
@ -313,8 +325,6 @@
'maxNumBouncesBeforeYield': 2000, // self-adjusting
'currentPrint': defaultCurrentPrint
};
this.globals = {};
this.primitives = Primitives;
@ -322,7 +332,6 @@
this.breakScheduled = false;
};
// Schedule a break the next time the trampoline begins.
Machine.prototype.scheduleBreak = function() {
this.breakScheduled = true;

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

@ -8,22 +8,27 @@ $(document).ready(function() {
var resetButton = $("#reset");
breakButton.hide();
breakButton.click(function() { interruptEvaluation(); });
resetButton.click(function() { setupMachine(); });
resetButton.click(function() { output.empty(); setupMachine(); });
var M;
var sendOutputToBottom = function() {
output.get(0).scrollTop = output.get(0).scrollHeight;
};
var setupMachine = function() {
M = plt.runtime.currentMachine;
M.reset();
// We configure output to send it to the "output" DOM node.
M.params.currentDisplayer = function(MACHINE, domNode) {
$(domNode).appendTo(output);
output.get(0).scrollTop = output.get(0).scrollHeight;
sendOutputToBottom();
};
M.params.currentErrorDisplayer = function(MACHINE, domNode) {
$(domNode).css("color", "red").appendTo(output);
output.get(0).scrollTop = output.get(0).scrollHeight;
sendOutputToBottom();
};
@ -32,6 +37,7 @@ $(document).ready(function() {
// Load up the language.
M.modules['whalesong/wescheme/lang/semantics.rkt'] =
M.installedModules['whalesong/wescheme/lang/semantics.rkt']();
var semanticsModule =
M.modules['whalesong/wescheme/lang/semantics.rkt'];
semanticsModule.invoke(
@ -97,6 +103,7 @@ $(document).ready(function() {
.css("color", "red")
.appendTo(output);
$("<br/>").appendTo(output);
sendOutputToBottom();
};