Merge pull request #214 from prezi/add-const-structs-to-protected-symbols

knuton · knuton · commit 79d76eba0ee0 · 2016-03-10T15:48:44.000+01:00
Add collector for const struct names
diff --git a/spaghetti-core/src/main/java/com/prezi/spaghetti/obfuscation/internal/SymbolCollectVisitor.java b/spaghetti-core/src/main/java/com/prezi/spaghetti/obfuscation/internal/SymbolCollectVisitor.java
@@ -54,7 +54,7 @@ public Collection<String> visitStructNode(StructNode node) {
 
 	@Override
 	public Collection<String> visitConstNode(ConstNode node) {
-		return extractNames(node.getEntries());
+		return ImmutableList.<String>builder().add(node.getName()).addAll(extractNames(node.getEntries())).build();
 	}
 
 	@Override
diff --git a/spaghetti-core/src/test/groovy/com/prezi/spaghetti/obfuscation/SymbolCollectVisitorTest.groovy b/spaghetti-core/src/test/groovy/com/prezi/spaghetti/obfuscation/SymbolCollectVisitorTest.groovy
@@ -60,7 +60,7 @@ class SymbolCollectVisitorTest extends Specification {
 }
 """
 		expect:
-		result == ["alpha", "beta"]
+		result == ["Constants", "alpha", "beta"]
 	}
 
 	def "enum values are found"() {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public Collection<String> visitStructNode(StructNode node) {`
`54`	`54`
`55`	`55`	`@Override`
`56`	`56`	`public Collection<String> visitConstNode(ConstNode node) {`
`57`		`- return extractNames(node.getEntries());`
	`57`	`+ return ImmutableList.<String>builder().add(node.getName()).addAll(extractNames(node.getEntries())).build();`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class SymbolCollectVisitorTest extends Specification {`
`60`	`60`	`}`
`61`	`61`	`"""`
`62`	`62`	`expect:`
`63`		`- result == ["alpha", "beta"]`
	`63`	`+ result == ["Constants", "alpha", "beta"]`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`def "enum values are found"() {`