bugfixes and test fixes

sokra · sokra · commit 25b73bbcf6b0 · 2017-08-11T12:28:04.000+02:00
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -77,6 +77,21 @@ class StackedSetMap {
 		return this.defaultValue;
 	}
 
+	_compress() {
+		this.map = new Map();
+		for(const data of this.stack) {
+			for(const pair of data) {
+				this.map.set(pair[0], pair[1]);
+			}
+		}
+		this.stack = [this.map];
+	}
+
+	asSet() {
+		this._compress();
+		return new Set(Array.from(this.map.entries()).filter(pair => pair[1]).map(pair => pair[0]));
+	}
+
 	createChild() {
 		return new StackedSetMap(this.defaultValue, this.stack);
 	}
@@ -1493,7 +1508,7 @@ class Parser extends Tapable {
 		if(expr.type === "Identifier") {
 			free = !this.scope.definitions.has(expr.name);
 			exprName.push(this.scope.renames.get(expr.name) || expr.name);
-		} else if(expr.type === "ThisExpression" && this.scope.renames.$this) {
+		} else if(expr.type === "ThisExpression" && this.scope.renames.get("this")) {
 			free = true;
 			exprName.push(this.scope.renames.get("this"));
 		} else if(expr.type === "ThisExpression") {
diff --git a/test/Parser.test.js b/test/Parser.test.js
@@ -219,7 +219,7 @@ describe("Parser", () => {
 			});
 			testParser.plugin("expression fgh", (expr) => {
 				if(!testParser.state.fgh) testParser.state.fgh = [];
-				testParser.state.fgh.push(testParser.scope.definitions.join(" "));
+				testParser.state.fgh.push(Array.from(testParser.scope.definitions.asSet()).join(" "));
 				return true;
 			});
 			testParser.plugin("expression fgh.sub", (expr) => {
