From 7e24a975ca6ff6c2ca608be1f06a26fc8d4295de Mon Sep 17 00:00:00 2001
From: "M@ McCray" <darthapo@gmail.com>
Date: Thu, 10 Feb 2011 23:47:51 -0600
Subject: [PATCH] Cleaned up implementation to remove code duplication.

---
 lib/stitch.js     | 2 +-
 src/stitch.coffee | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/stitch.js b/lib/stitch.js
index ba0fdea..a3fdc4f 100644
--- a/lib/stitch.js
+++ b/lib/stitch.js
@@ -37,7 +37,7 @@
         if (err) {
           return callback(err);
         }
-        result = "var " + this.identifier + " = (function(modules) {\n  var exportCache = {};\n  return function require(name) {\n    var module = exportCache[name];\n    var fn;\n    if (module) {\n      return module;\n    } else if (fn = modules[name]) {\n      module = { id: name, exports: {} };\n      fn(module.exports, require, module);\n      exportCache[name] = module.exports;\n      return module.exports;\n    } else if (fn = modules[name +\"/index\"]) {\n      module = { id: name, exports: {} };\n      fn(module.exports, require, module);\n      exportCache[name] = module.exports;\n      return module.exports;\n    } else {\n      throw 'module \\'' + name + '\\' not found';\n    }\n  }\n})({";
+        result = "var " + this.identifier + " = (function(modules) {\n  var exportCache = {};\n  return function require(name) {\n    var module = exportCache[name];\n    var fn;\n    if (module) {\n      return module;\n    } else if (fn = modules[name] || fn = modules[name +\"/index\"]) {\n      module = { id: name, exports: {} };\n      fn(module.exports, require, module);\n      exportCache[name] = module.exports;\n      return module.exports;\n    } else {\n      throw 'module \\'' + name + '\\' not found';\n    }\n  }\n})({";
         index = 0;
         for (name in sources) {
           _ref = sources[name], filename = _ref.filename, source = _ref.source;
diff --git a/src/stitch.coffee b/src/stitch.coffee
index 611d12d..17f616b 100644
--- a/src/stitch.coffee
+++ b/src/stitch.coffee
@@ -39,12 +39,7 @@ exports.Package = class Package
             var fn;
             if (module) {
               return module;
-            } else if (fn = modules[name]) {
-              module = { id: name, exports: {} };
-              fn(module.exports, require, module);
-              exportCache[name] = module.exports;
-              return module.exports;
-            } else if (fn = modules[name +"/index"]) {
+            } else if (fn = modules[name] || fn = modules[name +"/index"]) {
               module = { id: name, exports: {} };
               fn(module.exports, require, module);
               exportCache[name] = module.exports;