Type punning for Sphax

Author: LB--

Actions.cpp

@@ -70,14 +70,9 @@ void Extension::GotoRoot()
 	current = root;
 }
 
-#include <sstream>
 void Extension::DebugWindow()
 {
-#ifdef UNICODE
-	std::wostringstream oss;
-#else
-	std::ostringstream oss;
-#endif
+	std::basic_ostringstream<TCHAR> oss;
 	oss << _T("IsString:  ") << std::boolalpha << IsString()  << std::endl;
 	oss << _T("IsInteger: ") << std::boolalpha << IsInteger() << std::endl;
 	oss << _T("IsDouble:  ") << std::boolalpha << IsDouble()  << std::endl;

Conditions.cpp

@@ -35,5 +35,17 @@ bool Extension::IsNull()
 }
 bool Extension::IsTrue()
 {
-	return IsBoolean() && current->u.boolean;
+	if(IsBoolean())
+	{
+		return current->u.boolean ? true : false;
+	}
+	else if(IsInteger())
+	{
+		return current->u.integer ? true : false;
+	}
+	else if(IsString())
+	{
+		return GetString() == std::basic_string<TCHAR>(_T("true"));
+	}
+	return false;
 }

Expressions.cpp

@@ -1,43 +1,140 @@
 #include "Common.h"
 
-
 TCHAR const *Extension::GetError()
 {
 	return Runtime.CopyString(error.c_str());
 }
 TCHAR const *Extension::GetString()
 {
-	if(!IsString()) return _T("");
-	TCHAR *t = Edif::ConvertString(current->u.string.ptr);
-	TCHAR *c = Runtime.CopyString(t);
-	Edif::FreeString(t);
-	return c;
+	if(IsString())
+	{
+		TCHAR *t = Edif::ConvertString(current->u.string.ptr);
+		TCHAR *c = Runtime.CopyString(t);
+		Edif::FreeString(t);
+		return c;
+	}
+	else if(IsInteger())
+	{
+		std::basic_ostringstream<TCHAR> oss;
+		oss << GetLong();
+		return Runtime.CopyString(oss.str().c_str());
+	}
+	else if(IsDouble())
+	{
+		std::basic_ostringstream<TCHAR> oss;
+		oss << GetDouble();
+		return Runtime.CopyString(oss.str().c_str());
+	}
+	else if(IsBoolean())
+	{
+		if(GetBoolNum())
+		{
+			return _T("true");
+		}
+		else
+		{
+			return _T("false");
+		}
+	}
+	else if(IsNull())
+	{
+		return _T("null");
+	}
+	return _T("");
 }
 int Extension::GetInteger()
 {
-	return IsInteger() ? static_cast<int>(current->u.integer) : 0;
+	if(IsInteger())
+	{
+		return static_cast<int>(current->u.integer);
+	}
+	else if(IsDouble())
+	{
+		return static_cast<int>(current->u.dbl);
+	}
+	else if(IsString())
+	{
+		TCHAR *t = Edif::ConvertString(current->u.string.ptr);
+		std::basic_istringstream<TCHAR> iss (t);
+		Edif::FreeString(t);
+		int x = 0;
+		iss >> x;
+		return x;
+	}
+	return 0;
 }
 TCHAR const *Extension::GetLong()
 {
 	if(IsInteger())
 	{
-		std::basic_ostringstream<TCHAR> ss;
-		ss << current->u.integer;
-		return Runtime.CopyString(ss.str().c_str());
+		std::basic_ostringstream<TCHAR> oss;
+		oss << current->u.integer;
+		return Runtime.CopyString(oss.str().c_str());
+	}
+	else if(IsDouble())
+	{
+		std::basic_ostringstream<TCHAR> oss;
+		oss << static_cast<long long>(current->u.dbl);
+		return Runtime.CopyString(oss.str().c_str());
+	}
+	else if(IsString())
+	{
+		TCHAR *t = Edif::ConvertString(current->u.string.ptr);
+		std::basic_istringstream<TCHAR> iss (t);
+		Edif::FreeString(t);
+		long long x = 0;
+		iss >> x;
+		std::basic_ostringstream<TCHAR> oss;
+		oss << x;
+		return Runtime.CopyString(oss.str().c_str());
 	}
 	return _T("0");
 }
 float Extension::GetFloat()
 {
-	return IsDouble() ? static_cast<float>(current->u.dbl) : 0.0f;
+	if(IsDouble())
+	{
+		return static_cast<float>(current->u.dbl);
+	}
+	else if(IsInteger())
+	{
+		return static_cast<float>(current->u.integer);
+	}
+	else if(IsString())
+	{
+		TCHAR *t = Edif::ConvertString(current->u.string.ptr);
+		std::basic_istringstream<TCHAR> iss (t);
+		Edif::FreeString(t);
+		float x = 0;
+		iss >> x;
+		return x;
+	}
+	return 0.0f;
 }
 TCHAR const *Extension::GetDouble()
 {
 	if(IsDouble())
 	{
-		std::basic_ostringstream<TCHAR> ss;
-		ss << std::setprecision(20) << current->u.dbl;
-		return Runtime.CopyString(ss.str().c_str());
+		std::basic_ostringstream<TCHAR> oss;
+		oss << std::setprecision(20) << current->u.dbl;
+		return Runtime.CopyString(oss.str().c_str());
+	}
+	else if(IsInteger())
+	{
+		std::basic_ostringstream<TCHAR> oss;
+		oss << static_cast<double>(current->u.integer);
+		return Runtime.CopyString(oss.str().c_str());
+	}
+	else if(IsString())
+	{
+		TCHAR *t = Edif::ConvertString(current->u.string.ptr);
+		std::basic_istringstream<TCHAR> iss (t);
+		Edif::FreeString(t);
+		double x = 0;
+		iss >> x;
+		std::basic_ostringstream<TCHAR> oss;
+		oss << x;
+		return Runtime.CopyString(oss.str().c_str());
 	}
 	return _T("0.0");
 }
@@ -55,5 +152,17 @@ unsigned Extension::GetNumValues()
 }
 unsigned Extension::GetBoolNum()
 {
-	return IsBoolean() ? (current->u.boolean ? 1 : 0) : 0;
+	if(IsBoolean())
+	{
+		return current->u.boolean ? 1 : 0;
+	}
+	else if(IsInteger())
+	{
+		return current->u.integer ? 1 : 0;
+	}
+	else if(IsString())
+	{
+		return GetString() == std::basic_string<TCHAR>(_T("true")) ? 1 : 0;
+	}
+	return 0;
 }