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

runtime includes jquery now

Browse Source
This commit is contained in:
Danny Yoo 2011-05-27 15:12:16 -04:00
parent 4778b88b4b
commit 6028c19f80
6 changed files with 151 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
NOTES
View File

@ -573,3 +573,14 @@ we need.
May 25, 2011
About to make modules work. Need to make sure exports can rename names.
----------------------------------------------------------------------
What's currently preventing racket/base?
Nan, INF Numbers, Regular expressions, keywords, byte strings,
character literals
Missing #%paramz module

17
js-assembler/get-runtime.rkt
View File

@ -9,11 +9,22 @@
(provide/contract [get-runtime (-> string?)])
(define-runtime-path jquery.js "runtime-src/jquery-1.6.1.min.js")
(define-runtime-path runtime.js "mini-runtime.js")
(define text (call-with-input-file runtime.js
(lambda (ip)
(port->string ip))))
(define (path->string p)
(call-with-input-file p
(lambda (ip)
(port->string ip))))
(define text (string-append
(path->string jquery.js)
(path->string runtime.js)))
(define (get-runtime)
text)

89
js-assembler/mini-runtime.js
View File

@ -65,47 +65,50 @@
this.control = []; // Arrayof (U Frame CallFrame PromptFrame)
this.running = false;
this.modules = {}; // String -> ModuleRecord
this.params = { 'currentDisplayer': function(v) {},
this.params = {
'currentOutputPort': new StandardOutputPort(),
'currentSuccessHandler': function(MACHINE) {},
'currentErrorHandler': function(MACHINE, exn) {},
// currentDisplayer: DomNode -> Void
// currentDisplayer is responsible for displaying to the browser.
'currentDisplayer': function(v) {
$(document.body).append(v);
},
'currentNamespace': {},
'currentOutputPort': new StandardOutputPort(),
'currentSuccessHandler': function(MACHINE) {},
'currentErrorHandler': function(MACHINE, exn) {},
// These parameters control how often
// control yields back to the browser
// for response. The implementation is a
// simple PID controller.
//
// To tune this, adjust desiredYieldsPerSecond.
// Do no touch numBouncesBeforeYield or
// maxNumBouncesBeforeYield, because those
// are adjusted automatically by the
// recomputeMaxNumBouncesBeforeYield
// procedure.
'desiredYieldsPerSecond': 5,
'numBouncesBeforeYield': 2000, // self-adjusting
'maxNumBouncesBeforeYield': 2000, // self-adjusting
'currentNamespace': {},
// These parameters control how often
// control yields back to the browser
// for response. The implementation is a
// simple PID controller.
//
// To tune this, adjust desiredYieldsPerSecond.
// Do no touch numBouncesBeforeYield or
// maxNumBouncesBeforeYield, because those
// are adjusted automatically by the
// recomputeMaxNumBouncesBeforeYield
// procedure.
'desiredYieldsPerSecond': 5,
'numBouncesBeforeYield': 2000, // self-adjusting
'maxNumBouncesBeforeYield': 2000, // self-adjusting
'current-print': new Closure(
function(MACHINE) {
var elt = MACHINE.env.pop();
var outputPort =
MACHINE.params.currentOutputPort;
if (elt !== undefined) {
outputPort.write(MACHINE, elt);
outputPort.write(MACHINE, "\n");
}
var frame = MACHINE.control.pop();
return frame.label(MACHINE);
},
1,
[],
"printer")
'current-print': new Closure(
function(MACHINE) {
var elt = MACHINE.env.pop();
var outputPort =
MACHINE.params.currentOutputPort;
if (elt !== undefined) {
outputPort.write(MACHINE, elt);
outputPort.write(MACHINE, "\n");
}
var frame = MACHINE.control.pop();
return frame.label(MACHINE);
},
1,
[],
"printer")
};
@ -222,7 +225,19 @@
var StandardOutputPort = function() {};
StandardOutputPort.prototype = heir(OutputPort.prototype);
StandardOutputPort.prototype.write = function(MACHINE, v) {
MACHINE.params['currentDisplayer'](v);
var domNode;
// TODO: v must be coerced into a DOMNode in a more systematic way.
// This function may need to be a Closure.
if(typeof(v) === 'string' ||
typeof(v) === 'number' ||
typeof(v) === 'boolean' ||
typeof(v) === 'null' ||
typeof(v) === 'undefined') {
domNode = $('<span/>').text(String(v)).css('white-space', 'pre');
} else {
domNode = $('<span/>').text(String(v)).css('white-space', 'pre');
}
MACHINE.params['currentDisplayer'](domNode);
};

63
js-assembler/package.rkt
View File

@ -69,31 +69,50 @@
;; package-standalone-xhtml: X output-port -> void
(define (package-standalone-xhtml source-code op)
(fprintf op #<<EOF
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta charset="utf-8"/>
<title>Example</title>
</head>
<script>
EOF
)
(display (quote-as-cdata (get-runtime)) op)
(display *header* op)
(display (quote-cdata (get-runtime)) op)
(let ([buffer (open-output-string)])
(package source-code
#:should-follow? (lambda (p) #t)
#:output-port buffer)
(write-string (quote-as-cdata (get-output-string buffer))
op))
(display (quote-cdata (get-output-string buffer))
op))
;; FIXME: Finally, invoke the main module.
(display (quote-as-cdata #<<EOF
(display (quote-cdata *invoke-main-module-text*) op)
(display *footer* op))
(define *header*
#<<EOF
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta charset="utf-8"/>
<title>Example</title>
</head>
<script>
EOF
)
(define *footer*
#<<EOF
</script>
<body onload='invokeMainModule()'>
</body>
</html>
EOF
)
(define *invoke-main-module-text*
#<<EOF
var invokeMainModule = function() {
var MACHINE = new plt.runtime.Machine();
invoke(MACHINE,
@ -115,15 +134,7 @@ var invokeMainModule = function() {
console.log(e.stack || e);
}
},
{
currentDisplayer : function(v) {
document.body.appendChild(
document.createTextNode(String(v)));
document.body.appendChild(
document.createElement("br"));
}
});
{});
};
EOF
) op)
(display " </script>\n<body onload='invokeMainModule()'>\n</body>\n</html>" op))
)

55
js-assembler/quote-cdata.rkt
View File

@ -3,34 +3,41 @@
;; quoting cdata for script tags. This is used to help generate SCRIPT bodies in XHTML.
;; Note that this won't help too much in regular HTML5 documents.
(require racket/list)
(require/typed racket/base (regexp-split (Regexp String -> (Listof String))))
(provide quote-as-cdata get-cdata-chunks)
(provide quote-cdata)
(: quote-as-cdata (String -> String))
(define (quote-as-cdata str)
(let ([chunks (regexp-split #rx"\\]\\]>" str)])
(apply string-append (map wrap (process chunks)))))
(: quote-cdata (String -> String))
(define (quote-cdata s)
(string-append "<![CDATA["
(regexp-replace* #rx"]]>"
s
"]]]]><![CDATA[>")
"]]>"))
(: get-cdata-chunks (String -> (Listof String)))
(define (get-cdata-chunks s)
(let ([chunks (regexp-split #rx"\\]\\]>" s)])
(process chunks)))
;; (: quote-cdata (String -> String))
;; (define (quote-cdata str)
;; (let ([chunks (regexp-split #rx"\\]\\]>" str)])
;; (apply string-append (map wrap (process chunks)))))
(: process ((Listof String) -> (Listof String)))
(define (process lst)
(cond
[(empty? (rest lst))
lst]
[else
(cons (string-append (first lst) "]]")
(process (cons (string-append ">" (second lst))
(rest (rest lst)))))]))
;; (: get-cdata-chunks (String -> (Listof String)))
;; (define (get-cdata-chunks s)
;; (let ([chunks (regexp-split #rx"\\]\\]>" s)])
;; (process chunks)))
(: wrap (String -> String))
(define (wrap s)
(string-append "<![CDATA[" s "]]>"))
;; (: process ((Listof String) -> (Listof String)))
;; (define (process lst)
;; (cond
;; [(empty? (rest lst))
;; lst]
;; [else
;; (cons (string-append (first lst) "]]")
;; (process (cons (string-append ">" (second lst))
;; (rest (rest lst)))))]))
;; (: wrap (String -> String))
;; (define (wrap s)
;; (string-append "<![CDATA[" s "]]>"))

8
tests/browser-evaluate.rkt
View File

@ -219,12 +219,8 @@ var comet = function() {
var output = [];
var startTime, endTime;
var params = { currentDisplayer: function(v) {
var pNode = document.createElement("span");
pNode.style.whiteSpace = 'pre';
pNode.appendChild(document.createTextNode(String(v)));
document.body.appendChild(pNode);
//console.log(v);
output.push(String(v)); } };
$(document.body).append(v);
output.push($(v).text()); } };
var onSuccess = function(v) {
endTime = new Date();