Small changes and code cleanup

lib/resolve-value.js

@@ -30,40 +30,32 @@ var resolveValue = function(decl, map, /*optional*/ignorePseudoScope, /*internal
 	var debugIndent = _debugIsInternal ? '\t' : '';
 
 	var matchingVarDecl = undefined;
-	var RE_VAR_FUNC_G = new RegExp(RE_VAR_FUNC.source, 'g');
 	var resultantValue = toString(decl.value);
 	var warnings = [];
 
 	// Match all variables first so we can later on if there are circular dependencies
-	var variablesUsedInValue = [];
+	var variablesUsedInValueMap = {}
 	// Create a temporary variable, storing resultantValue variable value
-	var resultantValueTemp = resultantValue;
+	var remainingVariableValue = resultantValue;
 	// Use balanced lib to find var() declarations and store variable names
-	while ((matchingVarDecl = balanced('var(', ')', resultantValueTemp))) {
+	while ((matchingVarDecl = balanced('var(', ')', remainingVariableValue))) {
 		// Split at the comma to find variable name and fallback value
 		// There may be other commas in the values so this isn't necessarily just 2 pieces
 		var variableFallbackSplitPieces = matchingVarDecl.body.split(',');
 
 		// Get variable name and fallback, filtering empty items
 		var variableName = variableFallbackSplitPieces[0].trim();
 
-		// Push found variable to variables used array
-		variablesUsedInValue.push(variableName);
+		// add variable found in the object
+		variablesUsedInValueMap[variableName] = true;
 
 		// Replace variable name (first occurence only) from result, to avoid circular loop
-		resultantValueTemp = (matchingVarDecl.pre || '') + matchingVarDecl.body.replace(variableName, '') + (matchingVarDecl.post || '');
+		remainingVariableValue = (matchingVarDecl.pre || '') + matchingVarDecl.body.replace(variableName, '') + (matchingVarDecl.post || '');
 	}
 	// clear temporary variable
-	resultantValueTemp = undefined;
+	remainingVariableValue = undefined;
 
-	// Old strategy to find used variable names in declaration value, using RegExp
-	// TODO: remove unused block 
-	// while ((matchingVarDecl = RE_VAR_FUNC_G.exec(resultantValue))) {
-	// 	variablesUsedInValue.push(matchingVarDecl[1]);
-	// }
-
-	// Remove duplicates from array
-	variablesUsedInValue = variablesUsedInValue.filter(filterDistinct);
+	var variablesUsedInValue = Object.keys(variablesUsedInValueMap);
 
 	//console.log(debugIndent, (_debugIsInternal ? '' : 'Try resolving'), generateScopeList(decl.parent, true), `ignorePseudoScope=${ignorePseudoScope}`, '------------------------');