From d9437c1d328ccc2b26bd0aae19c2aff7140e466b Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Sun, 17 Apr 2016 15:57:20 -0400
Subject: Minor cleanups

---
 .../java/bjc/dicelang/ReferenceDiceExpression.java | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'dice-lang/src/main/java/bjc/dicelang/ReferenceDiceExpression.java')

diff --git a/dice-lang/src/main/java/bjc/dicelang/ReferenceDiceExpression.java b/dice-lang/src/main/java/bjc/dicelang/ReferenceDiceExpression.java
index b7be527..61be936 100644
--- a/dice-lang/src/main/java/bjc/dicelang/ReferenceDiceExpression.java
+++ b/dice-lang/src/main/java/bjc/dicelang/ReferenceDiceExpression.java
@@ -13,12 +13,12 @@ public class ReferenceDiceExpression implements IDiceExpression {
 	/**
 	 * The enviroment to do variable dereferencing against
 	 */
-	private Map<String, IDiceExpression>	env;
+	private Map<String, IDiceExpression>	enviroment;
 
 	/**
 	 * The name of the bound variable
 	 */
-	private String							name;
+	private String							variableName;
 
 	/**
 	 * Create a new reference dice expression referring to the given name
@@ -31,8 +31,8 @@ public class ReferenceDiceExpression implements IDiceExpression {
 	 */
 	public ReferenceDiceExpression(String name,
 			Map<String, IDiceExpression> env) {
-		this.name = name;
-		this.env = env;
+		this.variableName = name;
+		this.enviroment = env;
 	}
 
 	/**
@@ -41,7 +41,7 @@ public class ReferenceDiceExpression implements IDiceExpression {
 	 * @return the name of the referenced variable
 	 */
 	public String getName() {
-		return name;
+		return variableName;
 	}
 
 	/*
@@ -51,12 +51,12 @@ public class ReferenceDiceExpression implements IDiceExpression {
 	 */
 	@Override
 	public int roll() {
-		if (!env.containsKey(name)) {
+		if (!enviroment.containsKey(variableName)) {
 			throw new UnsupportedOperationException(
-					"Attempted to reference undefined variable " + name);
+					"Attempted to reference undefined variable " + variableName);
 		}
 
-		return env.get(name).roll();
+		return enviroment.get(variableName).roll();
 	}
 
 	/*
@@ -66,10 +66,10 @@ public class ReferenceDiceExpression implements IDiceExpression {
 	 */
 	@Override
 	public String toString() {
-		if (env.containsKey(name)) {
-			return env.get(name).toString();
+		if (enviroment.containsKey(variableName)) {
+			return enviroment.get(variableName).toString();
 		}
 
-		return name;
+		return variableName;
 	}
 }
\ No newline at end of file
-- 
cgit v1.2.3