Code maintenance and fixes

1 files changed, 4 insertions, 8 deletions

diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTReferenceChecker.java b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTReferenceChecker.java
index a74d61e..09d3d13 100644
--- a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTReferenceChecker.java
+++ b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTReferenceChecker.java
@@ -2,7 +2,7 @@ package bjc.dicelang.ast;
 
 import java.util.function.Consumer;
 
-import bjc.utils.data.GenHolder;
+import bjc.utils.data.IHolder;
 
 /**
  * Check if the specified node references a particular variable
@@ -15,7 +15,7 @@ public final class DiceASTReferenceChecker
 	/**
 	 * This is true if the specified node references the set variable
 	 */
-	private GenHolder<Boolean>	referencesVariable;
+	private IHolder<Boolean>	referencesVariable;
 
 	private String				varName;
 
@@ -27,7 +27,7 @@ public final class DiceASTReferenceChecker
 	 * @param varName
 	 *            The variable to check for references in
 	 */
-	public DiceASTReferenceChecker(GenHolder<Boolean> referencesVar,
+	public DiceASTReferenceChecker(IHolder<Boolean> referencesVar,
 			String varName) {
 		this.referencesVariable = referencesVar;
 		this.varName = varName;
@@ -35,11 +35,7 @@ public final class DiceASTReferenceChecker
 
 	@Override
 	public void accept(IDiceASTNode astNode) {
-		if (!referencesVariable.unwrap(bool -> bool)) {
-			if (isDirectReference(astNode)) {
-				referencesVariable.transform((bool) -> false);
-			}
-		}
+		referencesVariable.transform((bool) -> isDirectReference(astNode));
 	}
 
 	/**