From 58292362b39be5b701eadd60efb2d9e14f2afa68 Mon Sep 17 00:00:00 2001
From: Jeff Williams <jeffrey.l.williams@gmail.com>
Date: Tue, 24 Dec 2013 12:41:02 -0800
Subject: [PATCH] add function names; cleanup

---
 rhino/rhino-shim.js | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/rhino/rhino-shim.js b/rhino/rhino-shim.js
index 125fc01e..720202f9 100644
--- a/rhino/rhino-shim.js
+++ b/rhino/rhino-shim.js
@@ -11,14 +11,6 @@ version(180);
  * Emulate DOM timeout/interval functions.
  * @see https://developer.mozilla.org/en-US/docs/DOM/window#Methods
  */
-
-global.setTimeout = null;
-global.clearTimeout = null;
-global.setInterval = null;
-global.clearInterval = null;
-global.setImmediate = null;
-global.clearImmediate = null;
-
 (function() {
     'use strict';
 
@@ -35,21 +27,21 @@ global.clearImmediate = null;
         });
     }
 
-    global.setTimeout = function(fn, delay) {
+    global.setTimeout = function setTimeout(fn, delay) {
         var timerId = timerCount++;
         var callback = getCallback(fn);
         timers[timerId] = timerPool.schedule(callback, delay, timerUnits);
         return timerId;
     };
 
-    global.clearTimeout = function(timerId) {
+    global.clearTimeout = function clearTimeout(timerId) {
         if (timers[timerId]) {
             timerPool.remove(timers[timerId]);
             delete timers[timerId];
         }
     };
 
-    global.setInterval = function(fn, delay) {
+    global.setInterval = function setInterval(fn, delay) {
         var timerId = timerCount++;
         var callback = getCallback(fn);
         timers[timerId] = timerPool.scheduleAtFixedRate(callback, delay, delay, timerUnits);
@@ -76,7 +68,7 @@ global.clearImmediate = null;
             }
         }
 
-        return function(fn) {
+        return function setImmediate(fn) {
             var timerId = timerCount++;
             queue[timerId] = fn;
 
@@ -89,7 +81,7 @@ global.clearImmediate = null;
         };
     })();
 
-    global.clearImmediate = function(id) {
+    global.clearImmediate = function clearImmediate(id) {
         delete queue[id];
     };
 })();
@@ -104,21 +96,21 @@ global.console = (function() {
     }
 
     return {
-        error: function() {
+        error: function error() {
             println('err', arguments);
         },
-        info: function() {
+        info: function info() {
             println('out', arguments);
         },
-        log: function() {
+        log: function log() {
             println('out', arguments);
         },
-        trace: function(label) {
+        trace: function trace(label) {
             // this puts some extra junk at the top of the stack trace, but it's close enough
             var e = new java.lang.Exception(label || 'Trace');
             e.printStackTrace();
         },
-        warn: function() {
+        warn: function warn() {
             println('err', arguments);
         }
     };
@@ -133,7 +125,7 @@ global.process = {
     argv: ['java', env.dirname + '/jsdoc.js']
         .concat( Array.prototype.slice.call(arguments, 0) ),
     // this depends on a hack in our version of Rhino
-    cwd: function() {
+    cwd: function cwd() {
         var f = new java.io.File( java.lang.System.getProperty('user.dir') );
         return String( f.getAbsolutePath() );
     },
@@ -150,18 +142,18 @@ global.process = {
 
         return result;
     })(),
-    exit: function(n) {
+    exit: function exit(n) {
         n = n || 0;
         java.lang.System.exit(n);
     },
-    nextTick: function(callback) {
+    nextTick: function nextTick(callback) {
         setTimeout(callback, 0);
     },
     stderr: {
         // Java can't reliably find the terminal width across platforms, so we hard-code a
         // reasonable value
         columns: 80,
-        write: function(str) {
+        write: function write(str) {
             java.lang.System.err.print(str);
         }
     },
@@ -169,7 +161,7 @@ global.process = {
         // Java can't reliably find the terminal width across platforms, so we hard-code a
         // reasonable value
         columns: 80,
-        write: function(str) {
+        write: function write(str) {
             java.lang.System.out.print(str);
         }
     }