From ce0e1259b582f058ebed45d351a662cdde5f3e3d Mon Sep 17 00:00:00 2001 From: Danny Yoo Date: Mon, 5 Mar 2012 17:10:26 -0500 Subject: [PATCH] variable renaming --- .../js-get-message/js-get-message-child.rkt | 2 +- js.rkt | 31 ++++++++++++++++++- js/js-impl.js | 8 ++--- js/main.rkt | 4 +-- js/racket-impl.rkt | 12 +++---- js/world/main.rkt | 9 ++---- js/world/make-js-world-event.rkt | 6 ++++ js/world/test.rkt | 5 +-- tests/more-tests/js-binding.rkt | 8 ++--- version.rkt | 2 +- 10 files changed, 60 insertions(+), 27 deletions(-) create mode 100644 js/world/make-js-world-event.rkt diff --git a/examples/js-get-message/js-get-message-child.rkt b/examples/js-get-message/js-get-message-child.rkt index ffb5633..d3b8887 100644 --- a/examples/js-get-message/js-get-message-child.rkt +++ b/examples/js-get-message/js-get-message-child.rkt @@ -15,7 +15,7 @@ ;; Let's attach the send-event function to a toplevel function on the window. -(void ((js-function (js-eval "function(send) { $(window).bind('message', function(e) { send(e.originalEvent.data); })}")) +(void ((js-function->procedure "function(send) { $(window).bind('message', function(e) { send(e.originalEvent.data); })}") send)) ;; js-function lifts JavaScript functions to regular function we can call. diff --git a/js.rkt b/js.rkt index 121fc34..fcb3ba1 100644 --- a/js.rkt +++ b/js.rkt @@ -1,3 +1,32 @@ #lang s-exp "lang/base.rkt" (require "js/main.rkt") -(provide (all-from-out "js/main.rkt")) \ No newline at end of file +(provide [except-out (all-from-out "js/main.rkt") + js-function->procedure + js-async-function->procedure] + [rename-out [-js-function->procedure js-function->procedure] + [-js-async-function->procedure js-async-function->procedure]] + js-function?) + +(define raw-js-function? + (js-function->procedure (js-eval "function(x) { return typeof(x) === 'function'}"))) + +(define (js-function? x) + (raw-js-function? x)) + +(define (-js-function->procedure x) + (cond + [(string? x) + (js-function->procedure (js-eval x))] + [(js-function? x) + (js-function->procedure x)] + [else + (raise-type-error 'js-function->procedure "js-function or string" x)])) + +(define (-js-async-function->procedure x) + (cond + [(string? x) + (js-async-function->procedure (js-eval x))] + [(js-function? x) + (js-async-function->procedure x)] + [else + (raise-type-error 'js-async-function->procedure "js-function or string" x)])) \ No newline at end of file diff --git a/js/js-impl.js b/js/js-impl.js index 221c277..fc9806c 100644 --- a/js/js-impl.js +++ b/js/js-impl.js @@ -159,9 +159,9 @@ // Lift JavaScript functions to Whalesong functions. - EXPORTS['js-function'] = + EXPORTS['js-function->procedure'] = makePrimitiveProcedure( - 'js-function', + 'js-function->procedure', 1, function(MACHINE) { var f = checkJSFunction(MACHINE, 'js function', 0); @@ -177,9 +177,9 @@ }); }); - EXPORTS['js-async-function'] = + EXPORTS['js-async-function->procedure'] = makePrimitiveProcedure( - 'js-async-function', + 'js-async-function->procedure', 1, function(MACHINE) { var f = checkJSFunction(MACHINE, 'js function', 0); diff --git a/js/main.rkt b/js/main.rkt index 58e4d57..57065a0 100644 --- a/js/main.rkt +++ b/js/main.rkt @@ -8,8 +8,8 @@ call-method $ - js-function - js-async-function + js-function->procedure + js-async-function->procedure window diff --git a/js/racket-impl.rkt b/js/racket-impl.rkt index 6f6c418..f4d82a1 100644 --- a/js/racket-impl.rkt +++ b/js/racket-impl.rkt @@ -22,8 +22,8 @@ load-script - js-function - js-async-function + js-function->procedure + js-async-function->procedure ) (define (alert x) @@ -103,8 +103,8 @@ (error 'load-script "Not available outside JavaScript context.")) -(define (js-function f) - (error 'js-function "Not available outside JavaScript context.")) +(define (js-function->procedure f) + (error 'js-function->procedure "Not available outside JavaScript context.")) -(define (js-async-function f) - (error 'js-async-function "Not available outside JavaScript context.")) \ No newline at end of file +(define (js-async-function->procedure f) + (error 'js-async-function->procedure "Not available outside JavaScript context.")) \ No newline at end of file diff --git a/js/world/main.rkt b/js/world/main.rkt index b2d0733..723aa39 100644 --- a/js/world/main.rkt +++ b/js/world/main.rkt @@ -1,6 +1,3 @@ -#lang s-exp "../../lang/js/js.rkt" -(require "../../web-world.rkt") -(declare-implementation - #:racket "racket-impl.rkt" - #:javascript ("js-impl.js") - #:provided-values (make-js-world-event)) \ No newline at end of file +#lang s-exp "../../lang/base.rkt" +(require "make-js-world-event.rkt") +(provide (all-from-out "make-js-world-event.rkt")) diff --git a/js/world/make-js-world-event.rkt b/js/world/make-js-world-event.rkt new file mode 100644 index 0000000..b2d0733 --- /dev/null +++ b/js/world/make-js-world-event.rkt @@ -0,0 +1,6 @@ +#lang s-exp "../../lang/js/js.rkt" +(require "../../web-world.rkt") +(declare-implementation + #:racket "racket-impl.rkt" + #:javascript ("js-impl.js") + #:provided-values (make-js-world-event)) \ No newline at end of file diff --git a/js/world/test.rkt b/js/world/test.rkt index b08f0fa..2673d88 100644 --- a/js/world/test.rkt +++ b/js/world/test.rkt @@ -15,9 +15,10 @@ ;; Let's attach the send-event function to a toplevel function on the window. -(void ((js-function (js-eval "function(x) { window.sendTheTick = x; }")) +(void ((js-function->procedure (js-eval "function(x) { window.sendTheTick = x; }")) send-event)) -;; js-function lifts JavaScript functions to regular function we can call. +;; js-function->procedure lifts JavaScript functions to regular +;; procedures that we can call. (define (tick w v) diff --git a/tests/more-tests/js-binding.rkt b/tests/more-tests/js-binding.rkt index 43204e5..0c02f40 100644 --- a/tests/more-tests/js-binding.rkt +++ b/tests/more-tests/js-binding.rkt @@ -2,13 +2,13 @@ (require (planet dyoo/whalesong/js)) (define js-plus - (js-function (js-eval "function(x, y) { return x + y; }"))) + (js-function->procedure "function(x, y) { return x + y; }")) (define js-minus - (js-function (js-eval "function(x, y) { return x - y; }"))) + (js-function->procedure "function(x, y) { return x - y; }")) (define sleep - (js-async-function (js-eval "function(success, fail, n) { setTimeout(success, n) }"))) + (js-async-function->procedure"function(success, fail, n) { setTimeout(success, n) }")) "plus: " (js-plus 3 4) @@ -25,5 +25,5 @@ ;; I need exception handling... ;; ;(define i-should-fail -; (js-async-function (js-eval "function(success, fail) { fail('I should fail'); }"))) +; (js-async-function->procedure "function(success, fail) { fail('I should fail'); }")) ;(i-should-fail) diff --git a/version.rkt b/version.rkt index a3423f2..99f5b99 100644 --- a/version.rkt +++ b/version.rkt @@ -7,4 +7,4 @@ (provide version) (: version String) -(define version "1.221") +(define version "1.222")