Fix poor uses of Construct.nval()

Generally poor to use nval() in a conditional since it could build a string when just checking for a null. In other cases, nval() is unnecessary when args have already been asserted as non-null.

Author: PseudoKnight

src/main/java/com/laytonsmith/core/functions/Echoes.java

@@ -17,6 +17,7 @@
 import com.laytonsmith.core.constructs.CArray;
 import com.laytonsmith.core.constructs.CBoolean;
 import com.laytonsmith.core.constructs.CClassType;
+import com.laytonsmith.core.constructs.CNull;
 import com.laytonsmith.core.constructs.CString;
 import com.laytonsmith.core.constructs.CVoid;
 import com.laytonsmith.core.constructs.Construct;
@@ -687,7 +688,7 @@ public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntime
 			final MCServer server = Static.getServer();
 
 			// Handle "broadcast(message, [null])".
-			if(args.length == 1 || Construct.nval(args[1]) == null) { // args.length can only be 1 or 2 due to the numArgs().
+			if(args.length == 1 || args[1] instanceof CNull) {
 				server.broadcastMessage(args[0].val());
 				return CVoid.VOID;
 			}

src/main/java/com/laytonsmith/core/functions/Meta.java

@@ -39,7 +39,6 @@
 import com.laytonsmith.core.constructs.CResource;
 import com.laytonsmith.core.constructs.CString;
 import com.laytonsmith.core.constructs.CVoid;
-import com.laytonsmith.core.constructs.Construct;
 import com.laytonsmith.core.constructs.IVariable;
 import com.laytonsmith.core.constructs.Target;
 import com.laytonsmith.core.constructs.Variable;
@@ -153,7 +152,7 @@ public Integer[] numArgs() {
 
 		@Override
 		public Mixed exec(Target t, final Environment env, Mixed... args) throws CancelCommandException, ConfigRuntimeException {
-			if(Construct.nval(args[1]) == null || args[1].val().isEmpty() || args[1].val().charAt(0) != '/') {
+			if(args[1] instanceof CNull || args[1].val().isEmpty() || args[1].val().charAt(0) != '/') {
 				throw new CREFormatException("The first character of the command must be a forward slash (i.e. '/give')", t);
 			}
 			String cmd = args[1].val().substring(1);
@@ -275,7 +274,7 @@ public Mixed exec(Target t, Environment env, Mixed... args) throws ConfigRuntime
 				return new run().exec(t, env, args);
 			}
 
-			if(Construct.nval(command) == null || command.val().isEmpty() || command.val().charAt(0) != '/') {
+			if(command instanceof CNull || command.val().isEmpty() || command.val().charAt(0) != '/') {
 				throw new CREFormatException("The first character of a command must be a forward slash (eg. /give)", t);
 			}
 
@@ -412,7 +411,7 @@ public Integer[] numArgs() {
 
 		@Override
 		public Mixed exec(Target t, Environment env, Mixed... args) throws CancelCommandException, ConfigRuntimeException {
-			if(Construct.nval(args[0]) == null || args[0].val().isEmpty() || args[0].val().charAt(0) != '/') {
+			if(args[0] instanceof CNull || args[0].val().isEmpty() || args[0].val().charAt(0) != '/') {
 				throw new CREFormatException("The first character of the command must be a forward slash (i.e. '/give')", t);
 			}
 			MCCommandSender sender = env.getEnv(CommandHelperEnvironment.class).GetCommandSender();

src/main/java/com/laytonsmith/core/functions/StringHandling.java

@@ -896,8 +896,8 @@ public String docs() {
 		public Mixed exec(Target t, Environment env, Mixed... args) throws CancelCommandException, ConfigRuntimeException {
 			Static.AssertNonCNull(t, args);
 
-			String teststring = Construct.nval(args[0]);
-			String keyword = Construct.nval(args[1]);
+			String teststring = args[0].val();
+			String keyword = args[1].val();
 			boolean ret = teststring.startsWith(keyword);
 
 			return CBoolean.get(ret);
@@ -964,8 +964,8 @@ public String docs() {
 		public Mixed exec(Target t, Environment env, Mixed... args) throws CancelCommandException, ConfigRuntimeException {
 			Static.AssertNonCNull(t, args);
 
-			String teststring = Construct.nval(args[0]);
-			String keyword = Construct.nval(args[1]);
+			String teststring = args[0].val();
+			String keyword = args[1].val();
 			boolean ret = teststring.endsWith(keyword);
 
 			return CBoolean.get(ret);
@@ -1022,11 +1022,10 @@ public String getName() {
 
 		@Override
 		public Mixed exec(Target t, Environment environment, Mixed... args) throws CancelCommandException, ConfigRuntimeException {
-			if(!(Construct.nval(args[0]) instanceof String)) {
-				throw new CRECastException(this.getName() + " expects a string as first argument, but type "
-						+ args[0].typeof() + " was found.", t);
+			if(args[0] instanceof CNull) {
+				throw new CRECastException(this.getName() + " expects a string as first argument, but found null.", t);
 			}
-			String text = Construct.nval(args[0]);
+			String text = args[0].val();
 			// Enforce the fact we are only taking the first character here
 			// Do not let the user pass an entire string (or an empty string, d'oh). Only a single character.
 			if(text.length() != 1) {
@@ -1127,9 +1126,9 @@ public Boolean runAsync() {
 
 		@Override
 		public Mixed exec(Target t, Environment env, Mixed... args) throws CancelCommandException, ConfigRuntimeException {
-			String haystack = Construct.nval(args[0]);
-			String needle = Construct.nval(args[1]);
 			Static.AssertNonCNull(t, args);
+			String haystack = args[0].val();
+			String needle = args[1].val();
 			return new CInt(haystack.indexOf(needle), t);
 		}