fix(zscript): some bindings ZASM using wrong literal values

ZQuestClassic · May 3, 2024 · 975cf9c · 975cf9c
1 parent 3cdb24a
commit 975cf9c
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 13 deletions.
diff --git a/src/base/util.cpp b/src/base/util.cpp
@@ -479,49 +479,84 @@ namespace util
 		return neg ? -val : val;
 	}
 
-	int32_t ffparse2(const char *string) //bounds result safely between -214748.3648 and +214748.3647
+	int32_t ffparse2(const char *string, bool do_except) //if not 'do_except', bounds result safely between -214748.3648 and +214748.3647
 	{
 		char tempstring1[32] = {0};
 		strcpy(tempstring1, string);
 
+		if(do_except)
+		{
+			bool dec = false;
+			for(int q = 0; tempstring1[q]; ++q)
+			{
+				char c = tempstring1[q];
+				if(c == '.')
+				{
+					if(dec)
+						throw std::invalid_argument("String contains invalid characters (more than one '.')");
+					else dec = true;
+				}
+				else if((c < '0' || c > '9') && !(c == '-' && q == 0))
+					throw std::invalid_argument(fmt::format("String contains invalid characters ('{}')", c));
+			}
+		}
+
 		char *ptr=strchr(tempstring1, '.');
 		if(!ptr)
 		{
-			return vbound(atoi(tempstring1),-214748,214748)*10000;
+			int val = atoi(tempstring1);
+			if(do_except && (val < -214748 || val > 214748))
+				throw std::out_of_range("Value out of 32bit range");
+			return vbound(val,-214748,214748)*10000;
 		}
 
 		int32_t ret=0;
 
-		for(int32_t i=0; i<4; ++i)
-		{
-			tempstring1[strlen(string)+i]='0';
-		}
-
 		ptr=strchr(tempstring1, '.');
 		*ptr=0;
-		ret=vbound(atoi(tempstring1),-214748,214748)*10000;
+		ret=atoi(tempstring1);
+		if(do_except && (ret < -214748 || ret > 214748))
+			throw std::out_of_range("Value out of 32bit range");
+		ret=vbound(ret,-214748,214748)*10000;
 
 		++ptr;
 		char *ptr2=ptr;
 		ptr2+=4;
+		if(do_except && *ptr2)
+			throw std::out_of_range("Value has too many decimal places! Only 4 positions are supported!");
+		for(int q = 0; q < 4; ++q)
+			if(!ptr[q])
+				ptr[q] = '0';
 		*ptr2=0;
 
 		int32_t decval = abs(atoi(ptr));
 		if(tempstring1[0] == '-')
 		{
 			if(ret == -2147480000)
+			{
+				if(do_except && (decval < 0 || decval > 3648))
+					throw std::out_of_range("Value out of 32bit range");
 				decval = vbound(decval, 0, 3648);
+			}
 			ret-=decval;
 		}
 		else
 		{
 			if(ret == 2147480000)
+			{
+				if(do_except && (decval < 0 || decval > 3647))
+					throw std::out_of_range("Value out of 32bit range");
 				decval = vbound(decval, 0, 3647);
+			}
 			ret+=decval;
 		}
 
 		return ret;
 	}
+	int32_t ffparse2(string const& str, bool do_except)
+	{
+		return ffparse2(str.c_str(), do_except);
+	}
 	int32_t ffparseX(const char *string) //hex before '.', bounds result safely between -214748.3648 and +214748.3647
 	{
 		char tempstring1[32] = {0};

diff --git a/src/base/util.h b/src/base/util.h
@@ -66,7 +66,8 @@ namespace util
 	int64_t zc_atoi64(const char *str);
 	int64_t zc_xtoi64(const char *hexstr);
 	int32_t zc_xtoi(const char *hexstr);
-	int32_t ffparse2(const char *string);
+	int32_t ffparse2(const char *string, bool do_except = false);
+	int32_t ffparse2(std::string const& string, bool do_except = false);
 	int32_t ffparseX(const char *string);
 	int32_t xtoi(char *hexstr);
 	int32_t zc_chmod(const char* path, mode_t mode);

diff --git a/src/parser/Scope.cpp b/src/parser/Scope.cpp
@@ -149,9 +149,9 @@ void Scope::initFunctionBinding(Function* fn, CompileErrorHandler* handler)
 				case ARGTY::LITERAL:
 				{
 					try {
-						int val = std::stoi(tokens[i]);
+						int val = util::ffparse2(tokens[i], true);
 					} catch (std::exception ex) {
-						handler->handleError(CompileError::BadInternal(fn->node, fmt::format("Invalid zasm arg `{}` in command `{}`", tokens[i], command)));
+						handler->handleError(CompileError::BadInternal(fn->node, fmt::format("Invalid zasm arg `{}` in command `{}` ({})", tokens[i], command, ex.what())));
 						return;
 					}
 					break;
@@ -182,7 +182,7 @@ void Scope::initFunctionBinding(Function* fn, CompileErrorHandler* handler)
 		else if (command == "PUSHR")
 			addOpcode2(code, new OPushRegister(new VarArgument(StringToVar(tokens[1]))));
 		else if (command == "PUSHV")
-			addOpcode2(code, new OPushImmediate(new LiteralArgument(std::stoi(tokens[1]))));
+			addOpcode2(code, new OPushImmediate(new LiteralArgument(util::ffparse2(tokens[1]))));
 		else if (command == "TRACER")
 			addOpcode2(code, new OTraceRegister(new VarArgument(StringToVar(tokens[1]))));
 		else if (command == "SETR")
@@ -194,7 +194,7 @@ void Scope::initFunctionBinding(Function* fn, CompileErrorHandler* handler)
 		else if (op_string.starts_with("SETV "))
 		{
 			auto arg1 = new VarArgument(StringToVar(tokens[1]));
-			auto arg2 = new LiteralArgument(std::stoi(tokens[2]));
+			auto arg2 = new LiteralArgument(util::ffparse2(tokens[2]));
 			addOpcode2(code, new OSetImmediate(arg1, arg2));
 		}
 		else