From a95120bf73577be7f18bbe3591da2d53bd8abb0e Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Sat, 16 May 2015 17:09:22 -0400
Subject: [PATCH] add comments, remove unused code

---
 src/Bundle/index.js | 41 +++--------------------------------------
 1 file changed, 3 insertions(+), 38 deletions(-)

diff --git a/src/Bundle/index.js b/src/Bundle/index.js
index 63fdbe5..bac6c80 100644
--- a/src/Bundle/index.js
+++ b/src/Bundle/index.js
@@ -110,6 +110,7 @@ export default class Bundle {
 		let definers = {};
 		let conflicts = {};
 
+		// Discover conflicts (i.e. two statements in separate modules both define `foo`)
 		this.body.forEach( statement => {
 			keys( statement._defines ).forEach( name => {
 				if ( has( definers, name ) ) {
@@ -124,6 +125,7 @@ export default class Bundle {
 			});
 		});
 
+		// Rename conflicting identifiers so they can live in the same scope
 		keys( conflicts ).forEach( name => {
 			const modules = definers[ name ];
 
@@ -134,11 +136,10 @@ export default class Bundle {
 			});
 		});
 
+		// Apply new names
 		this.body.forEach( statement => {
 			let replacements = {};
 
-
-
 			keys( statement._dependsOn )
 				.concat( keys( statement._defines ) )
 				.forEach( name => {
@@ -178,40 +179,4 @@ export default class Bundle {
 			})
 		};
 	}
-
-	getSafeReplacement ( name, requestingModule ) {
-		// assume name is safe until proven otherwise
-		let safe = true;
-
-		name = sanitize( name );
-
-		let pathParts = requestingModule.relativePath.split( sep );
-
-		do {
-			let safe = true;
-
-			let i = this.modulesArray.length;
-			while ( safe && i-- ) {
-				const module = this.modulesArray[i];
-				if ( module === requestingModule ) continue;
-
-				let j = module.definedNames.length;
-				while ( safe && j-- ) {
-					if ( module.definedNames[j] === name ) {
-						safe = false;
-					}
-				}
-			}
-
-			if ( !safe ) {
-				if ( pathParts.length ) {
-					name = sanitize( pathParts.pop() ) + `__${name}`;
-				} else {
-					name = `_${name}`;
-				}
-			}
-		} while ( !safe );
-
-		return name;
-	}
 }
\ No newline at end of file