From e0a55875fe1aefdc8beca305ee3865f97b7206fc Mon Sep 17 00:00:00 2001 From: Danny Yoo Date: Mon, 29 Aug 2011 12:17:26 -0400 Subject: [PATCH] need to reduce time to compile --- js-assembler/package.rkt | 1 - scribblings/cs19.scrbl | 8 ++++++- version.rkt | 2 +- web-world/event.rkt | 25 +++++++++++++++++++++ web-world/impl.rkt | 5 ++--- web-world/js-impl.js | 47 +++++++++++++++++++++++++++++++++------- web-world/main.rkt | 7 ++++-- 7 files changed, 79 insertions(+), 16 deletions(-) create mode 100644 web-world/event.rkt diff --git a/js-assembler/package.rkt b/js-assembler/package.rkt index 8fb6896..f991b07 100644 --- a/js-assembler/package.rkt +++ b/js-assembler/package.rkt @@ -273,7 +273,6 @@ MACHINE.modules[~s] = ;; last on-last-src)) - (fprintf op "var invoke = (function(MACHINE, SUCCESS, FAIL, PARAMS) {") (fprintf op " plt.runtime.ready(function() {") (fprintf op "plt.runtime.setReadyFalse();") diff --git a/scribblings/cs19.scrbl b/scribblings/cs19.scrbl index 799965f..cdd6e25 100644 --- a/scribblings/cs19.scrbl +++ b/scribblings/cs19.scrbl @@ -108,6 +108,9 @@ During the extent of a big-bang, a form widget will appear in the @tt{document.body} to allow you to manually send location-changing events. +The optional @tech{event} argument will contain numbers for +@racket["latitude"] and @racket["longitude"]. + } @@ -115,6 +118,9 @@ events. Tells @racket[big-bang] to update when the location changes, as received by the @link["http://dev.w3.org/geo/api/spec-source.html"]{Geolocation API}. + +The optional @tech{event} argument will contain numbers for +@racket["latitude"] and @racket["longitude"]. } @@ -195,7 +201,7 @@ Add the dom node @racket[d] as the last child of the focused node.} @subsection{Events} -An @deftech{event} is a collection of name-value pairs. +An @deftech{event} is a structure that holds name-value pairs. diff --git a/version.rkt b/version.rkt index cdb657d..19fdaa0 100644 --- a/version.rkt +++ b/version.rkt @@ -1,4 +1,4 @@ #lang typed/racket/base (provide version) (: version String) -(define version "1.0") \ No newline at end of file +(define version "1.0") diff --git a/web-world/event.rkt b/web-world/event.rkt new file mode 100644 index 0000000..cd6956a --- /dev/null +++ b/web-world/event.rkt @@ -0,0 +1,25 @@ +#lang s-exp "../lang/base.rkt" + +(provide (all-defined-out)) + +(define-struct event (kvpairs)) + + +(define (event-keys an-evt) + (map car (event-kvpairs an-evt))) + + +(define (event-ref an-evt a-key) + (define clean-key (cond + [(symbol? a-key) + a-key] + [(string? a-key) + (string->symbol a-key)] + [else + (raise-type-error 'event-ref "symbol or string" a-key)])) + (define kv (assq clean-key (event-kvpairs an-evt))) + (cond [(eq? kv #f) + (error 'event-ref "Could not find key ~a" a-key)] + [else + (car (cdr kv))])) + diff --git a/web-world/impl.rkt b/web-world/impl.rkt index 27fbe24..c9d6905 100644 --- a/web-world/impl.rkt +++ b/web-world/impl.rkt @@ -1,9 +1,8 @@ #lang s-exp "../lang/js/js.rkt" -;; Make sure the resource library is loaded. -(require "../resource.rkt") - +;; Make sure the resource library is loaded, as well as the event structure library. +(require "../resource.rkt" "event.rkt") (declare-implementation #:racket "racket-impl.rkt" diff --git a/web-world/js-impl.js b/web-world/js-impl.js index df16dd1..e6d3c11 100644 --- a/web-world/js-impl.js +++ b/web-world/js-impl.js @@ -9,6 +9,7 @@ var finalizeClosureCall = plt.baselib.functions.finalizeClosureCall; var PAUSE = plt.runtime.PAUSE; var isString = plt.baselib.strings.isString; + var makeList = plt.baselib.lists.makeList; @@ -22,6 +23,10 @@ var resourceStructType = MACHINE.modules['whalesong/resource/structs.rkt'].namespace['struct:resource']; + var eventStructType = + MACHINE.modules['whalesong/web-world/event.rkt'].namespace['struct:event']; + + var domToCursor = function(dom) { var domOpenF = @@ -597,6 +602,29 @@ + // convert an object to an event. + // At the moment, we only copy over those values which are numbers or strings. + var objectToEvent = function(obj) { + var key, val; + var result = makeList(); + for (key in obj) { + if (obj.hasOwnProperty(key)) { + val = obj[key]; + if (typeof(val) === 'number') { + result = makePair(makeList(makeSymbol(key), + plt.baselib.numbers.makeFloat(val)), + result); + } else if (typeof(val) === 'string') { + result = makePair(makeList(makeSymbol(key), val) + result); + } + } + } + return eventStructType.constructor(result); + }; + + + /* Event sources. @@ -643,8 +671,9 @@ TickEventSource.prototype.onStart = function(fireEvent) { this.id = setInterval( - function() { - fireEvent(undefined); + function(evt) { + fireEvent(undefined, + objectToEvent(evt)); }, this.delay); }; @@ -659,6 +688,8 @@ + + var MockLocationEventSource = function() { this.elt = undefined; }; @@ -677,8 +708,8 @@ submitButton.value = "send lat/lng"; submitButton.onclick = function() { fireEvent(undefined, - { latitude : plt.baselib.numbers.makeFloat(latInput.value), - longitude : plt.baselib.numbers.makeFloat(latOutput.value) }); + objectToEvent({ latitude: Number(latInput.value), + longitude: Number(latOutput.value)})); return false; }; @@ -700,7 +731,7 @@ }; }; - + @@ -714,8 +745,8 @@ LocationEventSource.prototype.onStart = function(fireEvent) { var success = function(position) { fireEvent(undefined, - { latitude : plt.baselib.numbers.makeFloat(position.coords.latitude), - longitude: plt.baselib.numbers.makeFloat(position.coords.longitude) }); + objectToEvent({ latitude : plt.baselib.numbers.makeFloat(position.coords.latitude), + longitude: plt.baselib.numbers.makeFloat(position.coords.longitude) })); }; var fail = function(err) { // Quiet failure @@ -761,7 +792,7 @@ this.handler = function(evt) { if (element !== undefined) { - fireEvent(element, evt); + fireEvent(element, objectToEvent(evt)); } }; if (element !== undefined) { diff --git a/web-world/main.rkt b/web-world/main.rkt index 3b4e0c5..b92a6ab 100644 --- a/web-world/main.rkt +++ b/web-world/main.rkt @@ -1,4 +1,7 @@ #lang s-exp "../lang/base.rkt" -(require "impl.rkt") -(provide (all-from-out "impl.rkt")) \ No newline at end of file +(require "impl.rkt" + "event.rkt") + +(provide (all-from-out "impl.rkt") + (all-from-out "event.rkt")) \ No newline at end of file