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

repl uses the rpc now.

Browse Source
This commit is contained in:
Danny Yoo 2013-03-18 10:52:22 -06:00
parent 293e21f4bd
commit 8900771b4a
3 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
whalesong/repl-prototype/htdocs/index.html
View File

@ -3,6 +3,7 @@
<head> <head>
<script src="collects/runtime.js"></script> <script src="collects/runtime.js"></script>
<script src="collects/library.js"></script> <script src="collects/library.js"></script>
<script src="easyXDM-min.js"></script>
<script src="repl.js"></script> <script src="repl.js"></script>
</head> </head>
<body> <body>

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

@ -1,33 +1,39 @@
$(document).ready(function() { jQuery(document).ready(function() {
"use strict"; "use strict";
if (! console.log) { console.log = function() { }; } if (! console.log) { console.log = function() { }; }
var repl = $("#repl"); var repl = jQuery("#repl");
var output = $("#output"); var output = jQuery("#output");
var breakButton = $("#break"); var breakButton = jQuery("#break");
var resetButton = $("#reset"); var resetButton = jQuery("#reset");
breakButton.hide(); breakButton.hide();
breakButton.click(function() { interruptEvaluation(); }); breakButton.click(function() { interruptEvaluation(); });
resetButton.click(function() { output.empty(); setupMachine(); }); resetButton.click(function() { output.empty(); setupMachine(); });
// The machine.
var M; var M;
var sendOutputToBottom = function() { var sendOutputToBottom = function() {
output.get(0).scrollTop = output.get(0).scrollHeight; output.get(0).scrollTop = output.get(0).scrollHeight;
}; };
var xhr = new easyXDM.Rpc(
{ remote: 'rpc.html' },
{ remote: { replCompile: {} } });
var setupMachine = function() { var setupMachine = function() {
M = plt.runtime.currentMachine; M = plt.runtime.currentMachine;
M.reset(); M.reset();
// We configure output to send it to the "output" DOM node. // We configure output to send it to the "output" DOM node.
M.params.currentDisplayer = function(MACHINE, domNode) { M.params.currentDisplayer = function(MACHINE, domNode) {
$(domNode).appendTo(output); jQuery(domNode).appendTo(output);
sendOutputToBottom(); sendOutputToBottom();
}; };
M.params.currentErrorDisplayer = function(MACHINE, domNode) { M.params.currentErrorDisplayer = function(MACHINE, domNode) {
$(domNode).css("color", "red").appendTo(output); jQuery(domNode).css("color", "red").appendTo(output);
sendOutputToBottom(); sendOutputToBottom();
}; };
@ -48,9 +54,6 @@ $(document).ready(function() {
}, },
function(M, err) { function(M, err) {
// Nothing should work if we can't get this to work. // Nothing should work if we can't get this to work.
console.log(M);
console.log(err);
console.log(err.stack);
alert("uh oh!: language could not be loaded."); alert("uh oh!: language could not be loaded.");
}); });
}; };
@ -64,7 +67,7 @@ $(document).ready(function() {
repl.keypress(function(e) { repl.keypress(function(e) {
if (e.which == 13 && !repl.attr('disabled')) { if (e.which == 13 && !repl.attr('disabled')) {
var src = repl.val(); var src = repl.val();
$(this).val(""); jQuery(this).val("");
repl.attr('disabled', 'true'); repl.attr('disabled', 'true');
repl.val("... evaluating..."); repl.val("... evaluating...");
breakButton.show(); breakButton.show();
@ -78,9 +81,6 @@ $(document).ready(function() {
}; };
setupMachine();
// CPS'ed for-each. // CPS'ed for-each.
var forEachK = function(elts, f, after) { var forEachK = function(elts, f, after) {
var n = elts.length; var n = elts.length;
@ -98,11 +98,11 @@ $(document).ready(function() {
// writeErrorMessage: string -> void // writeErrorMessage: string -> void
// Write out an error message. // Write out an error message.
var writeErrorMessage = function(msg) { var writeErrorMessage = function(msg) {
$("<span/>") jQuery("<span/>")
.text(''+msg) .text(''+msg)
.css("color", "red") .css("color", "red")
.appendTo(output); .appendTo(output);
$("<br/>").appendTo(output); jQuery("<br/>").appendTo(output);
sendOutputToBottom(); sendOutputToBottom();
}; };
@ -122,7 +122,6 @@ $(document).ready(function() {
}; };
var interruptEvaluation = function() { var interruptEvaluation = function() {
console.log('scheduling an interruption');
M.scheduleBreak(); M.scheduleBreak();
}; };
@ -130,8 +129,8 @@ $(document).ready(function() {
// In evaluation, we'll send compilation requests to the server, // In evaluation, we'll send compilation requests to the server,
// and get back bytecode that we should evaluate. // and get back bytecode that we should evaluate.
var compileAndEvaluate = function(src, after) { var compileAndEvaluate = function(src, after) {
$("<tt/>").text('> ' + src).appendTo(output); jQuery("<tt/>").text('> ' + src).appendTo(output);
$("<br/>").appendTo(output); jQuery("<br/>").appendTo(output);
var onCompile = function(compiledResult) { var onCompile = function(compiledResult) {
if (compiledResult.type === 'repl') { if (compiledResult.type === 'repl') {
return onGoodReplCompile(compiledResult); return onGoodReplCompile(compiledResult);
@ -167,10 +166,6 @@ $(document).ready(function() {
k(); k();
}; };
var onBadEvaluation = function(M, err) { var onBadEvaluation = function(M, err) {
console.log(err);
if (err.stack) {
console.log(err.stack);
}
if (err.message) { if (err.message) {
writeErrorMessage(err.message); writeErrorMessage(err.message);
} }
@ -181,19 +176,12 @@ $(document).ready(function() {
}, },
after); after);
}; };
var onCompileError = function(err) {
};
var onServerError = function(err) { var onServerError = function(err) {
console.log(err);
writeErrorMessage("internal server error"); writeErrorMessage("internal server error");
after(); after();
}; };
xhr.replCompile(src, onCompile, onServerError);
$.ajax({dataType: 'json',
url: '/compile',
data: { src: src },
success: onCompile,
error: onServerError});
}; };
@ -211,5 +199,5 @@ $(document).ready(function() {
// Test: compile a module. // Test: compile a module.
// //
setupMachine();
}); });

9
whalesong/repl-prototype/htdocs/rpc.js
View File

@ -1,8 +1,8 @@
(function() { (function () {
"use strict"; "use strict";
var url = "/compile"; var url = "/compile";
var replCompile = function(code, onDone, onDoneError) { var replCompile = function(code, onDone, onDoneError) {
$.ajax({ 'url': url, jQuery.ajax({ 'url': url,
'cache': false, 'cache': false,
'success': function(data, textStatus, jqXHR) { 'success': function(data, textStatus, jqXHR) {
onDone(data); onDone(data);
@ -11,9 +11,10 @@
onDoneError(errorThrown); onDoneError(errorThrown);
}, },
'data': {'src' : code }, 'data': {'src' : code },
'dataType': 'json', 'dataType': 'json'
});
}; };
// If we're in the context of an iframe, provide an easyXDM // If we're in the context of an iframe, provide an easyXDM
// interface to the compiler. // interface to the compiler.
if (window.top !== window) { if (window.top !== window) {