From dcb94873fef121e55322f4950acaa8f2935389ca Mon Sep 17 00:00:00 2001 From: Danny Yoo Date: Thu, 3 Nov 2011 17:17:27 -0400 Subject: [PATCH] including the avltree sources --- examples/shuffling.rkt | 1 - js-assembler/get-runtime.rkt | 8 +++- js-assembler/runtime-src/avltree.js | 18 -------- js-assembler/runtime-src/baselib-hashes.js | 6 +-- js-assembler/runtime-src/hashes-footer.js | 1 + js-assembler/runtime-src/hashes-header.js | 1 + js-assembler/runtime-src/link.js | 54 ---------------------- 7 files changed, 12 insertions(+), 77 deletions(-) create mode 100644 js-assembler/runtime-src/hashes-footer.js create mode 100644 js-assembler/runtime-src/hashes-header.js delete mode 100644 js-assembler/runtime-src/link.js diff --git a/examples/shuffling.rkt b/examples/shuffling.rkt index 9796fe8..3949ac2 100644 --- a/examples/shuffling.rkt +++ b/examples/shuffling.rkt @@ -1,7 +1,6 @@ #lang planet dyoo/whalesong - ;; shuffle: vector -> vector ;; Reorders the contents of a vector according to the Fisher-Yates shuffling algorithm. (define (shuffle! a-vec) diff --git a/js-assembler/get-runtime.rkt b/js-assembler/get-runtime.rkt index d293fb6..897c8bd 100644 --- a/js-assembler/get-runtime.rkt +++ b/js-assembler/get-runtime.rkt @@ -38,7 +38,6 @@ jquery.js jquery-protect-footer.js - jshashtable-2.1_src.js js-numbers.js baselib.js @@ -57,7 +56,14 @@ baselib-symbols.js baselib-strings.js baselib-bytes.js + + hashes-header.js + jshashtable-2.1_src.js + avltree.js baselib-hashes.js + hashes-footer.js + + baselib-regexps.js baselib-paths.js baselib-boxes.js diff --git a/js-assembler/runtime-src/avltree.js b/js-assembler/runtime-src/avltree.js index 9ad3647..40a597d 100644 --- a/js-assembler/runtime-src/avltree.js +++ b/js-assembler/runtime-src/avltree.js @@ -3,8 +3,6 @@ // edits to flatten the namespace from goog.structs to just // AvlTree, commented out inorderTraverse and reverseOrderTraverse. // -// I'm considering changing the code to work with CPSed control flow. -// // ---------------------------------------------------------------------- // Original license follows: // ---------------------------------------------------------------------- @@ -474,22 +472,6 @@ AvlTree.prototype.traverse_ = }; -// CPS'ed version of the traverse function -AvlTree.prototype.traverse_k_ = - function(traversalFunc_k, opt_startNode, opt_endNode, k) { - var node = opt_startNode ? opt_startNode : this.root_; - var endNode = opt_endNode ? opt_endNode : null; - var loop = function(node) { - if (node && node != endNode) { - traversalFunc_k.call(this, node, loop); - } else { - k(); - } - } - return loop(node); - }; - - /** * Ensures that the specified node and all its ancestors are balanced. If they diff --git a/js-assembler/runtime-src/baselib-hashes.js b/js-assembler/runtime-src/baselib-hashes.js index 3d408c2..a168006 100644 --- a/js-assembler/runtime-src/baselib-hashes.js +++ b/js-assembler/runtime-src/baselib-hashes.js @@ -1,6 +1,6 @@ /*jslint unparam: true, vars: true, white: true, newcap: true, nomen: true, plusplus: true, maxerr: 50, indent: 4 */ -/*global Hashtable*/ +/*global window,Hashtable*/ // Mutable hashtables. @@ -80,7 +80,7 @@ ////////////////////////////////////////////////////////////////////// - // Whalesong's Hashtables are a thin wrapper around the Hashtable + // Whalesong's Hashtables are a thin wrapper around the mutable Hashtable // class to make it printable and equatable. var WhalesongHashtable = function (type, hash_function, equality_function) { this.type = type; @@ -164,4 +164,4 @@ exports.isHash = isHash; -}(this.plt.baselib, Hashtable)); \ No newline at end of file +}(window.plt.baselib, Hashtable)); \ No newline at end of file diff --git a/js-assembler/runtime-src/hashes-footer.js b/js-assembler/runtime-src/hashes-footer.js new file mode 100644 index 0000000..f48464f --- /dev/null +++ b/js-assembler/runtime-src/hashes-footer.js @@ -0,0 +1 @@ +}()); diff --git a/js-assembler/runtime-src/hashes-header.js b/js-assembler/runtime-src/hashes-header.js new file mode 100644 index 0000000..04886a7 --- /dev/null +++ b/js-assembler/runtime-src/hashes-header.js @@ -0,0 +1 @@ +(function() { diff --git a/js-assembler/runtime-src/link.js b/js-assembler/runtime-src/link.js deleted file mode 100644 index cd4611d..0000000 --- a/js-assembler/runtime-src/link.js +++ /dev/null @@ -1,54 +0,0 @@ -// Lightweight linking of the modules. -// There are circular dependencies across the modules unfortunately, so we -// need a mechanism for letting them link to each other. -if (! this['plt']) { this['plt'] = {}; } -(function(scope) { - var link = {}; - scope['link'] = link; - - // link.ready: (string (string -> void)) -> void - // When the name announces that it's ready, calls the function f. - link.ready = function(name, f) { - readyWaiters[name] = readyWaiters[name] || []; - readyWaiters[name].push(f); - - if (linkIsReady[name]) { - notifySingle(f, name); - } - }; - - // link.announceReady: string -> void - // Lets the world know that the name is ready. - link.announceReady = function(name) { - var i; - linkIsReady[name] = true; - notifyAll(name); - }; - - - // notifyAll: string -> void - // Tell all listeners that the name is ready. - var notifyAll = function(name) { - var waiters = readyWaiters[name] || [], i; - for (i = 0 ; i < waiters.length; i++) { - notifySingle(waiters[i], name); - } - readyWaiters[name] = []; - }; - - - // Tell a single listener that the name is ready. - var notifySingle = function(f, name) { - setTimeout(function() { f(name); }, - 0); - }; - - - // linkIsReady: (Hashtable String Boolean) - var linkIsReady = {}; - - // readyWaiters: (Hashtable String (Arrayof (String -> Void))) - var readyWaiters = {}; - - -})(this['plt']); \ No newline at end of file