runtime includes jquery now

NOTES

@@ -572,4 +572,15 @@ we need.
 
 May 25, 2011
 
-About to make modules work.  Need to make sure exports can rename names.
+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

js-assembler/get-runtime.rkt

@@ -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)
+(define (path->string p)
-                 (port->string ip))))
+  (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)

js-assembler/mini-runtime.js

@@ -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) {},
-			
-			'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
 
-			
+	    // currentDisplayer: DomNode -> Void
+	    // currentDisplayer is responsible for displaying to the browser.
+	    'currentDisplayer': function(v) {
+		    $(document.body).append(v);
+	    },
+	    
+	    'currentOutputPort': new StandardOutputPort(),
+	    'currentSuccessHandler': function(MACHINE) {},
+	    'currentErrorHandler': function(MACHINE, exn) {},
+	    
+	    '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(
-			'current-print': new Closure(
+		function(MACHINE) {
-			    function(MACHINE) {
+		    var elt = MACHINE.env.pop();
-				var elt = MACHINE.env.pop();
+		    var outputPort = 
-				var outputPort = 
+			MACHINE.params.currentOutputPort;
-				    MACHINE.params.currentOutputPort;
+		    if (elt !== undefined) {
-				if (elt !== undefined) {
+			outputPort.write(MACHINE, elt);
-				    outputPort.write(MACHINE, elt);
+			outputPort.write(MACHINE, "\n");
-				    outputPort.write(MACHINE, "\n");
+		    }
-				}
+		    var frame = MACHINE.control.pop();
-				var frame = MACHINE.control.pop();
+		    return frame.label(MACHINE);
-				return frame.label(MACHINE);
+		},
-			    },
+		1,
-			    1,
+		[],
-			    [],
+		"printer")
-			    "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);
     };
 
 

js-assembler/package.rkt

@@ -69,31 +69,50 @@
 
 
 
-
 ;; package-standalone-xhtml: X output-port -> void
 (define (package-standalone-xhtml source-code op)
-  (fprintf op #<<EOF
+  (display *header* op)
-<!DOCTYPE html>
+  (display (quote-cdata (get-runtime)) op)
-<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)
   (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))
+    (display (quote-cdata (get-output-string buffer))
-                  op))
+             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))

js-assembler/quote-cdata.rkt

@@ -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)
+(provide quote-cdata)
-(require/typed racket/base (regexp-split (Regexp String -> (Listof String))))
-
-(provide quote-as-cdata get-cdata-chunks)
 
 
-(: quote-as-cdata (String -> String))
+(: quote-cdata (String -> String))
-(define (quote-as-cdata str)
+(define (quote-cdata s)
-  (let ([chunks (regexp-split #rx"\\]\\]>" str)])
+  (string-append "<![CDATA["
-    (apply string-append (map wrap (process chunks)))))
+                 (regexp-replace* #rx"]]>"
+                                  s
+                                  "]]]]><![CDATA[>")
+                 "]]>"))
+
+                                  
+
+;; (: quote-cdata (String -> String))
+;; (define (quote-cdata str)
+;;   (let ([chunks (regexp-split #rx"\\]\\]>" str)])
+;;     (apply string-append (map wrap (process chunks)))))
 
 
-(: get-cdata-chunks (String -> (Listof String)))
+;; (: get-cdata-chunks (String -> (Listof String)))
-(define (get-cdata-chunks s)
+;; (define (get-cdata-chunks s)
-  (let ([chunks (regexp-split #rx"\\]\\]>" s)])
+;;   (let ([chunks (regexp-split #rx"\\]\\]>" s)])
-    (process chunks)))
+;;     (process chunks)))
 
 
-(: process ((Listof String) -> (Listof String)))
+;; (: process ((Listof String) -> (Listof String)))
-(define (process lst)
+;; (define (process lst)
-  (cond
+;;   (cond
-    [(empty? (rest lst))
+;;     [(empty? (rest lst))
-     lst]
+;;      lst]
-    [else
+;;     [else
-     (cons (string-append (first lst) "]]")
+;;      (cons (string-append (first lst) "]]")
-           (process (cons (string-append ">" (second lst))
+;;            (process (cons (string-append ">" (second lst))
-                          (rest (rest lst)))))]))
+;;                           (rest (rest lst)))))]))
 
-(: wrap (String -> String))          
+;; (: wrap (String -> String))          
-(define (wrap s)
+;; (define (wrap s)
-  (string-append "<![CDATA[" s "]]>"))
+;;   (string-append "<![CDATA[" s "]]>"))

tests/browser-evaluate.rkt

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